[gimp] plug-ins: get rid of icons in dialog buttons (use labels not stock IDs)



commit 801bd8fb3f4ac3494b571df6a260fe0f31df38f2
Author: Michael Natterer <mitch gimp org>
Date:   Sun Feb 12 16:18:24 2017 +0100

    plug-ins: get rid of icons in dialog buttons (use labels not stock IDs)

 plug-ins/common/align-layers.c                     |    4 +-
 plug-ins/common/blinds.c                           |    4 +-
 plug-ins/common/border-average.c                   |    4 +-
 plug-ins/common/cartoon.c                          |    4 +-
 plug-ins/common/checkerboard.c                     |    4 +-
 plug-ins/common/cml-explorer.c                     |   14 ++--
 plug-ins/common/color-cube-analyze.c               |    2 +-
 plug-ins/common/colorify.c                         |    4 +-
 plug-ins/common/colormap-remap.c                   |    6 +-
 plug-ins/common/compose.c                          |    4 +-
 plug-ins/common/contrast-retinex.c                 |    4 +-
 plug-ins/common/curve-bend.c                       |   12 ++--
 plug-ins/common/decompose.c                        |    4 +-
 plug-ins/common/depth-merge.c                      |    4 +-
 plug-ins/common/despeckle.c                        |    4 +-
 plug-ins/common/destripe.c                         |    4 +-
 plug-ins/common/edge-dog.c                         |    4 +-
 plug-ins/common/edge-neon.c                        |    4 +-
 plug-ins/common/emboss.c                           |    4 +-
 plug-ins/common/file-cel.c                         |    4 +-
 plug-ins/common/file-gif-save.c                    |    4 +-
 plug-ins/common/file-pdf-load.c                    |    4 +-
 plug-ins/common/file-ps.c                          |    4 +-
 plug-ins/common/file-raw-data.c                    |    4 +-
 plug-ins/common/file-svg.c                         |    4 +-
 plug-ins/common/file-wmf.c                         |    4 +-
 plug-ins/common/film.c                             |    4 +-
 plug-ins/common/filter-pack.c                      |    6 +-
 plug-ins/common/fractal-trace.c                    |    4 +-
 plug-ins/common/grid.c                             |    4 +-
 plug-ins/common/hot.c                              |    4 +-
 plug-ins/common/jigsaw.c                           |    4 +-
 plug-ins/common/mail.c                             |    4 +-
 plug-ins/common/max-rgb.c                          |    4 +-
 plug-ins/common/metadata.c                         |    2 +-
 plug-ins/common/newsprint.c                        |    4 +-
 plug-ins/common/nl-filter.c                        |   10 +-
 plug-ins/common/oilify.c                           |    4 +-
 plug-ins/common/photocopy.c                        |    4 +-
 plug-ins/common/plugin-browser.c                   |    2 +-
 plug-ins/common/procedure-browser.c                |    2 +-
 plug-ins/common/qbist.c                            |   12 ++--
 plug-ins/common/ripple.c                           |    4 +-
 plug-ins/common/sample-colorize.c                  |    6 +-
 plug-ins/common/sharpen.c                          |    4 +-
 plug-ins/common/smooth-palette.c                   |    4 +-
 plug-ins/common/softglow.c                         |    4 +-
 plug-ins/common/sparkle.c                          |    4 +-
 plug-ins/common/sphere-designer.c                  |   10 +-
 plug-ins/common/tile-small.c                       |    4 +-
 plug-ins/common/tile.c                             |    4 +-
 plug-ins/common/unit-editor.c                      |    8 +-
 plug-ins/common/unsharp-mask.c                     |    4 +-
 plug-ins/common/van-gogh-lic.c                     |    4 +-
 plug-ins/common/warp.c                             |    4 +-
 plug-ins/common/wavelet-decompose.c                |    4 +-
 plug-ins/common/web-page.c                         |    4 +-
 plug-ins/file-fits/fits.c                          |    4 +-
 plug-ins/file-fli/fli-gimp.c                       |    4 +-
 plug-ins/file-tiff/file-tiff-load.c                |    4 +-
 plug-ins/flame/flame.c                             |   14 ++--
 .../fractal-explorer/fractal-explorer-dialogs.c    |   12 ++--
 plug-ins/fractal-explorer/fractal-explorer.c       |    4 +-
 plug-ins/gfig/gfig-dialog.c                        |   16 ++--
 plug-ins/gimpressionist/brush.c                    |    6 +-
 plug-ins/gimpressionist/gimpressionist.c           |    4 +-
 plug-ins/gimpressionist/orientmap.c                |    6 +-
 plug-ins/gimpressionist/presets.c                  |   19 ++---
 plug-ins/gimpressionist/sizemap.c                  |   23 +++---
 plug-ins/gradient-flare/gradient-flare.c           |   10 +-
 plug-ins/ifs-compose/ifs-compose.c                 |   20 +++---
 plug-ins/imagemap/imap_browse.c                    |   62 ++++++++-------
 plug-ins/imagemap/imap_default_dialog.c            |   82 ++++++++++----------
 plug-ins/imagemap/imap_file.c                      |   22 +++---
 plug-ins/lighting/lighting-ui.c                    |   16 ++--
 plug-ins/map-object/map-object-ui.c                |    4 +-
 plug-ins/pagecurl/pagecurl.c                       |    4 +-
 plug-ins/screenshot/screenshot.c                   |   15 +---
 plug-ins/script-fu/script-fu-console.c             |   20 +++--
 plug-ins/script-fu/script-fu-interface.c           |    6 +-
 plug-ins/script-fu/script-fu-server.c              |    2 +-
 plug-ins/selection-to-path/selection-to-path.c     |    6 +-
 po-plug-ins/POTFILES.in                            |    2 +
 83 files changed, 325 insertions(+), 330 deletions(-)
---
diff --git a/plug-ins/common/align-layers.c b/plug-ins/common/align-layers.c
index 133c139..b697089 100644
--- a/plug-ins/common/align-layers.c
+++ b/plug-ins/common/align-layers.c
@@ -627,8 +627,8 @@ align_layers_dialog (void)
                             NULL, 0,
                             gimp_standard_help_func, PLUG_IN_PROC,
 
-                            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                            GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                            _("_Cancel"), GTK_RESPONSE_CANCEL,
+                            _("_OK"),     GTK_RESPONSE_OK,
 
                             NULL);
 
diff --git a/plug-ins/common/blinds.c b/plug-ins/common/blinds.c
index 2017888..0a8000a 100644
--- a/plug-ins/common/blinds.c
+++ b/plug-ins/common/blinds.c
@@ -222,8 +222,8 @@ blinds_dialog (GimpDrawable *drawable)
                             NULL, 0,
                             gimp_standard_help_func, PLUG_IN_PROC,
 
-                            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                            GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                            _("_Cancel"), GTK_RESPONSE_CANCEL,
+                            _("_OK"),     GTK_RESPONSE_OK,
 
                             NULL);
 
diff --git a/plug-ins/common/border-average.c b/plug-ins/common/border-average.c
index 5f2d3c8..94a44a4 100644
--- a/plug-ins/common/border-average.c
+++ b/plug-ins/common/border-average.c
@@ -359,8 +359,8 @@ borderaverage_dialog (gint32        image_ID,
                             NULL, 0,
                             gimp_standard_help_func, PLUG_IN_PROC,
 
-                            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                            GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                            _("_Cancel"), GTK_RESPONSE_CANCEL,
+                            _("_OK"),     GTK_RESPONSE_OK,
 
                             NULL);
 
diff --git a/plug-ins/common/cartoon.c b/plug-ins/common/cartoon.c
index 157a2fe..241f116 100644
--- a/plug-ins/common/cartoon.c
+++ b/plug-ins/common/cartoon.c
@@ -810,8 +810,8 @@ cartoon_dialog (GimpDrawable *drawable)
                             NULL, 0,
                             gimp_standard_help_func, PLUG_IN_PROC,
 
-                            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                            GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                            _("_Cancel"), GTK_RESPONSE_CANCEL,
+                            _("_OK"),     GTK_RESPONSE_OK,
 
                             NULL);
 
diff --git a/plug-ins/common/checkerboard.c b/plug-ins/common/checkerboard.c
index afb27f2..a1fb715 100644
--- a/plug-ins/common/checkerboard.c
+++ b/plug-ins/common/checkerboard.c
@@ -347,8 +347,8 @@ checkerboard_dialog (gint32        image_ID,
                             NULL, 0,
                             gimp_standard_help_func, PLUG_IN_PROC,
 
-                            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                            GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                            _("_Cancel"), GTK_RESPONSE_CANCEL,
+                            _("_OK"),     GTK_RESPONSE_OK,
 
                             NULL);
 
diff --git a/plug-ins/common/cml-explorer.c b/plug-ins/common/cml-explorer.c
index f5d33b2..a456707 100644
--- a/plug-ins/common/cml-explorer.c
+++ b/plug-ins/common/cml-explorer.c
@@ -1186,8 +1186,8 @@ CML_explorer_dialog (void)
                             NULL, 0,
                             gimp_standard_help_func, PLUG_IN_PROC,
 
-                            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                            GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                            _("_Cancel"), GTK_RESPONSE_CANCEL,
+                            _("_OK"),     GTK_RESPONSE_OK,
 
                             NULL);
 
@@ -1853,7 +1853,7 @@ function_graph_new (GtkWidget *widget,
                             gtk_widget_get_toplevel (widget), 0,
                             gimp_standard_help_func, PLUG_IN_PROC,
 
-                            GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
+                            _("_Close"), GTK_RESPONSE_CLOSE,
 
                             NULL);
 
@@ -1983,8 +1983,8 @@ CML_save_to_file_callback (GtkWidget *widget,
                                      GTK_WINDOW (gtk_widget_get_toplevel (widget)),
                                      GTK_FILE_CHOOSER_ACTION_SAVE,
 
-                                     GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                     GTK_STOCK_SAVE,   GTK_RESPONSE_OK,
+                                     _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                     _("_Save"),   GTK_RESPONSE_OK,
 
                                      NULL);
 
