From a541421efe8a642670b3e9a33157d6ad78fed1a6 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Sun, 26 Jan 2003 12:24:05 +0000 Subject: [PATCH] app/plug-in/plug-ins.c libgimp/libgimp-intl.h libgimpwidgets/gimpstock.c 2003-01-26 Michael Natterer * app/plug-in/plug-ins.c * libgimp/libgimp-intl.h * libgimpwidgets/gimpstock.c * plug-ins/perl/Gimp.xs * plug-ins/script-fu/script-fu.c * plug-ins/script-fu/script-fu-intl.h: replaced all remaining "gimp14" by GETTEXT_PACKAGE. --- ChangeLog | 10 ++ app/plug-in/gimppluginmanager.c | 3 +- app/plug-in/plug-ins.c | 3 +- libgimp/libgimp-intl.h | 4 +- libgimpwidgets/gimpstock.c | 181 ++++++++++++++-------------- plug-ins/perl/Gimp.xs | 4 +- plug-ins/script-fu/script-fu-intl.h | 5 + plug-ins/script-fu/script-fu.c | 2 +- 8 files changed, 114 insertions(+), 98 deletions(-) diff --git a/ChangeLog b/ChangeLog index b2744056c9..c9fc385f83 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2003-01-26 Michael Natterer + + * app/plug-in/plug-ins.c + * libgimp/libgimp-intl.h + * libgimpwidgets/gimpstock.c + * plug-ins/perl/Gimp.xs + * plug-ins/script-fu/script-fu.c + * plug-ins/script-fu/script-fu-intl.h: replaced all remaining + "gimp14" by GETTEXT_PACKAGE. + 2003-01-26 Sven Neumann * plug-ins/common/png.c: added a tooltip describing the diff --git a/app/plug-in/gimppluginmanager.c b/app/plug-in/gimppluginmanager.c index bd4bf61c1f..b626fc0bdf 100644 --- a/app/plug-in/gimppluginmanager.c +++ b/app/plug-in/gimppluginmanager.c @@ -54,8 +54,7 @@ #include "libgimp/gimpintl.h" -#define STD_PLUGINS_DOMAIN "gimp14-std-plug-ins" -#define SCRIPT_FU_DOMAIN "gimp14-script-fu" +#define STD_PLUGINS_DOMAIN GETTEXT_PACKAGE "-std-plug-ins" typedef struct _PlugInLocaleDomainDef PlugInLocaleDomainDef; diff --git a/app/plug-in/plug-ins.c b/app/plug-in/plug-ins.c index bd4bf61c1f..b626fc0bdf 100644 --- a/app/plug-in/plug-ins.c +++ b/app/plug-in/plug-ins.c @@ -54,8 +54,7 @@ #include "libgimp/gimpintl.h" -#define STD_PLUGINS_DOMAIN "gimp14-std-plug-ins" -#define SCRIPT_FU_DOMAIN "gimp14-script-fu" +#define STD_PLUGINS_DOMAIN GETTEXT_PACKAGE "-std-plug-ins" typedef struct _PlugInLocaleDomainDef PlugInLocaleDomainDef; diff --git a/libgimp/libgimp-intl.h b/libgimp/libgimp-intl.h index fe75f3e155..300e73fc07 100644 --- a/libgimp/libgimp-intl.h +++ b/libgimp/libgimp-intl.h @@ -29,10 +29,10 @@ #include -#define _(String) dgettext ("gimp14-libgimp", String) +#define _(String) dgettext (GETTEXT_PACKAGE "-libgimp", String) #undef gettext -#define gettext(String) dgettext ("gimp14-libgimp", String) +#define gettext(String) dgettext (GETTEXT_PACKAGE "-libgimp", String) #ifdef gettext_noop # define N_(String) gettext_noop (String) diff --git a/libgimpwidgets/gimpstock.c b/libgimpwidgets/gimpstock.c index 0713b7db92..bd705ae446 100644 --- a/libgimpwidgets/gimpstock.c +++ b/libgimpwidgets/gimpstock.c @@ -32,6 +32,9 @@ #include "libgimp/libgimp-intl.h" +#define LIBGIMP_DOMAIN GETTEXT_PACKAGE "-libgimp" + + static GtkIconFactory *gimp_stock_factory = NULL; @@ -85,105 +88,105 @@ add_sized_with_same_fallback (GtkIconFactory *factory, static GtkStockItem gimp_stock_items[] = { - { GIMP_STOCK_ANCHOR, N_("Anchor"), 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_DUPLICATE, N_("_Duplicate"), 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_EDIT, N_("_Edit"), 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_LINKED, N_("Linked"), 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_PASTE_AS_NEW, N_("Paste as New"), 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_PASTE_INTO, N_("Paste Into"), 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_RESET, N_("_Reset"), 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_VISIBLE, N_("Visible"), 0, 0, "gimp14-libgimp" }, + { GIMP_STOCK_ANCHOR, N_("Anchor"), 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_DUPLICATE, N_("_Duplicate"), 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_EDIT, N_("_Edit"), 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_LINKED, N_("Linked"), 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_PASTE_AS_NEW, N_("Paste as New"), 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_PASTE_INTO, N_("Paste Into"), 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_RESET, N_("_Reset"), 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_VISIBLE, N_("Visible"), 0, 0, LIBGIMP_DOMAIN }, - { GIMP_STOCK_HCHAIN, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_HCHAIN_BROKEN, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_VCHAIN, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_VCHAIN_BROKEN, NULL, 0, 0, "gimp14-libgimp" }, + { GIMP_STOCK_HCHAIN, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_HCHAIN_BROKEN, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_VCHAIN, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_VCHAIN_BROKEN, NULL, 0, 0, LIBGIMP_DOMAIN }, - { GIMP_STOCK_SELECTION_ALL, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_SELECTION_NONE, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_SELECTION_GROW, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_SELECTION_SHRINK, NULL, 0, 0, "gimp14-libgimp" }, + { GIMP_STOCK_SELECTION_ALL, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_SELECTION_NONE, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_SELECTION_GROW, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_SELECTION_SHRINK, NULL, 0, 0, LIBGIMP_DOMAIN }, - { GIMP_STOCK_SELECTION_REPLACE, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_SELECTION_ADD, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_SELECTION_SUBTRACT, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_SELECTION_INTERSECT, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_SELECTION_STROKE, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_SELECTION_TO_CHANNEL, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_SELECTION_TO_PATH, NULL, 0, 0, "gimp14-libgimp" }, + { GIMP_STOCK_SELECTION_REPLACE, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_SELECTION_ADD, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_SELECTION_SUBTRACT, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_SELECTION_INTERSECT, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_SELECTION_STROKE, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_SELECTION_TO_CHANNEL, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_SELECTION_TO_PATH, NULL, 0, 0, LIBGIMP_DOMAIN }, - { GIMP_STOCK_PATH_STROKE, NULL, 0, 0, "gimp14-libgimp" }, + { GIMP_STOCK_PATH_STROKE, NULL, 0, 0, LIBGIMP_DOMAIN }, - { GIMP_STOCK_CONVERT_RGB, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_CONVERT_GRAYSCALE, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_CONVERT_INDEXED, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_INVERT, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_MERGE_DOWN, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_LAYER_TO_IMAGESIZE, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_PLUGIN, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_RESHOW_FILTER, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_ROTATE_90, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_ROTATE_180, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_ROTATE_270, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_RESIZE, N_("_Resize"), 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_SCALE, N_("_Scale"), 0, 0, "gimp14-libgimp" }, + { GIMP_STOCK_CONVERT_RGB, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_CONVERT_GRAYSCALE, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_CONVERT_INDEXED, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_INVERT, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_MERGE_DOWN, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_LAYER_TO_IMAGESIZE, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_PLUGIN, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_RESHOW_FILTER, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_ROTATE_90, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_ROTATE_180, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_ROTATE_270, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_RESIZE, N_("_Resize"), 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_SCALE, N_("_Scale"), 0, 0, LIBGIMP_DOMAIN }, - { GIMP_STOCK_COLOR_PICKER_BLACK, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_COLOR_PICKER_GRAY, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_COLOR_PICKER_WHITE, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_COLOR_TRIANGLE, NULL, 0, 0, "gimp14-libgimp" }, + { GIMP_STOCK_COLOR_PICKER_BLACK, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_COLOR_PICKER_GRAY, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_COLOR_PICKER_WHITE, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_COLOR_TRIANGLE, NULL, 0, 0, LIBGIMP_DOMAIN }, - { GIMP_STOCK_CHAR_PICKER, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_LETTER_SPACING, N_("L_etter Spacing"), 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_LINE_SPACING, N_("L_ine Spacing"), 0, 0, "gimp14-libgimp" }, + { GIMP_STOCK_CHAR_PICKER, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_LETTER_SPACING, N_("L_etter Spacing"), 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_LINE_SPACING, N_("L_ine Spacing"), 0, 0, LIBGIMP_DOMAIN }, - { GIMP_STOCK_NAVIGATION, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_QMASK_OFF, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_QMASK_ON, NULL, 0, 0, "gimp14-libgimp" }, + { GIMP_STOCK_NAVIGATION, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_QMASK_OFF, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_QMASK_ON, NULL, 0, 0, LIBGIMP_DOMAIN }, - { GIMP_STOCK_TOOL_OPTIONS, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_INFO, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_WARNING, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_WILBER, NULL, 0, 0, "gimp14-libgimp" }, + { GIMP_STOCK_TOOL_OPTIONS, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_INFO, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_WARNING, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_WILBER, NULL, 0, 0, LIBGIMP_DOMAIN }, - { GIMP_STOCK_TOOL_AIRBRUSH, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_TOOL_BEZIER_SELECT, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_TOOL_BLEND, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_TOOL_BLUR, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_TOOL_BRIGHTNESS_CONTRAST, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_TOOL_BUCKET_FILL, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_TOOL_BY_COLOR_SELECT, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_TOOL_CLONE, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_TOOL_COLOR_BALANCE, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_TOOL_COLOR_PICKER, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_TOOL_CROP, N_("Crop"), 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_TOOL_CURVES, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_TOOL_DODGE, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_TOOL_ELLIPSE_SELECT, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_TOOL_ERASER, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_TOOL_FLIP, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_TOOL_FREE_SELECT, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_TOOL_FUZZY_SELECT, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_TOOL_HISTOGRAM, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_TOOL_HUE_SATURATION, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_TOOL_INK, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_TOOL_ISCISSORS, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_TOOL_LEVELS, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_TOOL_MEASURE, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_TOOL_MOVE, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_TOOL_PAINTBRUSH, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_TOOL_PATH, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_TOOL_PENCIL, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_TOOL_PERSPECTIVE, N_("_Transform"), 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_TOOL_POSTERIZE, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_TOOL_RECT_SELECT, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_TOOL_ROTATE, N_("_Rotate"), 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_TOOL_SCALE, N_("_Scale"), 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_TOOL_SHEAR, N_("_Shear"), 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_TOOL_SMUDGE, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_TOOL_TEXT, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_TOOL_THRESHOLD, NULL, 0, 0, "gimp14-libgimp" }, - { GIMP_STOCK_TOOL_ZOOM, NULL, 0, 0, "gimp14-libgimp" } + { GIMP_STOCK_TOOL_AIRBRUSH, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_TOOL_BEZIER_SELECT, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_TOOL_BLEND, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_TOOL_BLUR, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_TOOL_BRIGHTNESS_CONTRAST, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_TOOL_BUCKET_FILL, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_TOOL_BY_COLOR_SELECT, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_TOOL_CLONE, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_TOOL_COLOR_BALANCE, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_TOOL_COLOR_PICKER, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_TOOL_CROP, N_("Crop"), 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_TOOL_CURVES, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_TOOL_DODGE, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_TOOL_ELLIPSE_SELECT, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_TOOL_ERASER, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_TOOL_FLIP, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_TOOL_FREE_SELECT, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_TOOL_FUZZY_SELECT, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_TOOL_HISTOGRAM, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_TOOL_HUE_SATURATION, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_TOOL_INK, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_TOOL_ISCISSORS, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_TOOL_LEVELS, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_TOOL_MEASURE, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_TOOL_MOVE, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_TOOL_PAINTBRUSH, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_TOOL_PATH, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_TOOL_PENCIL, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_TOOL_PERSPECTIVE, N_("_Transform"), 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_TOOL_POSTERIZE, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_TOOL_RECT_SELECT, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_TOOL_ROTATE, N_("_Rotate"), 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_TOOL_SCALE, N_("_Scale"), 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_TOOL_SHEAR, N_("_Shear"), 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_TOOL_SMUDGE, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_TOOL_TEXT, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_TOOL_THRESHOLD, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_TOOL_ZOOM, NULL, 0, 0, LIBGIMP_DOMAIN } }; static struct diff --git a/plug-ins/perl/Gimp.xs b/plug-ins/perl/Gimp.xs index 4875c8c0b8..85f6fe0481 100644 --- a/plug-ins/perl/Gimp.xs +++ b/plug-ins/perl/Gimp.xs @@ -58,8 +58,8 @@ _exit() BOOT: #ifdef ENABLE_NLS setlocale (LC_MESSAGES, ""); /* calling twice doesn't hurt, no? */ - bindtextdomain ("gimp14-perl", datadir "/locale"); - textdomain ("gimp14-perl"); + bindtextdomain (GETTEXT_PACKAGE "-perl", datadir "/locale"); + textdomain (GETTEXT_PACKAGE "-perl"); #endif char * diff --git a/plug-ins/script-fu/script-fu-intl.h b/plug-ins/script-fu/script-fu-intl.h index c26bb7745b..97df70b502 100644 --- a/plug-ins/script-fu/script-fu-intl.h +++ b/plug-ins/script-fu/script-fu-intl.h @@ -18,9 +18,14 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ + #ifndef __SCRIPT_FU_INTL_H__ #define __SCRIPT_FU_INTL_H__ +#ifndef GETTEXT_PACKAGE +#error "config.h must be included prior to script-fu-intl.h" +#endif + #include "libgimp/gimpintl.h" #define INIT_I18N() G_STMT_START{ \ diff --git a/plug-ins/script-fu/script-fu.c b/plug-ins/script-fu/script-fu.c index 0042802e44..f07f9bdaef 100644 --- a/plug-ins/script-fu/script-fu.c +++ b/plug-ins/script-fu/script-fu.c @@ -105,7 +105,7 @@ script_fu_query (void) { GIMP_PDB_STRING, "logfile", "The file to log server activity to" } }; - gimp_plugin_domain_register ("gimp14-script-fu", NULL); + gimp_plugin_domain_register (GETTEXT_PACKAGE "-script-fu", NULL); gimp_install_procedure ("extension_script_fu", "A scheme interpreter for scripting GIMP operations",