dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug 750180 - Fix different ways of writing Plug-in Plug-In Plugin. 

It was agreed that we should write "plug-in" consistently. Only possibly
user-visible strings were updated.
Thanks to scootergrisen for a first patch which could not make it
after changing decision on the canonical writing.
This commit is contained in:
Jehan 2017-03-21 17:45:50 +01:00
parent d339aef75c
commit bc344a9991
36 changed files with 80 additions and 80 deletions

2
app/actions/actions.c
View File

@ -203,7 +203,7 @@ static const GimpActionFactoryEntry action_groups[] =
{ "patterns", N_("Patterns"), GIMP_ICON_PATTERN,
patterns_actions_setup,
patterns_actions_update },
{ "plug-in", N_("Plug-Ins"), GIMP_ICON_PLUGIN,
{ "plug-in", N_("Plug-ins"), GIMP_ICON_PLUGIN,
plug_in_actions_setup,
plug_in_actions_update },
{ "quick-mask", N_("Quick Mask"), GIMP_ICON_QUICK_MASK_ON,

2
app/config/gimpconfig-dump.c
View File

@ -230,7 +230,7 @@ static const gchar *man_page_path =
"@gimpdatadir@.\n"
".TP\n"
".I gimp_plug_in_dir\n"
"Base to paths for architecture-specific plugins and modules, which is set\n"
"Base to paths for architecture-specific plug-ins and modules, which is set\n"
"to the value of the environment variable GIMP2_PLUGINDIR or to the\n"
"compiled-in default value @gimpplugindir@.\n"
".TP\n"

2
app/config/gimpcoreconfig.c
View File

@ -183,7 +183,7 @@ gimp_core_config_class_init (GimpCoreConfigClass *klass)
path = gimp_config_build_plug_in_path ("plug-ins");
GIMP_CONFIG_PROP_PATH (object_class, PROP_PLUG_IN_PATH,
"plug-in-path",
"Plug-In path",
"Plug-in path",
PLUG_IN_PATH_BLURB,
GIMP_CONFIG_PATH_DIR_LIST, path,
GIMP_PARAM_STATIC_STRINGS |

2
app/core/core-enums.c
View File

@ -853,7 +853,7 @@ gimp_undo_type_get_type (void)
{ GIMP_UNDO_GROUP_PARASITE_ATTACH, NC_("undo-type", "Attach parasite"), NULL },
{ GIMP_UNDO_GROUP_PARASITE_REMOVE, NC_("undo-type", "Remove parasite"), NULL },
{ GIMP_UNDO_GROUP_VECTORS_IMPORT, NC_("undo-type", "Import paths"), NULL },
{ GIMP_UNDO_GROUP_MISC, NC_("undo-type", "Plug-In"), NULL },
{ GIMP_UNDO_GROUP_MISC, NC_("undo-type", "Plug-in"), NULL },
{ GIMP_UNDO_IMAGE_TYPE, NC_("undo-type", "Image type"), NULL },
{ GIMP_UNDO_IMAGE_PRECISION, NC_("undo-type", "Image precision"), NULL },
{ GIMP_UNDO_IMAGE_SIZE, NC_("undo-type", "Image size"), NULL },

4
app/dialogs/preferences-dialog.c
View File

@ -2815,9 +2815,9 @@ prefs_dialog_new (Gimp *gimp,
GIMP_HELP_PREFS_FOLDERS_MYPAINT_BRUSHES,
N_("Select MyPaint Brush Folders"),
"mypaint-brush-path", "mypaint-brush-path-writable" },
{ N_("Plug-Ins"), N_("Plug-In Folders"), "folders-plug-ins",
{ N_("Plug-ins"), N_("Plug-in Folders"), "folders-plug-ins",
GIMP_HELP_PREFS_FOLDERS_PLUG_INS,
N_("Select Plug-In Folders"),
N_("Select plug-in Folders"),
"plug-in-path", NULL },
{ N_("Scripts"), N_("Script-Fu Folders"), "folders-scripts",
GIMP_HELP_PREFS_FOLDERS_SCRIPTS,

2
app/main.c
View File

@ -202,7 +202,7 @@ static const GOptionEntry main_entries[] =
{
"no-shm", 0, G_OPTION_FLAG_REVERSE,
G_OPTION_ARG_NONE, &use_shm,
N_("Do not use shared memory between GIMP and plugins"), NULL
N_("Do not use shared memory between GIMP and plug-ins"), NULL
},
{
"no-cpu-accel", 0, G_OPTION_FLAG_REVERSE,

2
app/menus/plug-in-menus.c
View File

@ -105,7 +105,7 @@ plug_in_menus_setup (GimpUIManager *manager,
gchar *action_path;
action_name = g_strdup_printf ("filter-recent-%02d", i + 1);
action_path = g_strdup_printf ("%s/Filters/Recently Used/Plug-Ins",
action_path = g_strdup_printf ("%s/Filters/Recently Used/Plug-ins",
ui_path);
gtk_ui_manager_add_ui (GTK_UI_MANAGER (manager), merge_id,

2
app/pdb/drawable-cmds.c
View File

@ -521,7 +521,7 @@ drawable_merge_shadow_invoker (GimpProcedure *procedure,
GIMP_PDB_ITEM_CONTENT, error) &&
gimp_pdb_item_is_not_group (GIMP_ITEM (drawable), error))
{
const gchar *undo_desc = _("Plug-In");
const gchar *undo_desc = _("Plug-in");
if (gimp->plug_in_manager->current_plug_in)
undo_desc = gimp_plug_in_get_undo_desc (gimp->plug_in_manager->current_plug_in);

4
app/pdb/image-cmds.c
View File

@ -5029,7 +5029,7 @@ register_image_procs (GimpPDB *pdb)
gimp_procedure_set_static_strings (procedure,
"gimp-image-get-tattoo-state",
"Returns the tattoo state associated with the image.",
"This procedure returns the tattoo state of the image. Use only by save/load plugins that wish to preserve an images tattoo state. Using this function at other times will produce unexpected results.",
"This procedure returns the tattoo state of the image. Use only by save/load plug-ins that wish to preserve an images tattoo state. Using this function at other times will produce unexpected results.",
"Andy Thomas",
"Andy Thomas",
"2000",
@ -5058,7 +5058,7 @@ register_image_procs (GimpPDB *pdb)
gimp_procedure_set_static_strings (procedure,
"gimp-image-set-tattoo-state",
"Set the tattoo state associated with the image.",
"This procedure sets the tattoo state of the image. Use only by save/load plugins that wish to preserve an images tattoo state. Using this function at other times will produce unexpected results. A full check of uniqueness of states in layers, channels and paths will be performed by this procedure and a execution failure will be returned if this fails. A failure will also be returned if the new tattoo state value is less than the maximum tattoo value from all of the tattoos from the paths, layers and channels. After the image data has been loaded and all the tattoos have been set then this is the last procedure that should be called. If effectively does a status check on the tattoo values that have been set to make sure that all is OK.",
"This procedure sets the tattoo state of the image. Use only by save/load plug-ins that wish to preserve an images tattoo state. Using this function at other times will produce unexpected results. A full check of uniqueness of states in layers, channels and paths will be performed by this procedure and a execution failure will be returned if this fails. A failure will also be returned if the new tattoo state value is less than the maximum tattoo value from all of the tattoos from the paths, layers and channels. After the image data has been loaded and all the tattoos have been set then this is the last procedure that should be called. If effectively does a status check on the tattoo values that have been set to make sure that all is OK.",
"Andy Thomas",
"Andy Thomas",
"2000",

4
app/pdb/image-undo-cmds.c
View File

@ -339,7 +339,7 @@ register_image_undo_procs (GimpPDB *pdb)
gimp_procedure_set_static_strings (procedure,
"gimp-image-undo-is-enabled",
"Check if the image's undo stack is enabled.",
"This procedure checks if the image's undo stack is currently enabled or disabled. This is useful when several plugins or scripts call each other and want to check if their caller has already used 'gimp-image-undo-disable' or 'gimp-image-undo-freeze'.",
"This procedure checks if the image's undo stack is currently enabled or disabled. This is useful when several plug-ins or scripts call each other and want to check if their caller has already used 'gimp-image-undo-disable' or 'gimp-image-undo-freeze'.",
"Rapha\xc3\xabl Quinet <raphael@gimp.org>",
"Rapha\xc3\xabl Quinet",
"1999",
@ -455,7 +455,7 @@ register_image_undo_procs (GimpPDB *pdb)
gimp_procedure_set_static_strings (procedure,
"gimp-image-undo-thaw",
"Thaw the image's undo stack.",
"This procedure thaws the image's undo stack, allowing subsequent operations to store their undo steps. This is generally called in conjunction with 'gimp-image-undo-freeze' to temporarily freeze an image undo stack. 'gimp-image-undo-thaw' does NOT free the undo stack as 'gimp-image-undo-enable' does, so is suited for situations where one wishes to leave the undo stack in the same state in which one found it despite non-destructively playing with the image in the meantime. An example would be in-situ plugin previews. Balancing freezes and thaws and ensuring image consistency is the responsibility of the caller.",
"This procedure thaws the image's undo stack, allowing subsequent operations to store their undo steps. This is generally called in conjunction with 'gimp-image-undo-freeze' to temporarily freeze an image undo stack. 'gimp-image-undo-thaw' does NOT free the undo stack as 'gimp-image-undo-enable' does, so is suited for situations where one wishes to leave the undo stack in the same state in which one found it despite non-destructively playing with the image in the meantime. An example would be in-situ plug-in previews. Balancing freezes and thaws and ensuring image consistency is the responsibility of the caller.",
"Adam D. Moss",
"Adam D. Moss",
"1999",

26
app/pdb/plug-in-cmds.c
View File

@ -413,8 +413,8 @@ register_plug_in_procs (GimpPDB *pdb)
"gimp-plugins-query");
gimp_procedure_set_static_strings (procedure,
"gimp-plugins-query",
"Queries the plugin database for its contents.",
"This procedure queries the contents of the plugin database.",
"Queries the plug-in database for its contents.",
"This procedure queries the contents of the plug-in database.",
"Andy Thomas",
"Andy Thomas",
"1998",
@ -429,18 +429,18 @@ register_plug_in_procs (GimpPDB *pdb)
gimp_procedure_add_return_value (procedure,
gimp_param_spec_int32 ("num-plugins",
"num plugins",
"The number of plugins",
"The number of plug-ins",
0, G_MAXINT32, 0,
GIMP_PARAM_READWRITE));
gimp_procedure_add_return_value (procedure,
gimp_param_spec_string_array ("menu-path",
"menu path",
"The menu path of the plugin",
"The menu path of the plug-in",
GIMP_PARAM_READWRITE));
gimp_procedure_add_return_value (procedure,
gimp_param_spec_int32 ("num-plugins",
"num plugins",
"The number of plugins",
"The number of plug-ins",
0, G_MAXINT32, 0,
GIMP_PARAM_READWRITE));
gimp_procedure_add_return_value (procedure,
@ -451,46 +451,46 @@ register_plug_in_procs (GimpPDB *pdb)
gimp_procedure_add_return_value (procedure,
gimp_param_spec_int32 ("num-plugins",
"num plugins",
"The number of plugins",
"The number of plug-ins",
0, G_MAXINT32, 0,
GIMP_PARAM_READWRITE));
gimp_procedure_add_return_value (procedure,
gimp_param_spec_string_array ("plugin-location",
"plugin location",
"Location of the plugin program",
"Location of the plug-in program",
GIMP_PARAM_READWRITE));
gimp_procedure_add_return_value (procedure,
gimp_param_spec_int32 ("num-plugins",
"num plugins",
"The number of plugins",
"The number of plug-ins",
0, G_MAXINT32, 0,
GIMP_PARAM_READWRITE));
gimp_procedure_add_return_value (procedure,
gimp_param_spec_string_array ("plugin-image-type",
"plugin image type",
"Type of image that this plugin will work on",
"Type of image that this plug-in will work on",
GIMP_PARAM_READWRITE));
gimp_procedure_add_return_value (procedure,
gimp_param_spec_int32 ("num-plugins",
"num plugins",
"The number of plugins",
"The number of plug-ins",
0, G_MAXINT32, 0,
GIMP_PARAM_READWRITE));
gimp_procedure_add_return_value (procedure,
gimp_param_spec_int32_array ("plugin-install-time",
"plugin install time",
"Time that the plugin was installed",
"Time that the plug-in was installed",
GIMP_PARAM_READWRITE));
gimp_procedure_add_return_value (procedure,
gimp_param_spec_int32 ("num-plugins",
"num plugins",
"The number of plugins",
"The number of plug-ins",
0, G_MAXINT32, 0,
GIMP_PARAM_READWRITE));
gimp_procedure_add_return_value (procedure,
gimp_param_spec_string_array ("plugin-real-name",
"plugin real name",
"The internal name of the plugin",
"The internal name of the plug-in",
GIMP_PARAM_READWRITE));
gimp_pdb_register_procedure (pdb, procedure);
g_object_unref (procedure);

8
app/pdb/plug-in-compat-cmds.c
View File

@ -6435,7 +6435,7 @@ register_plug_in_compat_procs (GimpPDB *pdb)
gimp_procedure_set_static_strings (procedure,
"plug-in-laplace",
"High-resolution edge detection",
"This plugin creates one-pixel wide edges from the image, with the value proportional to the gradient. It uses the Laplace operator (a 3x3 kernel with -8 in the middle). The image has to be laplacered to get useful results, a gauss_iir with 1.5 - 5.0 depending on the noise in the image is best.",
"This plug-in creates one-pixel wide edges from the image, with the value proportional to the gradient. It uses the Laplace operator (a 3x3 kernel with -8 in the middle). The image has to be laplacered to get useful results, a gauss_iir with 1.5 - 5.0 depending on the noise in the image is best.",
"Compatibility procedure. Please see 'gegl:edge-laplace' for credits.",
"Compatibility procedure. Please see 'gegl:edge-laplace' for credits.",
"2013",
@ -6543,7 +6543,7 @@ register_plug_in_compat_procs (GimpPDB *pdb)
gimp_procedure_set_static_strings (procedure,
"plug-in-make-seamless",
"Alters edges to make the image seamlessly tileable",
"This plugin creates a seamless tileable from the input drawable.",
"This plug-in creates a seamless tileable from the input drawable.",
"Compatibility procedure. Please see 'gegl:tile-seamless' for credits.",
"Compatibility procedure. Please see 'gegl:tile-seamless' for credits.",
"2013",
@ -7715,7 +7715,7 @@ register_plug_in_compat_procs (GimpPDB *pdb)
gimp_procedure_set_static_strings (procedure,
"plug-in-semiflatten",
"Replace partial transparency with the current background color",
"This plugin flattens pixels in an RGBA image that aren't completely transparent against the current GIMP background color.",
"This plug-in flattens pixels in an RGBA image that aren't completely transparent against the current GIMP background color.",
"Spencer Kimball & Peter Mattis",
"Spencer Kimball & Peter Mattis",
"1997",
@ -7915,7 +7915,7 @@ register_plug_in_compat_procs (GimpPDB *pdb)
gimp_procedure_set_static_strings (procedure,
"plug-in-sobel",
"Specialized direction-dependent edge detection",
"This plugin calculates the gradient with a sobel operator. The user can specify which direction to use. When both directions are used, the result is the RMS of the two gradients; if only one direction is used, the result either the absolute value of the gradient, or 127 + gradient (if the 'keep sign' switch is on). This way, information about the direction of the gradient is preserved. Resulting images are not autoscaled.\"",
"This plug-in calculates the gradient with a sobel operator. The user can specify which direction to use. When both directions are used, the result is the RMS of the two gradients; if only one direction is used, the result either the absolute value of the gradient, or 127 + gradient (if the 'keep sign' switch is on). This way, information about the direction of the gradient is preserved. Resulting images are not autoscaled.\"",
"Compatibility procedure. Please see 'gegl:edge-sobel' for credits.",
"Compatibility procedure. Please see 'gegl:edge-sobel' for credits.",
"2014",

2
app/pdb/procedural-db-cmds.c
View File

@ -592,7 +592,7 @@ register_procedural_db_procs (GimpPDB *pdb)
gimp_procedure_add_argument (procedure,
gimp_param_spec_string ("proc-type",
"proc type",
"The regex for procedure type: { 'Internal GIMP procedure', 'GIMP Plug-In', 'GIMP Extension', 'Temporary Procedure' }",
"The regex for procedure type: { 'Internal GIMP procedure', 'GIMP Plug-in', 'GIMP Extension', 'Temporary Procedure' }",
TRUE, FALSE, FALSE,
NULL,
GIMP_PARAM_READWRITE));

2
app/plug-in/gimpplugin-cleanup.c
View File

@ -279,7 +279,7 @@ gimp_plug_in_cleanup_image (GimpPlugInProcFrame *proc_frame,
if (cleanup->undo_group_count != gimp_image_get_undo_group_count (image))
{
g_message ("Plug-In '%s' left image undo in inconsistent state, "
g_message ("Plug-in '%s' left image undo in inconsistent state, "
"closing open undo groups.",
gimp_procedure_get_label (proc_frame->procedure));

42
app/plug-in/gimpplugin-message.c
View File

@ -95,7 +95,7 @@ gimp_plug_in_handle_message (GimpPlugIn *plug_in,
case GP_CONFIG:
gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
"Plug-In \"%s\"\n(%s)\n\n"
"Plug-in \"%s\"\n(%s)\n\n"
"sent a CONFIG message. This should not happen.",
gimp_object_get_name (plug_in),
gimp_file_get_utf8_name (plug_in->file));
@ -108,7 +108,7 @@ gimp_plug_in_handle_message (GimpPlugIn *plug_in,
case GP_TILE_ACK:
gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
"Plug-In \"%s\"\n(%s)\n\n"
"Plug-in \"%s\"\n(%s)\n\n"
"sent a TILE_ACK message. This should not happen.",
gimp_object_get_name (plug_in),
gimp_file_get_utf8_name (plug_in->file));
@ -117,7 +117,7 @@ gimp_plug_in_handle_message (GimpPlugIn *plug_in,
case GP_TILE_DATA:
gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
"Plug-In \"%s\"\n(%s)\n\n"
"Plug-in \"%s\"\n(%s)\n\n"
"sent a TILE_DATA message. This should not happen.",
gimp_object_get_name (plug_in),
gimp_file_get_utf8_name (plug_in->file));
@ -134,7 +134,7 @@ gimp_plug_in_handle_message (GimpPlugIn *plug_in,
case GP_TEMP_PROC_RUN:
gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
"Plug-In \"%s\"\n(%s)\n\n"
"Plug-in \"%s\"\n(%s)\n\n"
"sent a TEMP_PROC_RUN message. This should not happen.",
gimp_object_get_name (plug_in),
gimp_file_get_utf8_name (plug_in->file));
@ -237,7 +237,7 @@ gimp_plug_in_handle_tile_put (GimpPlugIn *plug_in,
if (! GIMP_IS_DRAWABLE (drawable))
{
gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
"Plug-In \"%s\"\n(%s)\n\n"
"Plug-in \"%s\"\n(%s)\n\n"
"tried writing to invalid drawable %d (killing)",
gimp_object_get_name (plug_in),
gimp_file_get_utf8_name (plug_in->file),
@ -248,7 +248,7 @@ gimp_plug_in_handle_tile_put (GimpPlugIn *plug_in,
else if (gimp_item_is_removed (GIMP_ITEM (drawable)))
{
gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
"Plug-In \"%s\"\n(%s)\n\n"
"Plug-in \"%s\"\n(%s)\n\n"
"tried writing to drawable %d which was removed "
"from the image (killing)",
gimp_object_get_name (plug_in),
@ -275,7 +275,7 @@ gimp_plug_in_handle_tile_put (GimpPlugIn *plug_in,
if (gimp_item_is_content_locked (GIMP_ITEM (drawable)))
{
gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
"Plug-In \"%s\"\n(%s)\n\n"
"Plug-in \"%s\"\n(%s)\n\n"
"tried writing to a locked drawable %d (killing)",
gimp_object_get_name (plug_in),
gimp_file_get_utf8_name (plug_in->file),
@ -286,7 +286,7 @@ gimp_plug_in_handle_tile_put (GimpPlugIn *plug_in,
else if (gimp_viewable_get_children (GIMP_VIEWABLE (drawable)))
{
gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
"Plug-In \"%s\"\n(%s)\n\n"
"Plug-in \"%s\"\n(%s)\n\n"
"tried writing to a group layer %d (killing)",
gimp_object_get_name (plug_in),
gimp_file_get_utf8_name (plug_in->file),
@ -305,7 +305,7 @@ gimp_plug_in_handle_tile_put (GimpPlugIn *plug_in,
&tile_rect))
{
gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
"Plug-In \"%s\"\n(%s)\n\n"
"Plug-in \"%s\"\n(%s)\n\n"
"requested invalid tile (killing)",
gimp_object_get_name (plug_in),
gimp_file_get_utf8_name (plug_in->file));
@ -362,7 +362,7 @@ gimp_plug_in_handle_tile_get (GimpPlugIn *plug_in,
if (! GIMP_IS_DRAWABLE (drawable))
{
gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
"Plug-In \"%s\"\n(%s)\n\n"
"Plug-in \"%s\"\n(%s)\n\n"
"tried reading from invalid drawable %d (killing)",
gimp_object_get_name (plug_in),
gimp_file_get_utf8_name (plug_in->file),
@ -373,7 +373,7 @@ gimp_plug_in_handle_tile_get (GimpPlugIn *plug_in,
else if (gimp_item_is_removed (GIMP_ITEM (drawable)))
{
gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
"Plug-In \"%s\"\n(%s)\n\n"
"Plug-in \"%s\"\n(%s)\n\n"
"tried reading from drawable %d which was removed "
"from the image (killing)",
gimp_object_get_name (plug_in),
@ -401,7 +401,7 @@ gimp_plug_in_handle_tile_get (GimpPlugIn *plug_in,
&tile_rect))
{
gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
"Plug-In \"%s\"\n(%s)\n\n"
"Plug-in \"%s\"\n(%s)\n\n"
"requested invalid tile (killing)",
gimp_object_get_name (plug_in),
gimp_file_get_utf8_name (plug_in->file));
@ -539,7 +539,7 @@ gimp_plug_in_handle_proc_run (GimpPlugIn *plug_in,
if (plug_in->manager->gimp->pdb_compat_mode == GIMP_PDB_COMPAT_WARN)
{
gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_WARNING,
"Plug-In \"%s\"\n(%s)\n"
"Plug-in \"%s\"\n(%s)\n"
"called deprecated procedure '%s'.\n"
"It should call '%s' instead!",
gimp_object_get_name (plug_in),
@ -555,7 +555,7 @@ gimp_plug_in_handle_proc_run (GimpPlugIn *plug_in,
if (! strcmp (procedure->deprecated, "NONE"))
{
gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_WARNING,
"Plug-In \"%s\"\n(%s)\n"
"Plug-in \"%s\"\n(%s)\n"
"called deprecated procedure '%s'.",
gimp_object_get_name (plug_in),
gimp_file_get_utf8_name (plug_in->file),
@ -564,7 +564,7 @@ gimp_plug_in_handle_proc_run (GimpPlugIn *plug_in,
else
{
gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_WARNING,
"WARNING: Plug-In \"%s\"\n(%s)\n"
"WARNING: Plug-in \"%s\"\n(%s)\n"
"called deprecated procedure '%s'.\n"
"It should call '%s' instead!",
gimp_object_get_name (plug_in),
@ -692,7 +692,7 @@ gimp_plug_in_handle_temp_proc_return (GimpPlugIn *plug_in,
else
{
gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
"Plug-In \"%s\"\n(%s)\n\n"
"Plug-in \"%s\"\n(%s)\n\n"
"sent a TEMP_PROC_RETURN message while not running "
"a temporary procedure. This should not happen.",
gimp_object_get_name (plug_in),
@ -730,7 +730,7 @@ gimp_plug_in_handle_proc_install (GimpPlugIn *plug_in,
proc_install->params[i - 1].type != GIMP_PDB_INT32)
{
gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
"Plug-In \"%s\"\n(%s)\n\n"
"Plug-in \"%s\"\n(%s)\n\n"
"attempted to install procedure \"%s\" "
"which fails to comply with the array parameter "
"passing standard. Argument %d is noncompliant.",
@ -791,7 +791,7 @@ gimp_plug_in_handle_proc_install (GimpPlugIn *plug_in,
if (null_name)
{
gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
"Plug-In \"%s\"\n(%s)\n\n"
"Plug-in \"%s\"\n(%s)\n\n"
"attempted to install a procedure NULL parameter name.",
gimp_object_get_name (plug_in),
gimp_file_get_utf8_name (plug_in->file));
@ -802,7 +802,7 @@ gimp_plug_in_handle_proc_install (GimpPlugIn *plug_in,
if (! valid_utf8)
{
gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
"Plug-In \"%s\"\n(%s)\n\n"
"Plug-in \"%s\"\n(%s)\n\n"
"attempted to install a procedure with invalid UTF-8 strings.",
gimp_object_get_name (plug_in),
gimp_file_get_utf8_name (plug_in->file));
@ -935,7 +935,7 @@ gimp_plug_in_handle_extension_ack (GimpPlugIn *plug_in)
else
{
gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
"Plug-In \"%s\"\n(%s)\n\n"
"Plug-in \"%s\"\n(%s)\n\n"
"sent an EXTENSION_ACK message while not being started "
"as an extension. This should not happen.",
gimp_object_get_name (plug_in),
@ -954,7 +954,7 @@ gimp_plug_in_handle_has_init (GimpPlugIn *plug_in)
else
{
gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
"Plug-In \"%s\"\n(%s)\n\n"
"Plug-in \"%s\"\n(%s)\n\n"
"sent an HAS_INIT message while not in query(). "
"This should not happen.",
gimp_object_get_name (plug_in),

2
app/plug-in/gimppluginmanager-restore.c
View File

@ -234,7 +234,7 @@ gimp_plug_in_manager_search (GimpPlugInManager *manager,
}
#endif /* G_OS_WIN32 */
status_callback (_("Searching Plug-Ins"), "", 0.0);
status_callback (_("Searching plug-ins"), "", 0.0);
/* Give automatic tests a chance to use plug-ins from the build
* dir

4
app/plug-in/gimppluginmanager.c
View File

@ -255,13 +255,13 @@ gimp_plug_in_manager_initialize (GimpPlugInManager *manager,
config = manager->gimp->config;
status_callback (NULL, _("Plug-In Interpreters"), 0.8);
status_callback (NULL, _("Plug-in Interpreters"), 0.8);
path = gimp_config_path_expand_to_files (config->interpreter_path, NULL);
gimp_interpreter_db_load (manager->interpreter_db, path);
g_list_free_full (path, (GDestroyNotify) g_object_unref);
status_callback (NULL, _("Plug-In Environment"), 0.9);
status_callback (NULL, _("Plug-in Environment"), 0.9);
path = gimp_config_path_expand_to_files (config->environ_path, NULL);
gimp_environ_table_load (manager->environ_table, path);

8
app/plug-in/gimppluginprocedure.c
View File

@ -614,7 +614,7 @@ gimp_plug_in_procedure_add_menu_path (GimpPlugInProcedure *proc,
basename = g_path_get_basename (gimp_file_get_utf8_name (proc->file));
g_set_error (error, GIMP_PLUG_IN_ERROR, GIMP_PLUG_IN_FAILED,
"Plug-In \"%s\"\n(%s)\n"
"Plug-in \"%s\"\n(%s)\n"
"attempted to install procedure \"%s\"\n"
"in the invalid menu location \"%s\".\n"
"The menu path must look like either \"<Prefix>\" "
@ -737,7 +737,7 @@ gimp_plug_in_procedure_add_menu_path (GimpPlugInProcedure *proc,
basename = g_path_get_basename (gimp_file_get_utf8_name (proc->file));
g_set_error (error, GIMP_PLUG_IN_ERROR, GIMP_PLUG_IN_FAILED,
"Plug-In \"%s\"\n(%s)\n"
"Plug-in \"%s\"\n(%s)\n"
"attempted to install procedure \"%s\" "
"in the invalid menu location \"%s\".\n"
"Use either \"<Image>\", "
@ -774,9 +774,9 @@ gimp_plug_in_procedure_add_menu_path (GimpPlugInProcedure *proc,
basename = g_path_get_basename (gimp_file_get_utf8_name (proc->file));
g_set_error (error, GIMP_PLUG_IN_ERROR, GIMP_PLUG_IN_FAILED,
"Plug-In \"%s\"\n(%s)\n\n"
"Plug-in \"%s\"\n(%s)\n\n"
"attempted to install %s procedure \"%s\" "
"which does not take the standard %s Plug-In "
"which does not take the standard %s plug-in's "
"arguments: (%s).",
basename, gimp_file_get_utf8_name (proc->file),
prefix, gimp_object_get_name (proc), prefix,

2
app/plug-in/plug-in-rc.c
View File

@ -796,7 +796,7 @@ plug_in_rc_write (GSList *plug_in_defs,
"GIMP pluginrc\n\n"
"This file can safely be removed and "
"will be automatically regenerated by "
"querying the installed plugins.",
"querying the installed plug-ins.",
error);
if (!writer)
return FALSE;

2
libgimp/gimpproceduraldb_pdb.c
View File

@ -105,7 +105,7 @@ gimp_procedural_db_dump (const gchar *filename)
* @author: The regex for procedure author.
* @copyright: The regex for procedure copyright.
* @date: The regex for procedure date.
* @proc_type: The regex for procedure type: { 'Internal GIMP procedure', 'GIMP Plug-In', 'GIMP Extension', 'Temporary Procedure' }.
* @proc_type: The regex for procedure type: { 'Internal GIMP procedure', 'GIMP Plug-in', 'GIMP Extension', 'Temporary Procedure' }.
* @num_matches: The number of matching procedures.
* @procedure_names: The list of procedure names.
*

2
libgimpbase/gimpbaseenums.c
View File

@ -1327,7 +1327,7 @@ gimp_pdb_proc_type_get_type (void)
static const GimpEnumDesc descs[] =
{
{ GIMP_INTERNAL, NC_("pdb-proc-type", "Internal GIMP procedure"), NULL },
{ GIMP_PLUGIN, NC_("pdb-proc-type", "GIMP Plug-In"), NULL },
{ GIMP_PLUGIN, NC_("pdb-proc-type", "GIMP Plug-in"), NULL },
{ GIMP_EXTENSION, NC_("pdb-proc-type", "GIMP Extension"), NULL },
{ GIMP_TEMPORARY, NC_("pdb-proc-type", "Temporary Procedure"), NULL },
{ 0, NULL, NULL }

4
plug-ins/common/contrast-normalize.c
View File

@ -77,8 +77,8 @@ query (void)
gimp_install_procedure (PLUG_IN_PROC,
N_("Stretch brightness values to cover the full range"),
"This plugin performs almost the same operation as "
"the 'contrast autostretch' plugin, except that it "
"This plug-in performs almost the same operation as "
"the 'contrast autostretch' plug-in, except that it "
"won't allow the color channels to normalize "
"independently. This is actually what most people "
"probably want instead of contrast-autostretch; use "

2
plug-ins/common/curve-bend.c
View File

@ -538,7 +538,7 @@ query (void)
"before and rotated back after the bend operation. "
"This enables bending in other directions than "
"vertical. bending usually changes the size of "
"the handled layer. this plugin sets the offsets "
"the handled layer. this plug-in sets the offsets "
"of the handled layer to keep its center at the "
"same position",
PLUG_IN_AUTHOR,

2
plug-ins/common/file-glob.c
View File

@ -72,7 +72,7 @@ query (void)
gimp_install_procedure (PLUG_IN_PROC,
"Returns a list of matching filenames",
"This can be useful in scripts and other plugins "
"This can be useful in scripts and other plug-ins "
"(e.g., batch-conversion). See the glob(7) manpage "
"for more info. Note however that this isn't a "
"full-featured glob implementation. It only handles "

2
plug-ins/common/file-ps.c
View File

@ -2154,7 +2154,7 @@ save_ps_header (GOutputStream *output,
goto fail;
if (! print (output, error,
"%%%%Creator: GIMP PostScript file plugin V %4.2f "
"%%%%Creator: GIMP PostScript file plug-in V %4.2f "
"by Peter Kirchgessner\n", VERSIO))
goto fail;

2
plug-ins/common/mail.c
View File

@ -740,7 +740,7 @@ sendmail_create_headers (FILE *mailpipe)
if (strlen (mail_info.from) > 0)
fprintf (mailpipe, "From: %s \n", mail_info.from);
fprintf (mailpipe, "X-Mailer: GIMP Useless Mail Plug-In %s\n", GIMP_VERSION);
fprintf (mailpipe, "X-Mailer: GIMP Useless Mail plug-in %s\n", GIMP_VERSION);
fprintf (mailpipe, "MIME-Version: 1.0\n");
fprintf (mailpipe, "Content-type: multipart/mixed; "

2
plug-ins/common/nl-filter.c
View File

@ -119,7 +119,7 @@ query (void)
N_("Nonlinear swiss army knife filter"),
"This is the pnmnlfilt, in gimp's clothing. "
"See the pnmnlfilt manpage for details.",
"Graeme W. Gill, gimp 0.99 plugin by Eric L. Hernes",
"Graeme W. Gill, gimp 0.99 plug-in by Eric L. Hernes",
"Graeme W. Gill, Eric L. Hernes",
"1997",
N_("_NL Filter..."),

4
plug-ins/common/plugin-browser.c
View File

@ -141,7 +141,7 @@ query (void)
"Andy Thomas",
"Andy Thomas",
"1999",
N_("_Plug-In Browser"),
N_("_Plug-in Browser"),
"",
GIMP_PLUGIN,
G_N_ELEMENTS (args), 0,
@ -543,7 +543,7 @@ browser_dialog_new (void)
browser = g_new0 (PluginBrowser, 1);
browser->dialog = gimp_dialog_new (_("Plug-In Browser"), PLUG_IN_ROLE,
browser->dialog = gimp_dialog_new (_("Plug-in Browser"), PLUG_IN_ROLE,
NULL, 0,
gimp_standard_help_func, PLUG_IN_PROC,

2
plug-ins/common/sphere-designer.c
View File

@ -3028,7 +3028,7 @@ query (void)
gimp_install_procedure (PLUG_IN_PROC,
N_("Create an image of a textured sphere"),
"This plugin can be used to create textured and/or "
"This plug-in can be used to create textured and/or "
"bumpmapped spheres, and uses a small lightweight "
"raytracer to perform the task with good quality",
"Vidar Madsen",

2
plug-ins/imagemap/imap_about.c
View File

@ -39,7 +39,7 @@ do_about_dialog(void)
dialog = g_object_new (GTK_TYPE_ABOUT_DIALOG,
"transient-for", get_dialog(),
"program-name", _("Image Map Plug-In"),
"program-name", _("Image Map Plug-in"),
"version", "2.3",
"authors", authors,
"copyright",

2
plug-ins/pygimp/gimpcolormodule.c
View File

@ -387,7 +387,7 @@ static struct _PyGimpColor_Functions pygimpcolor_api_functions = {
/* Initialization function for the module (*must* be called initgimpcolor) */
static char gimpcolor_doc[] =
"This module provides interfaces to allow you to write gimp plugins"
"This module provides interfaces to allow you to write gimp plug-ins"
;
void initgimpcolor(void);

2
plug-ins/pygimp/gimpenumsmodule.c
View File

@ -145,7 +145,7 @@ add_registered_enums(PyObject *m)
/* Initialization function for the module (*must* be called initgimpenums) */
static char gimpenums_doc[] =
"This module provides interfaces to allow you to write gimp plugins"
"This module provides interfaces to allow you to write gimp plug-ins"
;
void init_gimpenums(void);

2
plug-ins/pygimp/gimpmodule.c
View File

@ -1883,7 +1883,7 @@ static struct _PyGimp_Functions pygimp_api_functions = {
/* Initialization function for the module (*must* be called initgimp) */
static char gimp_module_documentation[] =
"This module provides interfaces to allow you to write gimp plugins"
"This module provides interfaces to allow you to write gimp plug-ins"
;
void initgimp(void);

2
plug-ins/pygimp/gimpthumbmodule.c
View File

@ -37,7 +37,7 @@ extern PyMethodDef gimpthumb_functions[];
static char gimpthumb_doc[] =
"This module provides interfaces to allow you to write gimp plugins"
"This module provides interfaces to allow you to write gimp plug-ins"
;
void initgimpthumb(void);

2
plug-ins/pygimp/gimpuimodule.c
View File

@ -42,7 +42,7 @@ extern PyMethodDef gimpui_functions[];
static char gimpui_doc[] =
"This module provides interfaces to allow you to write gimp plugins"
"This module provides interfaces to allow you to write gimp plug-ins"
;
void init_gimpui(void);

2
plug-ins/screenshot/screenshot.c
View File

@ -130,7 +130,7 @@ query (void)
"are optional and can be used to specify the corners "
"of the region to be grabbed."
"On Mac OS X or on gnome-shell, "
"when called non-interactively, the plugin"
"when called non-interactively, the plug-in"
"only can take screenshots of the entire root window."
"Grabbing a window or a region is not supported"
"non-interactively. To grab a region or a particular"