@@ -2116,8 +2116,8 @@ CML_load_from_file_callback (GtkWidget *widget,
                                      GTK_WINDOW (gtk_widget_get_toplevel (widget)),
                                      GTK_FILE_CHOOSER_ACTION_OPEN,
 
-                                     GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                     GTK_STOCK_OPEN,   GTK_RESPONSE_OK,
+                                     _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                     _("_Open"),   GTK_RESPONSE_OK,
 
                                      NULL);
 
diff --git a/plug-ins/common/color-cube-analyze.c b/plug-ins/common/color-cube-analyze.c
index 6ed2ad4..36d24bf 100644
--- a/plug-ins/common/color-cube-analyze.c
+++ b/plug-ins/common/color-cube-analyze.c
@@ -361,7 +361,7 @@ doDialog (void)
                             NULL, 0,
                             gimp_standard_help_func, PLUG_IN_PROC,
 
-                            GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
+                            _("_Close"), GTK_RESPONSE_CLOSE,
 
                             NULL);
 
diff --git a/plug-ins/common/colorify.c b/plug-ins/common/colorify.c
index e41d628..cb117dc 100644
--- a/plug-ins/common/colorify.c
+++ b/plug-ins/common/colorify.c
@@ -254,8 +254,8 @@ colorify_dialog (GimpDrawable *drawable)
                             NULL, 0,
                             gimp_standard_help_func, PLUG_IN_PROC,
 
-                            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                            GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                            _("_Cancel"), GTK_RESPONSE_CANCEL,
+                            _("_OK"),     GTK_RESPONSE_OK,
 
                             NULL);
 
diff --git a/plug-ins/common/colormap-remap.c b/plug-ins/common/colormap-remap.c
index 916e13e..d4eea52 100644
--- a/plug-ins/common/colormap-remap.c
+++ b/plug-ins/common/colormap-remap.c
@@ -617,9 +617,9 @@ remap_dialog (gint32  image_ID,
                             NULL, 0,
                             gimp_standard_help_func, PLUG_IN_PROC_REMAP,
 
-                            GIMP_STOCK_RESET, RESPONSE_RESET,
-                            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                            GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                            _("_Reset"),  RESPONSE_RESET,
+                            _("_Cancel"), GTK_RESPONSE_CANCEL,
+                            _("_OK"),     GTK_RESPONSE_OK,
 
                             NULL);
 
diff --git a/plug-ins/common/compose.c b/plug-ins/common/compose.c
index 917d1cb..f7346b6 100644
--- a/plug-ins/common/compose.c
+++ b/plug-ins/common/compose.c
@@ -1072,8 +1072,8 @@ compose_dialog (const gchar *compose_type,
                             NULL, 0,
                             gimp_standard_help_func, COMPOSE_PROC,
 
-                            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                            GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                            _("_Cancel"), GTK_RESPONSE_CANCEL,
+                            _("_OK"),     GTK_RESPONSE_OK,
 
                             NULL);
 
diff --git a/plug-ins/common/contrast-retinex.c b/plug-ins/common/contrast-retinex.c
index da58c1f..f817dcb 100644
--- a/plug-ins/common/contrast-retinex.c
+++ b/plug-ins/common/contrast-retinex.c
@@ -286,8 +286,8 @@ retinex_dialog (GimpDrawable *drawable)
                             NULL, 0,
                             gimp_standard_help_func, PLUG_IN_PROC,
 
-                            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                            GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                            _("_Cancel"), GTK_RESPONSE_CANCEL,
+                            _("_OK"),     GTK_RESPONSE_OK,
 
                             NULL);
 
diff --git a/plug-ins/common/curve-bend.c b/plug-ins/common/curve-bend.c
index 14bf50b..261f3cd 100644
--- a/plug-ins/common/curve-bend.c
+++ b/plug-ins/common/curve-bend.c
@@ -1224,8 +1224,8 @@ bender_new_dialog (GimpDrawable *drawable)
                                NULL, 0,
                                gimp_standard_help_func, PLUG_IN_PROC,
 
-                               GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                               GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                               _("_Cancel"), GTK_RESPONSE_CANCEL,
+                               _("_OK"),     GTK_RESPONSE_OK,
 
                                NULL);
 
@@ -2062,8 +2062,8 @@ bender_load_callback (GtkWidget    *w,
                                      GTK_WINDOW (gtk_widget_get_toplevel (w)),
                                      GTK_FILE_CHOOSER_ACTION_OPEN,
 
-                                     GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                     GTK_STOCK_OPEN,   GTK_RESPONSE_OK,
+                                     _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                     _("_Open"),   GTK_RESPONSE_OK,
 
                                      NULL);
 
@@ -2097,8 +2097,8 @@ bender_save_callback (GtkWidget    *w,
                                      GTK_WINDOW (gtk_widget_get_toplevel (w)),
                                      GTK_FILE_CHOOSER_ACTION_SAVE,
 
-                                     GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                     GTK_STOCK_SAVE,   GTK_RESPONSE_OK,
+                                     _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                     _("_Save"),   GTK_RESPONSE_OK,
 
                                      NULL);
 
diff --git a/plug-ins/common/decompose.c b/plug-ins/common/decompose.c
index e1531bd..87cc355 100644
--- a/plug-ins/common/decompose.c
+++ b/plug-ins/common/decompose.c
@@ -818,8 +818,8 @@ decompose_dialog (void)
                             NULL, 0,
                             gimp_standard_help_func, PLUG_IN_PROC,
 
-                            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                            GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                            _("_Cancel"), GTK_RESPONSE_CANCEL,
+                            _("_OK"),     GTK_RESPONSE_OK,
 
                             NULL);
 
diff --git a/plug-ins/common/depth-merge.c b/plug-ins/common/depth-merge.c
index e894c7a..043e99b 100644
--- a/plug-ins/common/depth-merge.c
+++ b/plug-ins/common/depth-merge.c
@@ -652,8 +652,8 @@ DepthMerge_dialog (DepthMerge *dm)
                               NULL, 0,
                               gimp_standard_help_func, PLUG_IN_PROC,
 
-                              GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                              GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                              _("_Cancel"), GTK_RESPONSE_CANCEL,
+                              _("_OK"),     GTK_RESPONSE_OK,
 
                               NULL);
 
diff --git a/plug-ins/common/despeckle.c b/plug-ins/common/despeckle.c
index c55465a..40e4fc4 100644
--- a/plug-ins/common/despeckle.c
+++ b/plug-ins/common/despeckle.c
@@ -442,8 +442,8 @@ despeckle_dialog (void)
                             NULL, 0,
                             gimp_standard_help_func, PLUG_IN_PROC,
 
-                            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                            GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                            _("_Cancel"), GTK_RESPONSE_CANCEL,
+                            _("_OK"),     GTK_RESPONSE_OK,
 
                             NULL);
 
diff --git a/plug-ins/common/destripe.c b/plug-ins/common/destripe.c
index 65a5724..81d5bf3 100644
--- a/plug-ins/common/destripe.c
+++ b/plug-ins/common/destripe.c
@@ -441,8 +441,8 @@ destripe_dialog (GimpDrawable *drawable)
                             NULL, 0,
                             gimp_standard_help_func, PLUG_IN_PROC,
 
-                            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                            GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                            _("_Cancel"), GTK_RESPONSE_CANCEL,
+                            _("_OK"),     GTK_RESPONSE_OK,
 
                             NULL);
 
diff --git a/plug-ins/common/edge-dog.c b/plug-ins/common/edge-dog.c
index 2b65ccd..fb80a89 100644
--- a/plug-ins/common/edge-dog.c
+++ b/plug-ins/common/edge-dog.c
@@ -303,8 +303,8 @@ dog_dialog (gint32        image_ID,
                             NULL, 0,
                             gimp_standard_help_func, PLUG_IN_PROC,
 
-                            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                            GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                            _("_Cancel"), GTK_RESPONSE_CANCEL,
+                            _("_OK"),     GTK_RESPONSE_OK,
 
                             NULL);
 
diff --git a/plug-ins/common/edge-neon.c b/plug-ins/common/edge-neon.c
index bc33f3c..78466eb 100644
--- a/plug-ins/common/edge-neon.c
+++ b/plug-ins/common/edge-neon.c
@@ -697,8 +697,8 @@ neon_dialog (GimpDrawable *drawable)
                             NULL, 0,
                             gimp_standard_help_func, PLUG_IN_PROC,
 
-                            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                            GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                            _("_Cancel"), GTK_RESPONSE_CANCEL,
+                            _("_OK"),     GTK_RESPONSE_OK,
 
                             NULL);
 
diff --git a/plug-ins/common/emboss.c b/plug-ins/common/emboss.c
index e2bd624..5bf7f4e 100644
--- a/plug-ins/common/emboss.c
+++ b/plug-ins/common/emboss.c
@@ -450,8 +450,8 @@ emboss_dialog (GimpDrawable *drawable)
                             NULL, 0,
                             gimp_standard_help_func, PLUG_IN_PROC,
 
-                            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                            GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                            _("_Cancel"), GTK_RESPONSE_CANCEL,
+                            _("_OK"),     GTK_RESPONSE_OK,
 
                             NULL);
 
diff --git a/plug-ins/common/file-cel.c b/plug-ins/common/file-cel.c
index 7fb320f..bdffe9f 100644
--- a/plug-ins/common/file-cel.c
+++ b/plug-ins/common/file-cel.c
@@ -931,8 +931,8 @@ palette_dialog (const gchar *title)
   dialog = gtk_file_chooser_dialog_new (title, NULL,
                                         GTK_FILE_CHOOSER_ACTION_OPEN,
 
-                                        GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                        GTK_STOCK_OPEN,   GTK_RESPONSE_OK,
+                                        _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                        _("_Open"),   GTK_RESPONSE_OK,
 
                                         NULL);
 
diff --git a/plug-ins/common/file-gif-save.c b/plug-ins/common/file-gif-save.c
index d919a9c..cd849be 100644
--- a/plug-ins/common/file-gif-save.c
+++ b/plug-ins/common/file-gif-save.c
@@ -1086,8 +1086,8 @@ bad_bounds_dialog (void)
                                      "the actual borders of the image."));
 
   gtk_dialog_add_buttons (GTK_DIALOG (dialog),
-                          GTK_STOCK_CANCEL,     GTK_RESPONSE_CANCEL,
-                          GIMP_STOCK_TOOL_CROP, GTK_RESPONSE_OK,
+                          _("_Cancel"), GTK_RESPONSE_CANCEL,
+                          _("Cr_op"),   GTK_RESPONSE_OK,
                           NULL);
 
   gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
diff --git a/plug-ins/common/file-pdf-load.c b/plug-ins/common/file-pdf-load.c
index 506e9a3..b08bfb8 100644
--- a/plug-ins/common/file-pdf-load.c
+++ b/plug-ins/common/file-pdf-load.c
@@ -1086,8 +1086,8 @@ load_dialog (PopplerDocument  *doc,
                             NULL, 0,
                             gimp_standard_help_func, LOAD_PROC,
 
-                            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                            _("_Import"),     GTK_RESPONSE_OK,
+                            _("_Cancel"), GTK_RESPONSE_CANCEL,
+                            _("_Import"), GTK_RESPONSE_OK,
 
                             NULL);
 
diff --git a/plug-ins/common/file-ps.c b/plug-ins/common/file-ps.c
index 2f17dbb..e409f64 100644
--- a/plug-ins/common/file-ps.c
+++ b/plug-ins/common/file-ps.c
@@ -3418,8 +3418,8 @@ load_dialog (const gchar *filename,
                             NULL, 0,
                             gimp_standard_help_func, LOAD_PS_PROC,
 
-                            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                            _("_Import"),     GTK_RESPONSE_OK,
+                            _("_Cancel"), GTK_RESPONSE_CANCEL,
+                            _("_Import"), GTK_RESPONSE_OK,
 
                             NULL);
 
diff --git a/plug-ins/common/file-raw-data.c b/plug-ins/common/file-raw-data.c
index a8eaf6c..632492e 100644
--- a/plug-ins/common/file-raw-data.c
+++ b/plug-ins/common/file-raw-data.c
@@ -1551,8 +1551,8 @@ load_dialog (const gchar *filename)
                             NULL, 0,
                             gimp_standard_help_func, LOAD_PROC,
 
-                            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                            GTK_STOCK_OPEN,   GTK_RESPONSE_OK,
+                            _("_Cancel"), GTK_RESPONSE_CANCEL,
+                            _("_Open"),   GTK_RESPONSE_OK,
 
                             NULL);
 
diff --git a/plug-ins/common/file-svg.c b/plug-ins/common/file-svg.c
index f001fa9..33bf042 100644
--- a/plug-ins/common/file-svg.c
+++ b/plug-ins/common/file-svg.c
@@ -723,8 +723,8 @@ load_dialog (const gchar  *filename,
                             NULL, 0,
                             gimp_standard_help_func, LOAD_PROC,
 
-                            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                            GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                            _("_Cancel"), GTK_RESPONSE_CANCEL,
+                            _("_OK"),     GTK_RESPONSE_OK,
 
                             NULL);
 
diff --git a/plug-ins/common/file-wmf.c b/plug-ins/common/file-wmf.c
index af27d18..3d39363 100644
--- a/plug-ins/common/file-wmf.c
+++ b/plug-ins/common/file-wmf.c
@@ -502,8 +502,8 @@ load_dialog (const gchar *filename)
                             NULL, 0,
                             gimp_standard_help_func, LOAD_PROC,
 
-                            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                            GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                            _("_Cancel"), GTK_RESPONSE_CANCEL,
+                            _("_OK"),     GTK_RESPONSE_OK,
 
                             NULL);
 
diff --git a/plug-ins/common/film.c b/plug-ins/common/film.c
index 7bb20bc..cb435d7 100644
--- a/plug-ins/common/film.c
+++ b/plug-ins/common/film.c
@@ -1259,8 +1259,8 @@ film_dialog (gint32 image_ID)
                          NULL, 0,
                          gimp_standard_help_func, PLUG_IN_PROC,
 
-                         GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                         GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                         _("_Cancel"), GTK_RESPONSE_CANCEL,
+                         _("_OK"),     GTK_RESPONSE_OK,
 
                          NULL);
 
diff --git a/plug-ins/common/filter-pack.c b/plug-ins/common/filter-pack.c
index 8fc0cb6..11e96c0 100644
--- a/plug-ins/common/filter-pack.c
+++ b/plug-ins/common/filter-pack.c
@@ -1202,9 +1202,9 @@ fp_dialog (void)
                          NULL, 0,
                          gimp_standard_help_func, PLUG_IN_PROC,
 
-                         GIMP_STOCK_RESET, RESPONSE_RESET,
-                         GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                         GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                         _("_Reset"),  RESPONSE_RESET,
+                         _("_Cancel"), GTK_RESPONSE_CANCEL,
+                         _("_OK"),     GTK_RESPONSE_OK,
 
                          NULL);
 
diff --git a/plug-ins/common/fractal-trace.c b/plug-ins/common/fractal-trace.c
index 9e94850..6be25fc 100644
--- a/plug-ins/common/fractal-trace.c
+++ b/plug-ins/common/fractal-trace.c
@@ -708,8 +708,8 @@ dialog_show (void)
                             NULL, 0,
                             gimp_standard_help_func, PLUG_IN_PROC,
 
-                            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                            GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                            _("_Cancel"), GTK_RESPONSE_CANCEL,
+                            _("_OK"),     GTK_RESPONSE_OK,
 
                             NULL);
 
diff --git a/plug-ins/common/grid.c b/plug-ins/common/grid.c
index 63a9085..4ad87fc 100644
--- a/plug-ins/common/grid.c
+++ b/plug-ins/common/grid.c
@@ -643,8 +643,8 @@ dialog (gint32        image_ID,
                                        NULL, 0,
                                        gimp_standard_help_func, PLUG_IN_PROC,
 
-                                       GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                       GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                                       _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                       _("_OK"),     GTK_RESPONSE_OK,
 
                                        NULL);
 
diff --git a/plug-ins/common/hot.c b/plug-ins/common/hot.c
index a3c0f4c..752d013 100644
--- a/plug-ins/common/hot.c
+++ b/plug-ins/common/hot.c
@@ -590,8 +590,8 @@ plugin_dialog (piArgs *argp)
                          NULL, 0,
                          gimp_standard_help_func, PLUG_IN_PROC,
 
-                         GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                         GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                         _("_Cancel"), GTK_RESPONSE_CANCEL,
+                         _("_OK"),     GTK_RESPONSE_OK,
 
                          NULL);
 
diff --git a/plug-ins/common/jigsaw.c b/plug-ins/common/jigsaw.c
index 89cbe6d..3396c58 100644
--- a/plug-ins/common/jigsaw.c
+++ b/plug-ins/common/jigsaw.c
@@ -2394,8 +2394,8 @@ jigsaw_dialog (GimpDrawable *drawable)
                             NULL, 0,
                             gimp_standard_help_func, PLUG_IN_PROC,
 
-                            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                            GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                            _("_Cancel"), GTK_RESPONSE_CANCEL,
+                            _("_OK"),     GTK_RESPONSE_OK,
 
                             NULL);
 
diff --git a/plug-ins/common/mail.c b/plug-ins/common/mail.c
index d205b5a..c34ac51 100644
--- a/plug-ins/common/mail.c
+++ b/plug-ins/common/mail.c
@@ -499,8 +499,8 @@ send_dialog (void)
                          NULL, 0,
                          gimp_standard_help_func, PLUG_IN_PROC,
 
-                         GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                         _("_Send"),       GTK_RESPONSE_OK,
+                         _("_Cancel"), GTK_RESPONSE_CANCEL,
+                         _("_Send"),   GTK_RESPONSE_OK,
 
                          NULL);
 
diff --git a/plug-ins/common/max-rgb.c b/plug-ins/common/max-rgb.c
index 9f56099..726604b 100644
--- a/plug-ins/common/max-rgb.c
+++ b/plug-ins/common/max-rgb.c
@@ -258,8 +258,8 @@ max_rgb_dialog (GimpDrawable *drawable)
                             NULL, 0,
                             gimp_standard_help_func, PLUG_IN_PROC,
 
-                            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                            GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                            _("_Cancel"), GTK_RESPONSE_CANCEL,
+                            _("_OK"),     GTK_RESPONSE_OK,
 
                             NULL);
 
diff --git a/plug-ins/common/metadata.c b/plug-ins/common/metadata.c
index fce5bbc..43c96bf 100644
--- a/plug-ins/common/metadata.c
+++ b/plug-ins/common/metadata.c
@@ -248,7 +248,7 @@ metadata_dialog (gint32        image_id,
                             NULL, 0,
                             gimp_standard_help_func, PLUG_IN_PROC,
 
-                            GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
+                            _("_Close"), GTK_RESPONSE_CLOSE,
 
                             NULL);
 
diff --git a/plug-ins/common/newsprint.c b/plug-ins/common/newsprint.c
index f994311..b53f7bd 100644
--- a/plug-ins/common/newsprint.c
+++ b/plug-ins/common/newsprint.c
@@ -1180,8 +1180,8 @@ newsprint_dialog (GimpDrawable *drawable)
                             NULL, 0,
                             gimp_standard_help_func, PLUG_IN_PROC,
 
-                            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                            GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                            _("_Cancel"), GTK_RESPONSE_CANCEL,
+                            _("_OK"),     GTK_RESPONSE_OK,
 
                             NULL);
 
diff --git a/plug-ins/common/nl-filter.c b/plug-ins/common/nl-filter.c
index 4eff647..1af50c0 100644
--- a/plug-ins/common/nl-filter.c
+++ b/plug-ins/common/nl-filter.c
@@ -1015,13 +1015,13 @@ nlfilter_dialog (GimpDrawable *drawable)
   gimp_ui_init (PLUG_IN_BINARY, TRUE);
 
   dialog = gimp_dialog_new (_("NL Filter"), PLUG_IN_ROLE,
-                         NULL, 0,
-                         gimp_standard_help_func, PLUG_IN_PROC,
+                            NULL, 0,
+                            gimp_standard_help_func, PLUG_IN_PROC,
 
-                         GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                         GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                            _("_Cancel"), GTK_RESPONSE_CANCEL,
+                            _("_OK"),     GTK_RESPONSE_OK,
 
-                         NULL);
+                            NULL);
 
   gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
                                            GTK_RESPONSE_OK,
diff --git a/plug-ins/common/oilify.c b/plug-ins/common/oilify.c
index d51cb2d..e101800 100644
--- a/plug-ins/common/oilify.c
+++ b/plug-ins/common/oilify.c
@@ -782,8 +782,8 @@ oilify_dialog (GimpDrawable *drawable)
                             NULL, 0,
                             gimp_standard_help_func, PLUG_IN_PROC,
 
-                            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                            GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                            _("_Cancel"), GTK_RESPONSE_CANCEL,
+                            _("_OK"),     GTK_RESPONSE_OK,
 
                             NULL);
 
diff --git a/plug-ins/common/photocopy.c b/plug-ins/common/photocopy.c
index aa5ea2b..86664da 100644
--- a/plug-ins/common/photocopy.c
+++ b/plug-ins/common/photocopy.c
@@ -837,8 +837,8 @@ photocopy_dialog (GimpDrawable *drawable)
                             NULL, 0,
                             gimp_standard_help_func, PLUG_IN_PROC,
 
-                            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                            GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                            _("_Cancel"), GTK_RESPONSE_CANCEL,
+                            _("_OK"),     GTK_RESPONSE_OK,
 
                             NULL);
 
diff --git a/plug-ins/common/plugin-browser.c b/plug-ins/common/plugin-browser.c
index 80e6e9e..a19ee7b 100644
--- a/plug-ins/common/plugin-browser.c
+++ b/plug-ins/common/plugin-browser.c
@@ -547,7 +547,7 @@ browser_dialog_new (void)
                                      NULL, 0,
                                      gimp_standard_help_func, PLUG_IN_PROC,
 
-                                     GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
+                                     _("_Close"), GTK_RESPONSE_CLOSE,
 
                                      NULL);
 
diff --git a/plug-ins/common/procedure-browser.c b/plug-ins/common/procedure-browser.c
index f157f86..d37da21 100644
--- a/plug-ins/common/procedure-browser.c
+++ b/plug-ins/common/procedure-browser.c
@@ -126,7 +126,7 @@ run (const gchar      *name,
           gimp_proc_browser_dialog_new (_("Procedure Browser"), PLUG_IN_BINARY,
                                         gimp_standard_help_func, PLUG_IN_PROC,
 
-                                        GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
+                                        _("_Close"), GTK_RESPONSE_CLOSE,
 
                                         NULL);
 
diff --git a/plug-ins/common/qbist.c b/plug-ins/common/qbist.c
index 9951a16..f8689e9 100644
--- a/plug-ins/common/qbist.c
+++ b/plug-ins/common/qbist.c
@@ -720,8 +720,8 @@ dialog_load (GtkWidget *widget,
                                         GTK_WINDOW (parent),
                                         GTK_FILE_CHOOSER_ACTION_OPEN,
 
-                                        GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                        GTK_STOCK_OPEN,   GTK_RESPONSE_OK,
+                                        _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                        _("_Open"),   GTK_RESPONSE_OK,
 
                                         NULL);
 
@@ -762,8 +762,8 @@ dialog_save (GtkWidget *widget,
                                         GTK_WINDOW (parent),
                                         GTK_FILE_CHOOSER_ACTION_SAVE,
 
-                                        GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                        GTK_STOCK_SAVE,   GTK_RESPONSE_OK,
+                                        _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                        _("_Save"),   GTK_RESPONSE_OK,
 
                                         NULL);
 
@@ -816,8 +816,8 @@ dialog_run (void)
                             NULL, 0,
                             gimp_standard_help_func, PLUG_IN_PROC,
 
-                            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                            GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                            _("_Cancel"), GTK_RESPONSE_CANCEL,
+                            _("_OK"),     GTK_RESPONSE_OK,
 
                             NULL);
 
diff --git a/plug-ins/common/ripple.c b/plug-ins/common/ripple.c
index eae1501..3873342 100644
--- a/plug-ins/common/ripple.c
+++ b/plug-ins/common/ripple.c
@@ -484,8 +484,8 @@ ripple_dialog (GimpDrawable *drawable)
                             NULL, 0,
                             gimp_standard_help_func, PLUG_IN_PROC,
 
-                            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                            GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                            _("_Cancel"), GTK_RESPONSE_CANCEL,
+                            _("_OK"),     GTK_RESPONSE_OK,
 
                             NULL);
 
diff --git a/plug-ins/common/sample-colorize.c b/plug-ins/common/sample-colorize.c
index f2494c0..570aefa 100644
--- a/plug-ins/common/sample-colorize.c
+++ b/plug-ins/common/sample-colorize.c
@@ -1326,10 +1326,10 @@ smp_dialog (void)
                      NULL, 0,
                      gimp_standard_help_func, PLUG_IN_PROC,
 
-                     GIMP_STOCK_RESET,        RESPONSE_RESET,
+                     _("_Reset"),             RESPONSE_RESET,
                      _("Get _Sample Colors"), RESPONSE_GET_COLORS,
-                     GTK_STOCK_CLOSE,         GTK_RESPONSE_CLOSE,
-                     GTK_STOCK_APPLY,         GTK_RESPONSE_APPLY,
+                     _("_Close"),             GTK_RESPONSE_CLOSE,
+                     _("_Apply"),             GTK_RESPONSE_APPLY,
 
                      NULL);
 
diff --git a/plug-ins/common/sharpen.c b/plug-ins/common/sharpen.c
index 9a08e35..022bff4 100644
--- a/plug-ins/common/sharpen.c
+++ b/plug-ins/common/sharpen.c
@@ -473,8 +473,8 @@ sharpen_dialog (GimpDrawable *drawable)
                             NULL, 0,
                             gimp_standard_help_func, PLUG_IN_PROC,
 
-                            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                            GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                            _("_Cancel"), GTK_RESPONSE_CANCEL,
+                            _("_OK"),     GTK_RESPONSE_OK,
 
                             NULL);
 
diff --git a/plug-ins/common/smooth-palette.c b/plug-ins/common/smooth-palette.c
index 77d6197..4f37490 100644
--- a/plug-ins/common/smooth-palette.c
+++ b/plug-ins/common/smooth-palette.c
@@ -430,8 +430,8 @@ dialog (gint32 drawable_id)
                          NULL, 0,
                          gimp_standard_help_func, PLUG_IN_PROC,
 
-                         GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                         GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                         _("_Cancel"), GTK_RESPONSE_CANCEL,
+                         _("_OK"),     GTK_RESPONSE_OK,
 
                          NULL);
 
diff --git a/plug-ins/common/softglow.c b/plug-ins/common/softglow.c
index 37b8e98..8772d38 100644
--- a/plug-ins/common/softglow.c
+++ b/plug-ins/common/softglow.c
@@ -629,8 +629,8 @@ softglow_dialog (GimpDrawable *drawable)
                             NULL, 0,
                             gimp_standard_help_func, PLUG_IN_PROC,
 
-                            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                            GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                            _("_Cancel"), GTK_RESPONSE_CANCEL,
+                            _("_OK"),     GTK_RESPONSE_OK,
 
                             NULL);
 
diff --git a/plug-ins/common/sparkle.c b/plug-ins/common/sparkle.c
index 1ee3cf7..2eee52d 100644
--- a/plug-ins/common/sparkle.c
+++ b/plug-ins/common/sparkle.c
@@ -338,8 +338,8 @@ sparkle_dialog (GimpDrawable *drawable)
                             NULL, 0,
                             gimp_standard_help_func, PLUG_IN_PROC,
 
-                            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                            GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                            _("_Cancel"), GTK_RESPONSE_CANCEL,
+                            _("_OK"),     GTK_RESPONSE_OK,
 
                             NULL);
 
diff --git a/plug-ins/common/sphere-designer.c b/plug-ins/common/sphere-designer.c
index 6ffba69..3f7b5b6 100644
--- a/plug-ins/common/sphere-designer.c
+++ b/plug-ins/common/sphere-designer.c
@@ -2204,10 +2204,10 @@ fileselect (GtkFileChooserAction  action,
                                      GTK_WINDOW (parent),
                                      action,
 
-                                     GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                                     _("_Cancel"), GTK_RESPONSE_CANCEL,
 
                                      action == GTK_FILE_CHOOSER_ACTION_OPEN ?
-                                     GTK_STOCK_OPEN : GTK_STOCK_SAVE,
+                                     _("_Open") : _("_Save"),
                                      GTK_RESPONSE_OK,
 
                                      NULL);
@@ -2557,9 +2557,9 @@ makewindow (void)
                             NULL, 0,
                             gimp_standard_help_func, PLUG_IN_PROC,
 
-                            GIMP_STOCK_RESET, RESPONSE_RESET,
-                            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                            GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                            _("_Reset"),  RESPONSE_RESET,
+                            _("_Cancel"), GTK_RESPONSE_CANCEL,
+                            _("_OK"),     GTK_RESPONSE_OK,
 
                             NULL);
 
diff --git a/plug-ins/common/tile-small.c b/plug-ins/common/tile-small.c
index 3fa0ae5..cf34bd0 100644
--- a/plug-ins/common/tile-small.c
+++ b/plug-ins/common/tile-small.c
@@ -370,8 +370,8 @@ tileit_dialog (void)
                          NULL, 0,
                          gimp_standard_help_func, PLUG_IN_PROC,
 
-                         GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                         GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                         _("_Cancel"), GTK_RESPONSE_CANCEL,
+                         _("_OK"),     GTK_RESPONSE_OK,
 
                          NULL);
 
diff --git a/plug-ins/common/tile.c b/plug-ins/common/tile.c
index 05ccbf0..f14498f 100644
--- a/plug-ins/common/tile.c
+++ b/plug-ins/common/tile.c
@@ -434,8 +434,8 @@ tile_dialog (gint32 image_ID,
                          NULL, 0,
                          gimp_standard_help_func, PLUG_IN_PROC,
 
-                         GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                         GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                         _("_Cancel"), GTK_RESPONSE_CANCEL,
+                         _("_OK"),     GTK_RESPONSE_OK,
 
                          NULL);
 
diff --git a/plug-ins/common/unit-editor.c b/plug-ins/common/unit-editor.c
index b387695..f5872b2 100644
--- a/plug-ins/common/unit-editor.c
+++ b/plug-ins/common/unit-editor.c
@@ -206,8 +206,8 @@ new_unit_dialog (GtkWidget *main_dialog,
                             main_dialog, GTK_DIALOG_MODAL,
                             gimp_standard_help_func, PLUG_IN_PROC,
 
-                            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                            GTK_STOCK_ADD,    GTK_RESPONSE_OK,
+                            _("_Cancel"), GTK_RESPONSE_CANCEL,
+                            _("_Add"),    GTK_RESPONSE_OK,
 
                             NULL);
 
@@ -413,8 +413,8 @@ unit_editor_dialog (void)
                             NULL, 0,
                             gimp_standard_help_func, PLUG_IN_PROC,
 
-                            GTK_STOCK_REFRESH, RESPONSE_REFRESH,
-                            GTK_STOCK_CLOSE,   GTK_RESPONSE_CLOSE,
+                            _("_Refresh"), RESPONSE_REFRESH,
+                            _("_Close"),   GTK_RESPONSE_CLOSE,
 
                             NULL);
 
diff --git a/plug-ins/common/unsharp-mask.c b/plug-ins/common/unsharp-mask.c
index a57fada..0fae459 100644
--- a/plug-ins/common/unsharp-mask.c
+++ b/plug-ins/common/unsharp-mask.c
@@ -839,8 +839,8 @@ unsharp_mask_dialog (GimpDrawable *drawable)
                             NULL, 0,
                             gimp_standard_help_func, PLUG_IN_PROC,
 
-                            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                            GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                            _("_Cancel"), GTK_RESPONSE_CANCEL,
+                            _("_OK"),     GTK_RESPONSE_OK,
 
                             NULL);
 
diff --git a/plug-ins/common/van-gogh-lic.c b/plug-ins/common/van-gogh-lic.c
index 64c31a2..8d04ba2 100644
--- a/plug-ins/common/van-gogh-lic.c
+++ b/plug-ins/common/van-gogh-lic.c
@@ -644,8 +644,8 @@ create_main_dialog (void)
                             NULL, 0,
                             gimp_standard_help_func, PLUG_IN_PROC,
 
-                            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                            GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                            _("_Cancel"), GTK_RESPONSE_CANCEL,
+                            _("_OK"),     GTK_RESPONSE_OK,
 
                             NULL);
 
diff --git a/plug-ins/common/warp.c b/plug-ins/common/warp.c
index 1c81f2b..03c24f8 100644
--- a/plug-ins/common/warp.c
+++ b/plug-ins/common/warp.c
@@ -375,8 +375,8 @@ warp_dialog (GimpDrawable *drawable)
                          NULL, 0,
                          gimp_standard_help_func, PLUG_IN_PROC,
 
-                         GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                         GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                         _("_Cancel"), GTK_RESPONSE_CANCEL,
+                         _("_OK"),     GTK_RESPONSE_OK,
 
                          NULL);
 
diff --git a/plug-ins/common/wavelet-decompose.c b/plug-ins/common/wavelet-decompose.c
index d3b4685..d481257 100644
--- a/plug-ins/common/wavelet-decompose.c
+++ b/plug-ins/common/wavelet-decompose.c
@@ -268,8 +268,8 @@ wavelet_decompose_dialog (void)
                             NULL, 0,
                             gimp_standard_help_func, PLUG_IN_PROC,
 
-                            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                            GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                            _("_Cancel"), GTK_RESPONSE_CANCEL,
+                            _("_OK"),     GTK_RESPONSE_OK,
 
                             NULL);
 
diff --git a/plug-ins/common/web-page.c b/plug-ins/common/web-page.c
index e401f08..91b03c5 100644
--- a/plug-ins/common/web-page.c
+++ b/plug-ins/common/web-page.c
@@ -231,8 +231,8 @@ webpage_dialog (void)
                             NULL, 0,
                             gimp_standard_help_func, PLUG_IN_PROC,
 
-                            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                            _("_Create"),     GTK_RESPONSE_OK,
+                            _("_Cancel"), GTK_RESPONSE_CANCEL,
+                            _("Cre_ate"), GTK_RESPONSE_OK,
 
                             NULL);
 
diff --git a/plug-ins/file-fits/fits.c b/plug-ins/file-fits/fits.c
index 0384863..7065a0e 100644
--- a/plug-ins/file-fits/fits.c
+++ b/plug-ins/file-fits/fits.c
@@ -1146,8 +1146,8 @@ load_dialog (void)
                             NULL, 0,
                             gimp_standard_help_func, LOAD_PROC,
 
-                            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                            GTK_STOCK_OPEN,   GTK_RESPONSE_OK,
+                            _("_Cancel"), GTK_RESPONSE_CANCEL,
+                            _("_Open"),   GTK_RESPONSE_OK,
 
                             NULL);
 
diff --git a/plug-ins/file-fli/fli-gimp.c b/plug-ins/file-fli/fli-gimp.c
index a78b0a4..29b554e 100644
--- a/plug-ins/file-fli/fli-gimp.c
+++ b/plug-ins/file-fli/fli-gimp.c
@@ -866,8 +866,8 @@ load_dialog (const gchar *filename)
                             NULL, 0,
                            gimp_standard_help_func, LOAD_PROC,
 
-                           GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                           GTK_STOCK_OPEN,   GTK_RESPONSE_OK,
+                           _("_Cancel"), GTK_RESPONSE_CANCEL,
+                           _("_Open"),   GTK_RESPONSE_OK,
 
                            NULL);
 
diff --git a/plug-ins/file-tiff/file-tiff-load.c b/plug-ins/file-tiff/file-tiff-load.c
index 65d998c..f183e7e 100644
--- a/plug-ins/file-tiff/file-tiff-load.c
+++ b/plug-ins/file-tiff/file-tiff-load.c
@@ -144,8 +144,8 @@ load_dialog (TIFF              *tif,
                             NULL, 0,
                             gimp_standard_help_func, help_id,
 
-                            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                            _("_Import"),     GTK_RESPONSE_OK,
+                            _("_Cancel"), GTK_RESPONSE_CANCEL,
+                            _("_Import"), GTK_RESPONSE_OK,
 
                             NULL);
 
diff --git a/plug-ins/flame/flame.c b/plug-ins/flame/flame.c
index dbfe61f..050840f 100644
--- a/plug-ins/flame/flame.c
+++ b/plug-ins/flame/flame.c
@@ -470,18 +470,18 @@ make_file_dialog (const gchar *title,
                                              GTK_FILE_CHOOSER_ACTION_OPEN :
                                              GTK_FILE_CHOOSER_ACTION_SAVE,
 
-                                             GTK_STOCK_CANCEL, GTK_STOCK_CANCEL,
+                                             _("_Cancel"), GTK_RESPONSE_CANCEL,
                                              load_save ?
-                                             GTK_STOCK_OPEN : GTK_STOCK_SAVE,
+                                             _("_Open") : _("_Save"),
                                              GTK_RESPONSE_OK,
 
                                              NULL);
 
+  gtk_dialog_set_default_response (GTK_DIALOG (file_dialog), GTK_RESPONSE_OK);
   gtk_dialog_set_alternative_button_order (GTK_DIALOG (file_dialog),
                                            GTK_RESPONSE_OK,
                                            GTK_RESPONSE_CANCEL,
                                            -1);
-  gtk_dialog_set_default_response (GTK_DIALOG (file_dialog), GTK_RESPONSE_OK);
 
   if (! load_save)
     gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (file_dialog),
@@ -646,8 +646,8 @@ edit_callback (GtkWidget *widget,
                                      parent, GTK_DIALOG_DESTROY_WITH_PARENT,
                                      gimp_standard_help_func, PLUG_IN_PROC,
 
-                                     GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                     GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                                     _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                     _("_OK"),     GTK_RESPONSE_OK,
 
                                      NULL);
 
@@ -968,8 +968,8 @@ flame_dialog (void)
                             NULL, 0,
                             gimp_standard_help_func, PLUG_IN_PROC,
 
-                            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                            GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                            _("_Cancel"), GTK_RESPONSE_CANCEL,
+                            _("_OK"),     GTK_RESPONSE_OK,
 
                             NULL);
 
diff --git a/plug-ins/fractal-explorer/fractal-explorer-dialogs.c 
b/plug-ins/fractal-explorer/fractal-explorer-dialogs.c
index 2a4a478..593484c 100644
--- a/plug-ins/fractal-explorer/fractal-explorer-dialogs.c
+++ b/plug-ins/fractal-explorer/fractal-explorer-dialogs.c
@@ -563,8 +563,8 @@ explorer_dialog (void)
                      NULL, 0,
                      gimp_standard_help_func, PLUG_IN_PROC,
 
-                     GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                     GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                     _("_Cancel"), GTK_RESPONSE_CANCEL,
+                     _("_OK"),     GTK_RESPONSE_OK,
 
                      NULL);
 
@@ -1638,8 +1638,8 @@ create_load_file_chooser (GtkWidget *widget,
                                      GTK_WINDOW (dialog),
                                      GTK_FILE_CHOOSER_ACTION_OPEN,
 
-                                     GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                     GTK_STOCK_OPEN,   GTK_RESPONSE_OK,
+                                     _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                     _("_Open"),   GTK_RESPONSE_OK,
 
                                      NULL);
 
@@ -1676,8 +1676,8 @@ create_save_file_chooser (GtkWidget *widget,
                                      GTK_WINDOW (dialog),
                                      GTK_FILE_CHOOSER_ACTION_SAVE,
 
-                                     GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                     GTK_STOCK_SAVE,   GTK_RESPONSE_OK,
+                                     _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                     _("_Save"),   GTK_RESPONSE_OK,
 
                                      NULL);
 
diff --git a/plug-ins/fractal-explorer/fractal-explorer.c b/plug-ins/fractal-explorer/fractal-explorer.c
index bf640a1..af4b351 100644
--- a/plug-ins/fractal-explorer/fractal-explorer.c
+++ b/plug-ins/fractal-explorer/fractal-explorer.c
@@ -1113,8 +1113,8 @@ fractalexplorer_rescan_list (GtkWidget *widget,
                          GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
                          gimp_standard_help_func, PLUG_IN_PROC,
 
-                         GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                         GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                         _("_Cancel"), GTK_RESPONSE_CANCEL,
+                         _("_OK"),     GTK_RESPONSE_OK,
 
                          NULL);
 
diff --git a/plug-ins/gfig/gfig-dialog.c b/plug-ins/gfig/gfig-dialog.c
index 6ccf155..7ad00a9 100644
--- a/plug-ins/gfig/gfig-dialog.c
+++ b/plug-ins/gfig/gfig-dialog.c
@@ -287,8 +287,8 @@ gfig_dialog (void)
                                    NULL, 0,
                                    gimp_standard_help_func, PLUG_IN_PROC,
 
-                                   GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                   GTK_STOCK_CLOSE,  GTK_RESPONSE_OK,
+                                   _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                   _("_Close"),  GTK_RESPONSE_OK,
 
                                    NULL);
 
@@ -635,8 +635,8 @@ gfig_load_action_callback (GtkAction *action,
                                      GTK_WINDOW (data),
                                      GTK_FILE_CHOOSER_ACTION_OPEN,
 
-                                     GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                     GTK_STOCK_OPEN,   GTK_RESPONSE_OK,
+                                     _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                     _("_Open"),   GTK_RESPONSE_OK,
 
                                      NULL);
 
@@ -684,8 +684,8 @@ gfig_save_action_callback (GtkAction *action,
                                      GTK_WINDOW (data),
                                      GTK_FILE_CHOOSER_ACTION_SAVE,
 
-                                     GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                     GTK_STOCK_SAVE,   GTK_RESPONSE_OK,
+                                     _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                     _("_Save"),   GTK_RESPONSE_OK,
 
                                      NULL);
 
@@ -1242,7 +1242,7 @@ gfig_prefs_action_callback (GtkAction *widget,
       dialog = gimp_dialog_new (_("Options"), "gimp-gfig-options",
                                 GTK_WIDGET (data), 0, NULL, NULL,
 
-                                GTK_STOCK_CLOSE,  GTK_RESPONSE_CLOSE,
+                                _("_Close"),  GTK_RESPONSE_CLOSE,
 
                                 NULL);
 
@@ -1390,7 +1390,7 @@ gfig_grid_action_callback (GtkAction *action,
       dialog = gimp_dialog_new (_("Grid"), "gimp-gfig-grid",
                                 GTK_WIDGET (data), 0, NULL, NULL,
 
-                                GTK_STOCK_CLOSE,  GTK_RESPONSE_CLOSE,
+                                _("_Close"),  GTK_RESPONSE_CLOSE,
 
                                 NULL);
 
diff --git a/plug-ins/gimpressionist/brush.c b/plug-ins/gimpressionist/brush.c
index 8eb3883..e277236 100644
--- a/plug-ins/gimpressionist/brush.c
+++ b/plug-ins/gimpressionist/brush.c
@@ -253,16 +253,16 @@ savebrush (GtkWidget *wg,
                                  GTK_WINDOW (gtk_widget_get_toplevel (wg)),
                                  GTK_FILE_CHOOSER_ACTION_SAVE,
 
-                                 GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                 GTK_STOCK_SAVE,   GTK_RESPONSE_OK,
+                                 _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                 _("_Save"),   GTK_RESPONSE_OK,
 
                                  NULL);
 
+  gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
   gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
                                            GTK_RESPONSE_OK,
                                            GTK_RESPONSE_CANCEL,
                                            -1);
-  gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
 
   gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog),
                                                   TRUE);
diff --git a/plug-ins/gimpressionist/gimpressionist.c b/plug-ins/gimpressionist/gimpressionist.c
index 9c186ba..c3e76ac 100644
--- a/plug-ins/gimpressionist/gimpressionist.c
+++ b/plug-ins/gimpressionist/gimpressionist.c
@@ -139,8 +139,8 @@ create_dialog (void)
                             NULL, 0,
                             gimp_standard_help_func, PLUG_IN_PROC,
 
-                            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                            GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                            _("_Cancel"), GTK_RESPONSE_CANCEL,
+                            _("_OK"),     GTK_RESPONSE_OK,
 
                             NULL);
 
diff --git a/plug-ins/gimpressionist/orientmap.c b/plug-ins/gimpressionist/orientmap.c
index 9fb8afa..815b92c 100644
--- a/plug-ins/gimpressionist/orientmap.c
+++ b/plug-ins/gimpressionist/orientmap.c
@@ -524,9 +524,9 @@ create_orientmap_dialog (GtkWidget *parent)
                      gtk_widget_get_toplevel (parent), 0,
                      gimp_standard_help_func, PLUG_IN_PROC,
 
-                     GTK_STOCK_APPLY,  GTK_RESPONSE_APPLY,
-                     GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                     GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                     _("_Apply"),  GTK_RESPONSE_APPLY,
+                     _("_Cancel"), GTK_RESPONSE_CANCEL,
+                     _("_OK"),     GTK_RESPONSE_OK,
 
                      NULL);
 
diff --git a/plug-ins/gimpressionist/presets.c b/plug-ins/gimpressionist/presets.c
index 0649839..c34583b 100644
--- a/plug-ins/gimpressionist/presets.c
+++ b/plug-ins/gimpressionist/presets.c
@@ -635,20 +635,19 @@ create_save_preset (GtkWidget *parent)
       return;
     }
 
-  window =
-    gimp_dialog_new (_("Save Current"), PLUG_IN_ROLE,
-                     gtk_widget_get_toplevel (parent), 0,
-                     gimp_standard_help_func, PLUG_IN_PROC,
+  window = gimp_dialog_new (_("Save Current"), PLUG_IN_ROLE,
+                            gtk_widget_get_toplevel (parent), 0,
+                            gimp_standard_help_func, PLUG_IN_PROC,
 
-                     GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                     GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                            _("_Cancel"), GTK_RESPONSE_CANCEL,
+                            _("_OK"),     GTK_RESPONSE_OK,
 
-                     NULL);
+                            NULL);
 
   gtk_dialog_set_alternative_button_order (GTK_DIALOG (window),
-                                              GTK_RESPONSE_OK,
-                                              GTK_RESPONSE_CANCEL,
-                                              -1);
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
 
   g_signal_connect (window, "response",
                     G_CALLBACK (save_preset_response),
diff --git a/plug-ins/gimpressionist/sizemap.c b/plug-ins/gimpressionist/sizemap.c
index eaf0343..26e7d6c 100644
--- a/plug-ins/gimpressionist/sizemap.c
+++ b/plug-ins/gimpressionist/sizemap.c
@@ -393,22 +393,21 @@ create_sizemap_dialog (GtkWidget *parent)
       return;
     }
 
-  smwindow =
-    gimp_dialog_new (_("Size Map Editor"), PLUG_IN_ROLE,
-                     gtk_widget_get_toplevel (parent), 0,
-                     gimp_standard_help_func, PLUG_IN_PROC,
+  smwindow = gimp_dialog_new (_("Size Map Editor"), PLUG_IN_ROLE,
+                              gtk_widget_get_toplevel (parent), 0,
+                              gimp_standard_help_func, PLUG_IN_PROC,
 
-                     GTK_STOCK_APPLY,  RESPONSE_APPLY,
-                     GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                     GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                              _("_Apply"),  RESPONSE_APPLY,
+                              _("_Cancel"), GTK_RESPONSE_CANCEL,
+                              _("_OK"),     GTK_RESPONSE_OK,
 
-                     NULL);
+                              NULL);
 
   gtk_dialog_set_alternative_button_order (GTK_DIALOG (smwindow),
-                                              GTK_RESPONSE_OK,
-                                             RESPONSE_APPLY,
-                                              GTK_RESPONSE_CANCEL,
-                                              -1);
+                                           GTK_RESPONSE_OK,
+                                           RESPONSE_APPLY,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
 
   g_signal_connect (smwindow, "response",
                     G_CALLBACK (smresponse),
diff --git a/plug-ins/gradient-flare/gradient-flare.c b/plug-ins/gradient-flare/gradient-flare.c
index 4db1821..74f1ccc 100644
--- a/plug-ins/gradient-flare/gradient-flare.c
+++ b/plug-ins/gradient-flare/gradient-flare.c
@@ -2357,8 +2357,8 @@ dlg_run (void)
                                         NULL, 0,
                                         gimp_standard_help_func, PLUG_IN_PROC,
 
-                                        GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                        GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                                        _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                        _("_OK"),     GTK_RESPONSE_OK,
 
                                         NULL);
 
@@ -3319,9 +3319,9 @@ ed_run (GtkWindow            *parent,
                              GTK_WIDGET (parent), 0,
                              gimp_standard_help_func, PLUG_IN_PROC,
 
-                             _("Rescan Gradients"), RESPONSE_RESCAN,
-                             GTK_STOCK_CANCEL,      GTK_RESPONSE_CANCEL,
-                             GTK_STOCK_OK,          GTK_RESPONSE_OK,
+                             _("_Rescan Gradients"), RESPONSE_RESCAN,
+                             _("_Cancel"),           GTK_RESPONSE_CANCEL,
+                             _("_OK"),               GTK_RESPONSE_OK,
 
                              NULL);
 
diff --git a/plug-ins/ifs-compose/ifs-compose.c b/plug-ins/ifs-compose/ifs-compose.c
index 52af582..f821812 100644
--- a/plug-ins/ifs-compose/ifs-compose.c
+++ b/plug-ins/ifs-compose/ifs-compose.c
@@ -757,11 +757,11 @@ ifs_compose_dialog (gint32 drawable_id)
                             NULL, 0,
                             gimp_standard_help_func, PLUG_IN_PROC,
 
-                            GTK_STOCK_OPEN,   RESPONSE_OPEN,
-                            GTK_STOCK_SAVE,   RESPONSE_SAVE,
-                            GIMP_STOCK_RESET, RESPONSE_RESET,
-                            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                            GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                            _("_Open"),   RESPONSE_OPEN,
+                            _("_Save"),   RESPONSE_SAVE,
+                            _("_Reset"),  RESPONSE_RESET,
+                            _("_Cancel"), GTK_RESPONSE_CANCEL,
+                            _("_OK"),     GTK_RESPONSE_OK,
 
                             NULL);
 
@@ -1162,7 +1162,7 @@ ifs_options_dialog (GtkWidget *parent)
                          parent, 0,
                          gimp_standard_help_func, PLUG_IN_PROC,
 
-                         GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
+                         _("_Close"), GTK_RESPONSE_CLOSE,
 
                          NULL);
 
@@ -2527,8 +2527,8 @@ ifs_compose_save (GtkWidget *parent)
                                      GTK_WINDOW (parent),
                                      GTK_FILE_CHOOSER_ACTION_SAVE,
 
-                                     GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                     GTK_STOCK_SAVE,   GTK_RESPONSE_OK,
+                                     _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                     _("_Save"),   GTK_RESPONSE_OK,
 
                                      NULL);
 
@@ -2564,8 +2564,8 @@ ifs_compose_load (GtkWidget *parent)
                                      GTK_WINDOW (parent),
                                      GTK_FILE_CHOOSER_ACTION_OPEN,
 
-                                     GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                     GTK_STOCK_OPEN,   GTK_RESPONSE_OK,
+                                     _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                     _("_Open"),   GTK_RESPONSE_OK,
 
                                      NULL);
 
diff --git a/plug-ins/imagemap/imap_browse.c b/plug-ins/imagemap/imap_browse.c
index e947bf0..33f6954 100644
--- a/plug-ins/imagemap/imap_browse.c
+++ b/plug-ins/imagemap/imap_browse.c
@@ -27,12 +27,16 @@
 
 #include "imap_browse.h"
 
+#include "libgimp/stdplugins-intl.h"
+
+
 static const GtkTargetEntry target_table[] =
 {
   {"STRING",     0, 1 },
   {"text/plain", 0, 2 }
 };
 
+
 static void
 select_cb (GtkWidget      *dialog,
            gint            response_id,
@@ -64,35 +68,35 @@ static void
 browse_cb (GtkWidget      *widget,
            BrowseWidget_t *browse)
 {
-   if (!browse->file_chooser)
-     {
-       GtkWidget *dialog;
-
-       dialog = browse->file_chooser =
-         gtk_file_chooser_dialog_new (browse->name,
-                                      GTK_WINDOW (gtk_widget_get_toplevel (widget)),
-                                      GTK_FILE_CHOOSER_ACTION_OPEN,
-
-                                      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                      GTK_STOCK_OPEN,   GTK_RESPONSE_OK,
-
-                                      NULL);
-
-       gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
-                                                GTK_RESPONSE_OK,
-                                                GTK_RESPONSE_CANCEL,
-                                                -1);
-
-       gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+  if (!browse->file_chooser)
+    {
+      GtkWidget *dialog;
+
+      dialog = browse->file_chooser =
+        gtk_file_chooser_dialog_new (browse->name,
+                                     GTK_WINDOW (gtk_widget_get_toplevel (widget)),
+                                     GTK_FILE_CHOOSER_ACTION_OPEN,
+
+                                     _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                     _("_Open"),   GTK_RESPONSE_OK,
+
+                                     NULL);
+
+      gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+      gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                               GTK_RESPONSE_OK,
+                                               GTK_RESPONSE_CANCEL,
+                                               -1);
+
+      g_signal_connect (dialog, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed),
+                        &dialog);
+      g_signal_connect (dialog, "response",
+                        G_CALLBACK (select_cb),
+                        browse);
+    }
 
-       g_signal_connect (dialog, "destroy",
-                         G_CALLBACK (gtk_widget_destroyed),
-                         &dialog);
-       g_signal_connect (dialog, "response",
-                         G_CALLBACK (select_cb),
-                         browse);
-     }
-   gtk_window_present (GTK_WINDOW (browse->file_chooser));
+  gtk_window_present (GTK_WINDOW (browse->file_chooser));
 }
 
 static void
diff --git a/plug-ins/imagemap/imap_default_dialog.c b/plug-ins/imagemap/imap_default_dialog.c
index 17dfbf8..64d2028 100644
--- a/plug-ins/imagemap/imap_default_dialog.c
+++ b/plug-ins/imagemap/imap_default_dialog.c
@@ -28,6 +28,8 @@
 #include "imap_default_dialog.h"
 #include "imap_main.h"
 
+#include "libgimp/stdplugins-intl.h"
+
 
 static void
 dialog_response (GtkWidget       *widget,
@@ -86,46 +88,46 @@ default_dialog_set_cancel_cb(DefaultDialog_t *dialog,
 DefaultDialog_t *
 make_default_dialog (const gchar *title)
 {
-   DefaultDialog_t *data = g_new0 (DefaultDialog_t, 1);
-
-   data->ok_cb = NULL;
-   data->apply_cb = NULL;
-   data->cancel_cb = NULL;
-
-   data->dialog = gimp_dialog_new (title, PLUG_IN_ROLE,
-                                   get_dialog(), 0,
-                                   gimp_standard_help_func, PLUG_IN_PROC,
-                                   NULL);
-
-   data->apply = gtk_dialog_add_button (GTK_DIALOG (data->dialog),
-                                        GTK_STOCK_APPLY, GTK_RESPONSE_APPLY);
-
-   data->cancel = gtk_dialog_add_button (GTK_DIALOG (data->dialog),
-                                         GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
-
-   data->ok = gtk_dialog_add_button (GTK_DIALOG (data->dialog),
-                                     GTK_STOCK_OK, GTK_RESPONSE_OK);
-
-   gtk_dialog_set_alternative_button_order (GTK_DIALOG (data->dialog),
-                                            GTK_RESPONSE_OK,
-                                            GTK_RESPONSE_APPLY,
-                                            GTK_RESPONSE_CANCEL,
-                                            -1);
-
-   g_signal_connect (data->dialog, "response",
-                     G_CALLBACK (dialog_response),
-                     data);
-   g_signal_connect (data->dialog, "destroy",
-                     G_CALLBACK (gtk_widget_destroyed),
-                     &data->dialog);
-
-   data->vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
-   gtk_container_set_border_width (GTK_CONTAINER (data->vbox), 12);
-   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (data->dialog))),
-                       data->vbox, TRUE, TRUE, 0);
-   gtk_widget_show (data->vbox);
-
-   return data;
+  DefaultDialog_t *data = g_new0 (DefaultDialog_t, 1);
+
+  data->ok_cb = NULL;
+  data->apply_cb = NULL;
+  data->cancel_cb = NULL;
+
+  data->dialog = gimp_dialog_new (title, PLUG_IN_ROLE,
+                                  get_dialog(), 0,
+                                  gimp_standard_help_func, PLUG_IN_PROC,
+                                  NULL);
+
+  data->apply = gtk_dialog_add_button (GTK_DIALOG (data->dialog),
+                                       _("_Apply"), GTK_RESPONSE_APPLY);
+
+  data->cancel = gtk_dialog_add_button (GTK_DIALOG (data->dialog),
+                                        _("_Cancel"), GTK_RESPONSE_CANCEL);
+
+  data->ok = gtk_dialog_add_button (GTK_DIALOG (data->dialog),
+                                    _("_OK"), GTK_RESPONSE_OK);
+
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (data->dialog),
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_APPLY,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
+  g_signal_connect (data->dialog, "response",
+                    G_CALLBACK (dialog_response),
+                    data);
+  g_signal_connect (data->dialog, "destroy",
+                    G_CALLBACK (gtk_widget_destroyed),
+                    &data->dialog);
+
+  data->vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
+  gtk_container_set_border_width (GTK_CONTAINER (data->vbox), 12);
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (data->dialog))),
+                      data->vbox, TRUE, TRUE, 0);
+  gtk_widget_show (data->vbox);
+
+  return data;
 }
 
 void
diff --git a/plug-ins/imagemap/imap_file.c b/plug-ins/imagemap/imap_file.c
index e0fcb25..f2bddf1 100644
--- a/plug-ins/imagemap/imap_file.c
+++ b/plug-ins/imagemap/imap_file.c
@@ -68,18 +68,17 @@ do_file_open_dialog (void)
                                      NULL,
                                      GTK_FILE_CHOOSER_ACTION_OPEN,
 
-                                     GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                     GTK_STOCK_OPEN,   GTK_RESPONSE_OK,
+                                     _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                     _("_Open"),   GTK_RESPONSE_OK,
 
                                      NULL);
 
+      gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
       gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
                                                GTK_RESPONSE_OK,
                                                GTK_RESPONSE_CANCEL,
                                                -1);
 
-      gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
-
       g_signal_connect (dialog, "destroy",
                         G_CALLBACK (gtk_widget_destroyed),
                         &dialog);
@@ -118,21 +117,20 @@ do_file_save_as_dialog (void)
     {
       gchar *filename;
 
-      dialog =
-        gtk_file_chooser_dialog_new (_("Save Image Map"),
-                                     NULL,
-                                     GTK_FILE_CHOOSER_ACTION_SAVE,
+      dialog = gtk_file_chooser_dialog_new (_("Save Image Map"),
+                                            NULL,
+                                            GTK_FILE_CHOOSER_ACTION_SAVE,
 
-                                     GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                     GTK_STOCK_SAVE,   GTK_RESPONSE_OK,
+                                            _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                            _("_Save"),   GTK_RESPONSE_OK,
 
-                                     NULL);
+                                            NULL);
 
+      gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
       gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
                                                GTK_RESPONSE_OK,
                                                GTK_RESPONSE_CANCEL,
                                                -1);
-      gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
 
       gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog),
                                                       TRUE);
diff --git a/plug-ins/lighting/lighting-ui.c b/plug-ins/lighting/lighting-ui.c
index 8cfa45b..7274fb2 100644
--- a/plug-ins/lighting/lighting-ui.c
+++ b/plug-ins/lighting/lighting-ui.c
@@ -1034,8 +1034,8 @@ main_dialog (GimpDrawable *drawable)
                             NULL, 0,
                             gimp_standard_help_func, PLUG_IN_PROC,
 
-                            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                            GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                            _("_Cancel"), GTK_RESPONSE_CANCEL,
+                            _("_OK"),     GTK_RESPONSE_OK,
 
                             NULL);
 
@@ -1159,16 +1159,16 @@ save_lighting_preset (GtkWidget *widget,
                                      GTK_WINDOW (appwin),
                                      GTK_FILE_CHOOSER_ACTION_SAVE,
 
-                                     GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                     GTK_STOCK_SAVE,   GTK_RESPONSE_OK,
+                                     _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                     _("_Save"),   GTK_RESPONSE_OK,
 
                                      NULL);
 
+      gtk_dialog_set_default_response (GTK_DIALOG (window), GTK_RESPONSE_OK);
       gtk_dialog_set_alternative_button_order (GTK_DIALOG (window),
                                                GTK_RESPONSE_OK,
                                                GTK_RESPONSE_CANCEL,
                                                -1);
-      gtk_dialog_set_default_response (GTK_DIALOG (window), GTK_RESPONSE_OK);
 
       gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (window),
                                                       TRUE);
@@ -1303,16 +1303,16 @@ load_lighting_preset (GtkWidget *widget,
                                      GTK_WINDOW (appwin),
                                      GTK_FILE_CHOOSER_ACTION_OPEN,
 
-                                     GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                     GTK_STOCK_OPEN,   GTK_RESPONSE_OK,
+                                     _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                     _("_Open"),   GTK_RESPONSE_OK,
 
                                      NULL);
 
+      gtk_dialog_set_default_response (GTK_DIALOG (window), GTK_RESPONSE_OK);
       gtk_dialog_set_alternative_button_order (GTK_DIALOG (window),
                                                GTK_RESPONSE_OK,
                                                GTK_RESPONSE_CANCEL,
                                                -1);
-      gtk_dialog_set_default_response (GTK_DIALOG (window), GTK_RESPONSE_OK);
 
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed),
diff --git a/plug-ins/map-object/map-object-ui.c b/plug-ins/map-object/map-object-ui.c
index 38a6920..8d586c3 100644
--- a/plug-ins/map-object/map-object-ui.c
+++ b/plug-ins/map-object/map-object-ui.c
@@ -1330,8 +1330,8 @@ main_dialog (GimpDrawable *drawable)
                             NULL, 0,
                             gimp_standard_help_func, PLUG_IN_PROC,
 
-                            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                            GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                            _("_Cancel"), GTK_RESPONSE_CANCEL,
+                            _("_OK"),     GTK_RESPONSE_OK,
 
                             NULL);
 
diff --git a/plug-ins/pagecurl/pagecurl.c b/plug-ins/pagecurl/pagecurl.c
index 727fa70..475a960 100644
--- a/plug-ins/pagecurl/pagecurl.c
+++ b/plug-ins/pagecurl/pagecurl.c
@@ -436,8 +436,8 @@ dialog (void)
                             NULL, 0,
                             gimp_standard_help_func, PLUG_IN_PROC,
 
-                            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                            GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                            _("_Cancel"), GTK_RESPONSE_CANCEL,
+                            _("_OK"),     GTK_RESPONSE_OK,
 
                             NULL);
 
diff --git a/plug-ins/screenshot/screenshot.c b/plug-ins/screenshot/screenshot.c
index df7903d..cd582e6 100644
--- a/plug-ins/screenshot/screenshot.c
+++ b/plug-ins/screenshot/screenshot.c
@@ -413,7 +413,6 @@ shoot_dialog (GdkScreen **screen)
   GtkWidget     *button;
   GtkWidget     *toggle;
   GtkWidget     *spinner;
-  GdkPixbuf     *pixbuf;
   GSList        *radio_group = NULL;
   GtkAdjustment *adj;
   gboolean       run;
@@ -424,26 +423,16 @@ shoot_dialog (GdkScreen **screen)
                             NULL, 0,
                             gimp_standard_help_func, PLUG_IN_PROC,
 
-                            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                            _("_Cancel"), GTK_RESPONSE_CANCEL,
+                            _("S_nap"),   GTK_RESPONSE_OK,
 
                             NULL);
 
-  button = gtk_dialog_add_button (GTK_DIALOG (dialog),
-                                  _("S_nap"), GTK_RESPONSE_OK);
-
   gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
                                            GTK_RESPONSE_OK,
                                            GTK_RESPONSE_CANCEL,
                                            -1);
 
-  pixbuf = gdk_pixbuf_new_from_inline (-1, screenshot_icon, FALSE, NULL);
-  if (pixbuf)
-    {
-      gtk_button_set_image (GTK_BUTTON (button),
-                            gtk_image_new_from_pixbuf (pixbuf));
-      g_object_unref (pixbuf);
-    }
-
   main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
diff --git a/plug-ins/script-fu/script-fu-console.c b/plug-ins/script-fu/script-fu-console.c
index 2c1cfae..20d8565 100644
--- a/plug-ins/script-fu/script-fu-console.c
+++ b/plug-ins/script-fu/script-fu-console.c
@@ -129,9 +129,9 @@ script_fu_console_interface (void)
                                     NULL, 0,
                                     gimp_standard_help_func, PROC_NAME,
 
-                                    GTK_STOCK_SAVE,  RESPONSE_SAVE,
-                                    GTK_STOCK_CLEAR, RESPONSE_CLEAR,
-                                    GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
+                                    _("_Save"),  RESPONSE_SAVE,
+                                    _("C_lear"), RESPONSE_CLEAR,
+                                    _("_Close"), GTK_RESPONSE_CLOSE,
 
                                     NULL);
 
@@ -288,16 +288,18 @@ script_fu_console_save_dialog (ConsoleInterface *console)
         gtk_file_chooser_dialog_new (_("Save Script-Fu Console Output"),
                                      GTK_WINDOW (console->dialog),
                                      GTK_FILE_CHOOSER_ACTION_SAVE,
-                                     GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                     GTK_STOCK_SAVE,   GTK_RESPONSE_OK,
+
+                                     _("_Cancel"), GTK_RESPONSE_CANCEL,
+                                     _("_Save"),   GTK_RESPONSE_OK,
+
                                      NULL);
 
+      gtk_dialog_set_default_response (GTK_DIALOG (console->save_dialog),
+                                       GTK_RESPONSE_OK);
       gtk_dialog_set_alternative_button_order (GTK_DIALOG (console->save_dialog),
                                                GTK_RESPONSE_OK,
                                                GTK_RESPONSE_CANCEL,
                                                -1);
-      gtk_dialog_set_default_response (GTK_DIALOG (console->save_dialog),
-                                       GTK_RESPONSE_OK);
 
       gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (console->save_dialog),
                                                       TRUE);
@@ -365,8 +367,8 @@ script_fu_browse_callback (GtkWidget        *widget,
                                       "script-fu-procedure-browser",
                                       gimp_standard_help_func, PROC_NAME,
 
-                                      GTK_STOCK_APPLY, GTK_RESPONSE_APPLY,
-                                      GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
+                                      _("_Apply"), GTK_RESPONSE_APPLY,
+                                      _("_Close"), GTK_RESPONSE_CLOSE,
 
                                       NULL);
 
diff --git a/plug-ins/script-fu/script-fu-interface.c b/plug-ins/script-fu/script-fu-interface.c
index 3659c08..85cb31b 100644
--- a/plug-ins/script-fu/script-fu-interface.c
+++ b/plug-ins/script-fu/script-fu-interface.c
@@ -232,9 +232,9 @@ script_fu_interface (SFScript  *script,
                      NULL, 0,
                      gimp_standard_help_func, script->name,
 
-                     GIMP_STOCK_RESET, RESPONSE_RESET,
-                     GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                     GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                     _("_Reset"),  RESPONSE_RESET,
+                     _("_Cancel"), GTK_RESPONSE_CANCEL,
+                     _("_OK"),     GTK_RESPONSE_OK,
 
                      NULL);
   g_free (title);
diff --git a/plug-ins/script-fu/script-fu-server.c b/plug-ins/script-fu/script-fu-server.c
index cc07501..b2dc4b8 100644
--- a/plug-ins/script-fu/script-fu-server.c
+++ b/plug-ins/script-fu/script-fu-server.c
@@ -831,7 +831,7 @@ server_interface (void)
                          NULL, 0,
                          gimp_standard_help_func, "plug-in-script-fu-server",
 
-                         GTK_STOCK_CANCEL,   GTK_RESPONSE_CANCEL,
+                         _("_Cancel"),       GTK_RESPONSE_CANCEL,
                          _("_Start Server"), GTK_RESPONSE_OK,
 
                          NULL);
diff --git a/plug-ins/selection-to-path/selection-to-path.c b/plug-ins/selection-to-path/selection-to-path.c
index 16e574b..30a50d8 100644
--- a/plug-ins/selection-to-path/selection-to-path.c
+++ b/plug-ins/selection-to-path/selection-to-path.c
@@ -305,9 +305,9 @@ sel2path_dialog (SELVALS *sels)
                          NULL, 0,
                          gimp_standard_help_func, "plug-in-sel2path-advanced",
 
-                         GIMP_STOCK_RESET, RESPONSE_RESET,
-                         GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                         GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                         _("_Reset"), RESPONSE_RESET,
+                         _("_Cancel"), GTK_RESPONSE_CANCEL,
+                         _("_OK"),     GTK_RESPONSE_OK,
 
                          NULL);
 
diff --git a/po-plug-ins/POTFILES.in b/po-plug-ins/POTFILES.in
index 8af2873..18fe8c6 100644
--- a/po-plug-ins/POTFILES.in
+++ b/po-plug-ins/POTFILES.in
@@ -168,6 +168,7 @@ plug-ins/help/gimphelpdomain.c
 plug-ins/help/gimphelplocale.c
 plug-ins/ifs-compose/ifs-compose.c
 plug-ins/imagemap/imap_about.c
+plug-ins/imagemap/imap_browse.c
 plug-ins/imagemap/imap_circle.c
 plug-ins/imagemap/imap_cmd_clear.c
 plug-ins/imagemap/imap_cmd_copy.c
@@ -199,6 +200,7 @@ plug-ins/imagemap/imap_cmd_select_region.c
 plug-ins/imagemap/imap_cmd_send_to_back.c
 plug-ins/imagemap/imap_cmd_unselect.c
 plug-ins/imagemap/imap_cmd_unselect_all.c
+plug-ins/imagemap/imap_default_dialog.c
 plug-ins/imagemap/imap_edit_area_info.c
 plug-ins/imagemap/imap_file.c
 plug-ins/imagemap/imap_grid.c


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]