gimp r27754 - in trunk: . app/actions app/widgets po
- From: neo svn gnome org
- To: svn-commits-list gnome org
- Subject: gimp r27754 - in trunk: . app/actions app/widgets po
- Date: Wed, 3 Dec 2008 15:27:42 +0000 (UTC)
Author: neo
Date: Wed Dec 3 15:27:42 2008
New Revision: 27754
URL: http://svn.gnome.org/viewvc/gimp?rev=27754&view=rev
Log:
2008-12-03 Sven Neumann <sven gimp org>
* app/widgets/gimpactiongroup.[ch]: added an extra parameter for
the translation context to all gimp_action_group_add methods.
* app/actions/*.c: added a translation context to all action
labels. Also unified and improved the labels and tooltips in a
few
places.
Modified:
trunk/ChangeLog
trunk/app/actions/brush-editor-actions.c
trunk/app/actions/brushes-actions.c
trunk/app/actions/buffers-actions.c
trunk/app/actions/channels-actions.c
trunk/app/actions/colormap-actions.c
trunk/app/actions/config-actions.c
trunk/app/actions/context-actions.c
trunk/app/actions/cursor-info-actions.c
trunk/app/actions/debug-actions.c
trunk/app/actions/dialogs-actions.c
trunk/app/actions/dock-actions.c
trunk/app/actions/dockable-actions.c
trunk/app/actions/documents-actions.c
trunk/app/actions/drawable-actions.c
trunk/app/actions/edit-actions.c
trunk/app/actions/error-console-actions.c
trunk/app/actions/file-actions.c
trunk/app/actions/fonts-actions.c
trunk/app/actions/gradient-editor-actions.c
trunk/app/actions/gradients-actions.c
trunk/app/actions/help-actions.c
trunk/app/actions/image-actions.c
trunk/app/actions/images-actions.c
trunk/app/actions/layers-actions.c
trunk/app/actions/palette-editor-actions.c
trunk/app/actions/palettes-actions.c
trunk/app/actions/patterns-actions.c
trunk/app/actions/plug-in-actions.c
trunk/app/actions/quick-mask-actions.c
trunk/app/actions/sample-points-actions.c
trunk/app/actions/select-actions.c
trunk/app/actions/templates-actions.c
trunk/app/actions/text-editor-actions.c
trunk/app/actions/text-tool-actions.c
trunk/app/actions/tool-options-actions.c
trunk/app/actions/tools-actions.c
trunk/app/actions/vectors-actions.c
trunk/app/actions/view-actions.c
trunk/app/actions/window-actions.c
trunk/app/actions/windows-actions.c
trunk/app/widgets/gimpactiongroup.c
trunk/app/widgets/gimpactiongroup.h
trunk/po/ChangeLog
trunk/po/de.po
Modified: trunk/app/actions/brush-editor-actions.c
==============================================================================
--- trunk/app/actions/brush-editor-actions.c (original)
+++ trunk/app/actions/brush-editor-actions.c Wed Dec 3 15:27:42 2008
@@ -40,14 +40,14 @@
static const GimpActionEntry brush_editor_actions[] =
{
{ "brush-editor-popup", GIMP_STOCK_BRUSH,
- N_("Brush Editor Menu"), NULL, NULL, NULL,
+ NC_("brush-editor-action", "Brush Editor Menu"), NULL, NULL, NULL,
GIMP_HELP_BRUSH_EDITOR_DIALOG }
};
static const GimpToggleActionEntry brush_editor_toggle_actions[] =
{
{ "brush-editor-edit-active", GIMP_STOCK_LINKED,
- N_("Edit Active Brush"), NULL, NULL,
+ NC_("brush-editor-action", "Edit Active Brush"), NULL, NULL,
G_CALLBACK (data_editor_edit_active_cmd_callback),
FALSE,
GIMP_HELP_BRUSH_EDITOR_EDIT_ACTIVE }
@@ -57,11 +57,11 @@
void
brush_editor_actions_setup (GimpActionGroup *group)
{
- gimp_action_group_add_actions (group,
+ gimp_action_group_add_actions (group, "brush-editor-action",
brush_editor_actions,
G_N_ELEMENTS (brush_editor_actions));
- gimp_action_group_add_toggle_actions (group,
+ gimp_action_group_add_toggle_actions (group, "brush-editor-action",
brush_editor_toggle_actions,
G_N_ELEMENTS (brush_editor_toggle_actions));
}
Modified: trunk/app/actions/brushes-actions.c
==============================================================================
--- trunk/app/actions/brushes-actions.c (original)
+++ trunk/app/actions/brushes-actions.c Wed Dec 3 15:27:42 2008
@@ -40,41 +40,41 @@
static const GimpActionEntry brushes_actions[] =
{
{ "brushes-popup", GIMP_STOCK_BRUSH,
- N_("Brushes Menu"), NULL, NULL, NULL,
+ NC_("brushes-action", "Brushes Menu"), NULL, NULL, NULL,
GIMP_HELP_BRUSH_DIALOG },
{ "brushes-open-as-image", GTK_STOCK_OPEN,
- N_("_Open Brush as Image"), "",
+ NC_("brushes-action", "_Open Brush as Image"), "",
N_("Open brush as image"),
G_CALLBACK (data_open_as_image_cmd_callback),
GIMP_HELP_BRUSH_OPEN_AS_IMAGE },
{ "brushes-new", GTK_STOCK_NEW,
- N_("_New Brush"), "",
- N_("New brush"),
+ NC_("brushes-action", "_New Brush"), "",
+ N_("Create a new brush"),
G_CALLBACK (data_new_cmd_callback),
GIMP_HELP_BRUSH_NEW },
{ "brushes-duplicate", GIMP_STOCK_DUPLICATE,
- N_("D_uplicate Brush"), NULL,
- N_("Duplicate brush"),
+ NC_("brushes-action", "D_uplicate Brush"), NULL,
+ N_("Duplicate this brush"),
G_CALLBACK (data_duplicate_cmd_callback),
GIMP_HELP_BRUSH_DUPLICATE },
{ "brushes-copy-location", GTK_STOCK_COPY,
- N_("Copy Brush _Location"), "",
+ NC_("brushes-action", "Copy Brush _Location"), "",
N_("Copy brush file location to clipboard"),
G_CALLBACK (data_copy_location_cmd_callback),
GIMP_HELP_BRUSH_COPY_LOCATION },
{ "brushes-delete", GTK_STOCK_DELETE,
- N_("_Delete Brush"), "",
- N_("Delete brush"),
+ NC_("brushes-action", "_Delete Brush"), "",
+ N_("Delete this brush"),
G_CALLBACK (data_delete_cmd_callback),
GIMP_HELP_BRUSH_DELETE },
{ "brushes-refresh", GTK_STOCK_REFRESH,
- N_("_Refresh Brushes"), "",
+ NC_("brushes-action", "_Refresh Brushes"), "",
N_("Refresh brushes"),
G_CALLBACK (data_refresh_cmd_callback),
GIMP_HELP_BRUSH_REFRESH }
@@ -83,7 +83,7 @@
static const GimpStringActionEntry brushes_edit_actions[] =
{
{ "brushes-edit", GTK_STOCK_EDIT,
- N_("_Edit Brush..."), NULL,
+ NC_("brushes-action", "_Edit Brush..."), NULL,
N_("Edit brush"),
"gimp-brush-editor",
GIMP_HELP_BRUSH_EDIT }
@@ -93,11 +93,11 @@
void
brushes_actions_setup (GimpActionGroup *group)
{
- gimp_action_group_add_actions (group,
+ gimp_action_group_add_actions (group, "brushes-action",
brushes_actions,
G_N_ELEMENTS (brushes_actions));
- gimp_action_group_add_string_actions (group,
+ gimp_action_group_add_string_actions (group, "brushes-action",
brushes_edit_actions,
G_N_ELEMENTS (brushes_edit_actions),
G_CALLBACK (data_edit_cmd_callback));
Modified: trunk/app/actions/buffers-actions.c
==============================================================================
--- trunk/app/actions/buffers-actions.c (original)
+++ trunk/app/actions/buffers-actions.c Wed Dec 3 15:27:42 2008
@@ -39,29 +39,29 @@
static const GimpActionEntry buffers_actions[] =
{
{ "buffers-popup", GIMP_STOCK_BUFFER,
- N_("Buffers Menu"), NULL, NULL, NULL,
+ NC_("buffers-action", "Buffers Menu"), NULL, NULL, NULL,
GIMP_HELP_BUFFER_DIALOG },
{ "buffers-paste", GTK_STOCK_PASTE,
- N_("_Paste Buffer"), "",
+ NC_("buffers-action", "_Paste Buffer"), "",
N_("Paste the selected buffer"),
G_CALLBACK (buffers_paste_cmd_callback),
GIMP_HELP_BUFFER_PASTE },
{ "buffers-paste-into", GIMP_STOCK_PASTE_INTO,
- N_("Paste Buffer _Into"), NULL,
+ NC_("buffers-action", "Paste Buffer _Into"), NULL,
N_("Paste the selected buffer into the selection"),
G_CALLBACK (buffers_paste_into_cmd_callback),
GIMP_HELP_BUFFER_PASTE_INTO },
{ "buffers-paste-as-new", GIMP_STOCK_PASTE_AS_NEW,
- N_("Paste Buffer as _New"), NULL,
+ NC_("buffers-action", "Paste Buffer as _New"), NULL,
N_("Paste the selected buffer as new image"),
G_CALLBACK (buffers_paste_as_new_cmd_callback),
GIMP_HELP_BUFFER_PASTE_AS_NEW },
{ "buffers-delete", GTK_STOCK_DELETE,
- N_("_Delete Buffer"), "",
+ NC_("buffers-action", "_Delete Buffer"), "",
N_("Delete the selected buffer"),
G_CALLBACK (buffers_delete_cmd_callback),
GIMP_HELP_BUFFER_DELETE }
@@ -71,7 +71,7 @@
void
buffers_actions_setup (GimpActionGroup *group)
{
- gimp_action_group_add_actions (group,
+ gimp_action_group_add_actions (group, "buffers-action",
buffers_actions,
G_N_ELEMENTS (buffers_actions));
}
Modified: trunk/app/actions/channels-actions.c
==============================================================================
--- trunk/app/actions/channels-actions.c (original)
+++ trunk/app/actions/channels-actions.c Wed Dec 3 15:27:42 2008
@@ -41,59 +41,59 @@
static const GimpActionEntry channels_actions[] =
{
{ "channels-popup", GIMP_STOCK_CHANNELS,
- N_("Channels Menu"), NULL, NULL, NULL,
+ NC_("channels-action", "Channels Menu"), NULL, NULL, NULL,
GIMP_HELP_CHANNEL_DIALOG },
{ "channels-edit-attributes", GTK_STOCK_EDIT,
- N_("_Edit Channel Attributes..."), NULL,
+ NC_("channels-action", "_Edit Channel Attributes..."), NULL,
N_("Edit the channel's name, color and opacity"),
G_CALLBACK (channels_edit_attributes_cmd_callback),
GIMP_HELP_CHANNEL_EDIT },
{ "channels-new", GTK_STOCK_NEW,
- N_("_New Channel..."), "",
+ NC_("channels-action", "_New Channel..."), "",
N_("Create a new channel"),
G_CALLBACK (channels_new_cmd_callback),
GIMP_HELP_CHANNEL_NEW },
{ "channels-new-last-values", GTK_STOCK_NEW,
- N_("_New Channel"), "",
+ NC_("channels-action", "_New Channel"), "",
N_("Create a new channel with last used values"),
G_CALLBACK (channels_new_last_vals_cmd_callback),
GIMP_HELP_CHANNEL_NEW },
{ "channels-duplicate", GIMP_STOCK_DUPLICATE,
- N_("D_uplicate Channel"), NULL,
+ NC_("channels-action", "D_uplicate Channel"), NULL,
N_("Create a duplicate of this channel and add it to the image"),
G_CALLBACK (channels_duplicate_cmd_callback),
GIMP_HELP_CHANNEL_DUPLICATE },
{ "channels-delete", GTK_STOCK_DELETE,
- N_("_Delete Channel"), "",
+ NC_("channels-action", "_Delete Channel"), "",
N_("Delete this channel"),
G_CALLBACK (channels_delete_cmd_callback),
GIMP_HELP_CHANNEL_DELETE },
{ "channels-raise", GTK_STOCK_GO_UP,
- N_("_Raise Channel"), "",
+ NC_("channels-action", "_Raise Channel"), "",
N_("Raise this channel one step in the channel stack"),
G_CALLBACK (channels_raise_cmd_callback),
GIMP_HELP_CHANNEL_RAISE },
{ "channels-raise-to-top", GTK_STOCK_GOTO_TOP,
- N_("Raise Channel to _Top"), "",
+ NC_("channels-action", "Raise Channel to _Top"), "",
N_("Raise this channel to the top of the channel stack"),
G_CALLBACK (channels_raise_to_top_cmd_callback),
GIMP_HELP_CHANNEL_RAISE_TO_TOP },
{ "channels-lower", GTK_STOCK_GO_DOWN,
- N_("_Lower Channel"), "",
+ NC_("channels-action", "_Lower Channel"), "",
N_("Lower this channel one step in the channel stack"),
G_CALLBACK (channels_lower_cmd_callback),
GIMP_HELP_CHANNEL_LOWER },
{ "channels-lower-to-bottom", GTK_STOCK_GOTO_BOTTOM,
- N_("Lower Channel to _Bottom"), "",
+ NC_("channels-action", "Lower Channel to _Bottom"), "",
N_("Lower this channel to the bottom of the channel stack"),
G_CALLBACK (channels_lower_to_bottom_cmd_callback),
GIMP_HELP_CHANNEL_LOWER_TO_BOTTOM }
@@ -102,25 +102,25 @@
static const GimpEnumActionEntry channels_to_selection_actions[] =
{
{ "channels-selection-replace", GIMP_STOCK_SELECTION_REPLACE,
- N_("Channel to Sele_ction"), NULL,
+ NC_("channels-action", "Channel to Sele_ction"), NULL,
N_("Replace the selection with this channel"),
GIMP_CHANNEL_OP_REPLACE, FALSE,
GIMP_HELP_CHANNEL_SELECTION_REPLACE },
{ "channels-selection-add", GIMP_STOCK_SELECTION_ADD,
- N_("_Add to Selection"), NULL,
+ NC_("channels-action", "_Add to Selection"), NULL,
N_("Add this channel to the current selection"),
GIMP_CHANNEL_OP_ADD, FALSE,
GIMP_HELP_CHANNEL_SELECTION_ADD },
{ "channels-selection-subtract", GIMP_STOCK_SELECTION_SUBTRACT,
- N_("_Subtract from Selection"), NULL,
+ NC_("channels-action", "_Subtract from Selection"), NULL,
N_("Subtract this channel from the current selection"),
GIMP_CHANNEL_OP_SUBTRACT, FALSE,
GIMP_HELP_CHANNEL_SELECTION_SUBTRACT },
{ "channels-selection-intersect", GIMP_STOCK_SELECTION_INTERSECT,
- N_("_Intersect with Selection"), NULL,
+ NC_("channels-action", "_Intersect with Selection"), NULL,
N_("Intersect this channel with the current selection"),
GIMP_CHANNEL_OP_INTERSECT, FALSE,
GIMP_HELP_CHANNEL_SELECTION_INTERSECT }
@@ -130,11 +130,11 @@
void
channels_actions_setup (GimpActionGroup *group)
{
- gimp_action_group_add_actions (group,
+ gimp_action_group_add_actions (group, "channels-action",
channels_actions,
G_N_ELEMENTS (channels_actions));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, "channels-action",
channels_to_selection_actions,
G_N_ELEMENTS (channels_to_selection_actions),
G_CALLBACK (channels_to_selection_cmd_callback));
Modified: trunk/app/actions/colormap-actions.c
==============================================================================
--- trunk/app/actions/colormap-actions.c (original)
+++ trunk/app/actions/colormap-actions.c Wed Dec 3 15:27:42 2008
@@ -42,12 +42,12 @@
static const GimpActionEntry colormap_actions[] =
{
{ "colormap-popup", GIMP_STOCK_COLORMAP,
- N_("Colormap Menu"), NULL, NULL, NULL,
+ NC_("colormap-action", "Colormap Menu"), NULL, NULL, NULL,
GIMP_HELP_INDEXED_PALETTE_DIALOG },
{ "colormap-edit-color", GTK_STOCK_EDIT,
- N_("_Edit Color..."), NULL,
- N_("Edit color"),
+ NC_("colormap-action", "_Edit Color..."), NULL,
+ N_("Edit this color"),
G_CALLBACK (colormap_edit_color_cmd_callback),
GIMP_HELP_INDEXED_PALETTE_EDIT }
};
@@ -55,13 +55,13 @@
static const GimpEnumActionEntry colormap_add_color_actions[] =
{
{ "colormap-add-color-from-fg", GTK_STOCK_ADD,
- N_("_Add Color from FG"), "",
+ NC_("colormap-action", "_Add Color from FG"), "",
N_("Add current foreground color"),
FALSE, FALSE,
GIMP_HELP_INDEXED_PALETTE_ADD },
{ "colormap-add-color-from-bg", GTK_STOCK_ADD,
- N_("_Add Color from BG"), "",
+ NC_("colormap-action", "_Add Color from BG"), "",
N_("Add current background color"),
TRUE, FALSE,
GIMP_HELP_INDEXED_PALETTE_ADD }
@@ -71,11 +71,11 @@
void
colormap_actions_setup (GimpActionGroup *group)
{
- gimp_action_group_add_actions (group,
+ gimp_action_group_add_actions (group, "colormap-action",
colormap_actions,
G_N_ELEMENTS (colormap_actions));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, "colormap-action",
colormap_add_color_actions,
G_N_ELEMENTS (colormap_add_color_actions),
G_CALLBACK (colormap_add_color_cmd_callback));
Modified: trunk/app/actions/config-actions.c
==============================================================================
--- trunk/app/actions/config-actions.c (original)
+++ trunk/app/actions/config-actions.c Wed Dec 3 15:27:42 2008
@@ -36,7 +36,7 @@
static const GimpToggleActionEntry config_toggle_actions[] =
{
{ "config-use-gegl", NULL,
- N_("Use _GEGL"), NULL,
+ NC_("config-action", "Use _GEGL"), NULL,
N_("If possible, use GEGL for image processing"),
G_CALLBACK (config_use_gegl_cmd_callback),
FALSE,
@@ -61,7 +61,7 @@
void
config_actions_setup (GimpActionGroup *group)
{
- gimp_action_group_add_toggle_actions (group,
+ gimp_action_group_add_toggle_actions (group, "config-action",
config_toggle_actions,
G_N_ELEMENTS (config_toggle_actions));
Modified: trunk/app/actions/context-actions.c
==============================================================================
--- trunk/app/actions/context-actions.c (original)
+++ trunk/app/actions/context-actions.c Wed Dec 3 15:27:42 2008
@@ -43,32 +43,48 @@
static const GimpActionEntry context_actions[] =
{
- { "context-menu", NULL, N_("_Context") },
- { "context-colors-menu", GIMP_STOCK_DEFAULT_COLORS, N_("_Colors") },
- { "context-opacity-menu", GIMP_STOCK_TRANSPARENCY, N_("_Opacity") },
- { "context-paint-mode-menu", GIMP_STOCK_TOOL_PENCIL, N_("Paint _Mode") },
- { "context-tool-menu", GIMP_STOCK_TOOLS, N_("_Tool") },
- { "context-brush-menu", GIMP_STOCK_BRUSH, N_("_Brush") },
- { "context-pattern-menu", GIMP_STOCK_PATTERN, N_("_Pattern") },
- { "context-palette-menu", GIMP_STOCK_PALETTE, N_("_Palette") },
- { "context-gradient-menu", GIMP_STOCK_GRADIENT, N_("_Gradient") },
- { "context-font-menu", GIMP_STOCK_FONT, N_("_Font") },
-
- { "context-brush-shape-menu", NULL, N_("_Shape") },
- { "context-brush-radius-menu", NULL, N_("_Radius") },
- { "context-brush-spikes-menu", NULL, N_("S_pikes") },
- { "context-brush-hardness-menu", NULL, N_("_Hardness") },
- { "context-brush-aspect-menu", NULL, N_("_Aspect") },
- { "context-brush-angle-menu", NULL, N_("A_ngle") },
+ { "context-menu", NULL, NC_("context-action",
+ "_Context") },
+ { "context-colors-menu", GIMP_STOCK_DEFAULT_COLORS, NC_("context-action",
+ "_Colors") },
+ { "context-opacity-menu", GIMP_STOCK_TRANSPARENCY, NC_("context-action",
+ "_Opacity") },
+ { "context-paint-mode-menu", GIMP_STOCK_TOOL_PENCIL, NC_("context-action",
+ "Paint _Mode") },
+ { "context-tool-menu", GIMP_STOCK_TOOLS, NC_("context-action",
+ "_Tool") },
+ { "context-brush-menu", GIMP_STOCK_BRUSH, NC_("context-action",
+ "_Brush") },
+ { "context-pattern-menu", GIMP_STOCK_PATTERN, NC_("context-action",
+ "_Pattern") },
+ { "context-palette-menu", GIMP_STOCK_PALETTE, NC_("context-action",
+ "_Palette") },
+ { "context-gradient-menu", GIMP_STOCK_GRADIENT, NC_("context-action",
+ "_Gradient") },
+ { "context-font-menu", GIMP_STOCK_FONT, NC_("context-action",
+ "_Font") },
+
+ { "context-brush-shape-menu", NULL, NC_("context-action",
+ "_Shape") },
+ { "context-brush-radius-menu", NULL, NC_("context-action",
+ "_Radius") },
+ { "context-brush-spikes-menu", NULL, NC_("context-action",
+ "S_pikes") },
+ { "context-brush-hardness-menu", NULL, NC_("context-action",
+ "_Hardness") },
+ { "context-brush-aspect-menu", NULL, NC_("context-action",
+ "_Aspect") },
+ { "context-brush-angle-menu", NULL, NC_("context-action",
+ "A_ngle") },
{ "context-colors-default", GIMP_STOCK_DEFAULT_COLORS,
- N_("_Default Colors"), "D",
+ NC_("context-action", "_Default Colors"), "D",
N_("Set foreground color to black, background color to white"),
G_CALLBACK (context_colors_default_cmd_callback),
GIMP_HELP_TOOLBOX_DEFAULT_COLORS },
{ "context-colors-swap", GIMP_STOCK_SWAP_COLORS,
- N_("S_wap Colors"), "X",
+ NC_("context-action", "S_wap Colors"), "X",
N_("Exchange foreground and background colors"),
G_CALLBACK (context_colors_swap_cmd_callback),
GIMP_HELP_TOOLBOX_SWAP_COLORS }
@@ -1074,149 +1090,149 @@
void
context_actions_setup (GimpActionGroup *group)
{
- gimp_action_group_add_actions (group,
+ gimp_action_group_add_actions (group, "context-action",
context_actions,
G_N_ELEMENTS (context_actions));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, NULL,
context_palette_foreground_actions,
G_N_ELEMENTS (context_palette_foreground_actions),
G_CALLBACK (context_palette_foreground_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, NULL,
context_palette_background_actions,
G_N_ELEMENTS (context_palette_background_actions),
G_CALLBACK (context_palette_background_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, NULL,
context_colormap_foreground_actions,
G_N_ELEMENTS (context_colormap_foreground_actions),
G_CALLBACK (context_colormap_foreground_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, NULL,
context_colormap_background_actions,
G_N_ELEMENTS (context_colormap_background_actions),
G_CALLBACK (context_colormap_background_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, NULL,
context_swatch_foreground_actions,
G_N_ELEMENTS (context_swatch_foreground_actions),
G_CALLBACK (context_swatch_foreground_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, NULL,
context_swatch_background_actions,
G_N_ELEMENTS (context_swatch_background_actions),
G_CALLBACK (context_swatch_background_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, NULL,
context_foreground_red_actions,
G_N_ELEMENTS (context_foreground_red_actions),
G_CALLBACK (context_foreground_red_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, NULL,
context_foreground_green_actions,
G_N_ELEMENTS (context_foreground_green_actions),
G_CALLBACK (context_foreground_green_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, NULL,
context_foreground_blue_actions,
G_N_ELEMENTS (context_foreground_blue_actions),
G_CALLBACK (context_foreground_blue_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, NULL,
context_foreground_hue_actions,
G_N_ELEMENTS (context_foreground_hue_actions),
G_CALLBACK (context_foreground_hue_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, NULL,
context_foreground_saturation_actions,
G_N_ELEMENTS (context_foreground_saturation_actions),
G_CALLBACK (context_foreground_saturation_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, NULL,
context_foreground_value_actions,
G_N_ELEMENTS (context_foreground_value_actions),
G_CALLBACK (context_foreground_value_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, NULL,
context_background_red_actions,
G_N_ELEMENTS (context_background_red_actions),
G_CALLBACK (context_background_red_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, NULL,
context_background_green_actions,
G_N_ELEMENTS (context_background_green_actions),
G_CALLBACK (context_background_green_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, NULL,
context_background_blue_actions,
G_N_ELEMENTS (context_background_blue_actions),
G_CALLBACK (context_background_blue_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, NULL,
context_background_hue_actions,
G_N_ELEMENTS (context_background_hue_actions),
G_CALLBACK (context_background_hue_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, NULL,
context_background_saturation_actions,
G_N_ELEMENTS (context_background_saturation_actions),
G_CALLBACK (context_background_saturation_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, NULL,
context_background_value_actions,
G_N_ELEMENTS (context_background_value_actions),
G_CALLBACK (context_background_value_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, NULL,
context_opacity_actions,
G_N_ELEMENTS (context_opacity_actions),
G_CALLBACK (context_opacity_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, NULL,
context_paint_mode_actions,
G_N_ELEMENTS (context_paint_mode_actions),
G_CALLBACK (context_paint_mode_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, NULL,
context_tool_select_actions,
G_N_ELEMENTS (context_tool_select_actions),
G_CALLBACK (context_tool_select_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, NULL,
context_brush_select_actions,
G_N_ELEMENTS (context_brush_select_actions),
G_CALLBACK (context_brush_select_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, NULL,
context_pattern_select_actions,
G_N_ELEMENTS (context_pattern_select_actions),
G_CALLBACK (context_pattern_select_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, NULL,
context_palette_select_actions,
G_N_ELEMENTS (context_palette_select_actions),
G_CALLBACK (context_palette_select_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, NULL,
context_gradient_select_actions,
G_N_ELEMENTS (context_gradient_select_actions),
G_CALLBACK (context_gradient_select_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, NULL,
context_font_select_actions,
G_N_ELEMENTS (context_font_select_actions),
G_CALLBACK (context_font_select_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, NULL,
context_brush_spacing_actions,
G_N_ELEMENTS (context_brush_spacing_actions),
G_CALLBACK (context_brush_spacing_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, NULL,
context_brush_shape_actions,
G_N_ELEMENTS (context_brush_shape_actions),
G_CALLBACK (context_brush_shape_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, NULL,
context_brush_radius_actions,
G_N_ELEMENTS (context_brush_radius_actions),
G_CALLBACK (context_brush_radius_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, NULL,
context_brush_spikes_actions,
G_N_ELEMENTS (context_brush_spikes_actions),
G_CALLBACK (context_brush_spikes_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, NULL,
context_brush_hardness_actions,
G_N_ELEMENTS (context_brush_hardness_actions),
G_CALLBACK (context_brush_hardness_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, NULL,
context_brush_aspect_actions,
G_N_ELEMENTS (context_brush_aspect_actions),
G_CALLBACK (context_brush_aspect_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, NULL,
context_brush_angle_actions,
G_N_ELEMENTS (context_brush_angle_actions),
G_CALLBACK (context_brush_angle_cmd_callback));
Modified: trunk/app/actions/cursor-info-actions.c
==============================================================================
--- trunk/app/actions/cursor-info-actions.c (original)
+++ trunk/app/actions/cursor-info-actions.c Wed Dec 3 15:27:42 2008
@@ -38,15 +38,15 @@
static const GimpActionEntry cursor_info_actions[] =
{
{ "cursor-info-popup", GIMP_STOCK_CURSOR,
- N_("Pointer Information Menu"), NULL, NULL, NULL,
+ NC_("cursor-info-action", "Pointer Information Menu"), NULL, NULL, NULL,
GIMP_HELP_POINTER_INFO_DIALOG }
};
static const GimpToggleActionEntry cursor_info_toggle_actions[] =
{
{ "cursor-info-sample-merged", NULL,
- N_("_Sample Merged"), "",
- N_("Sample Merged"),
+ NC_("cursor-info-action", "_Sample Merged"), "",
+ N_("Use the composite color of all visible layers"),
G_CALLBACK (cursor_info_sample_merged_cmd_callback),
TRUE,
GIMP_HELP_POINTER_INFO_SAMPLE_MERGED }
@@ -56,11 +56,11 @@
void
cursor_info_actions_setup (GimpActionGroup *group)
{
- gimp_action_group_add_actions (group,
+ gimp_action_group_add_actions (group, "cursor-info-action",
cursor_info_actions,
G_N_ELEMENTS (cursor_info_actions));
- gimp_action_group_add_toggle_actions (group,
+ gimp_action_group_add_toggle_actions (group, "cursor-info-action",
cursor_info_toggle_actions,
G_N_ELEMENTS (cursor_info_toggle_actions));
}
Modified: trunk/app/actions/debug-actions.c
==============================================================================
--- trunk/app/actions/debug-actions.c (original)
+++ trunk/app/actions/debug-actions.c Wed Dec 3 15:27:42 2008
@@ -72,7 +72,7 @@
debug_actions_setup (GimpActionGroup *group)
{
#ifdef ENABLE_DEBUG_MENU
- gimp_action_group_add_actions (group,
+ gimp_action_group_add_actions (group, NULL,
debug_actions,
G_N_ELEMENTS (debug_actions));
#endif
Modified: trunk/app/actions/dialogs-actions.c
==============================================================================
--- trunk/app/actions/dialogs-actions.c (original)
+++ trunk/app/actions/dialogs-actions.c Wed Dec 3 15:27:42 2008
@@ -36,163 +36,163 @@
const GimpStringActionEntry dialogs_dockable_actions[] =
{
{ "dialogs-tool-options", GIMP_STOCK_TOOL_OPTIONS,
- N_("Tool _Options"), NULL,
+ NC_("dialogs-action", "Tool _Options"), NULL,
N_("Open the tool options dialog"),
"gimp-tool-options",
GIMP_HELP_TOOL_OPTIONS_DIALOG },
{ "dialogs-device-status", GIMP_STOCK_DEVICE_STATUS,
- N_("_Device Status"), NULL,
+ NC_("dialogs-action", "_Device Status"), NULL,
N_("Open the device status dialog"),
"gimp-device-status",
GIMP_HELP_DEVICE_STATUS_DIALOG },
{ "dialogs-layers", GIMP_STOCK_LAYERS,
- N_("_Layers"), "<control>L",
+ NC_("dialogs-action", "_Layers"), "<control>L",
N_("Open the layers dialog"),
"gimp-layer-list",
GIMP_HELP_LAYER_DIALOG },
{ "dialogs-channels", GIMP_STOCK_CHANNELS,
- N_("_Channels"), NULL,
+ NC_("dialogs-action", "_Channels"), NULL,
N_("Open the channels dialog"),
"gimp-channel-list",
GIMP_HELP_CHANNEL_DIALOG },
{ "dialogs-vectors", GIMP_STOCK_PATHS,
- N_("_Paths"), NULL,
+ NC_("dialogs-action", "_Paths"), NULL,
N_("Open the paths dialog"),
"gimp-vectors-list",
GIMP_HELP_PATH_DIALOG },
{ "dialogs-indexed-palette", GIMP_STOCK_COLORMAP,
- N_("Color_map"), NULL,
+ NC_("dialogs-action", "Color_map"), NULL,
N_("Open the colormap dialog"),
"gimp-indexed-palette",
GIMP_HELP_INDEXED_PALETTE_DIALOG },
{ "dialogs-histogram", GIMP_STOCK_HISTOGRAM,
- N_("Histogra_m"), NULL,
+ NC_("dialogs-action", "Histogra_m"), NULL,
N_("Open the histogram dialog"),
"gimp-histogram-editor",
GIMP_HELP_HISTOGRAM_DIALOG },
{ "dialogs-selection-editor", GIMP_STOCK_TOOL_RECT_SELECT,
- N_("_Selection Editor"), NULL,
+ NC_("dialogs-action", "_Selection Editor"), NULL,
N_("Open the selection editor"),
"gimp-selection-editor",
GIMP_HELP_SELECTION_DIALOG },
{ "dialogs-navigation", GIMP_STOCK_NAVIGATION,
- N_("Na_vigation"), NULL,
+ NC_("dialogs-action", "Na_vigation"), NULL,
N_("Open the display navigation dialog"),
"gimp-navigation-view",
GIMP_HELP_NAVIGATION_DIALOG },
{ "dialogs-undo-history", GIMP_STOCK_UNDO_HISTORY,
- N_("Undo _History"), NULL,
+ NC_("dialogs-action", "Undo _History"), NULL,
N_("Open the undo history dialog"),
"gimp-undo-history",
GIMP_HELP_UNDO_DIALOG },
{ "dialogs-cursor", GIMP_STOCK_CURSOR,
- N_("Pointer"), NULL,
+ NC_("dialogs-action", "Pointer"), NULL,
N_("Open the pointer information dialog"),
"gimp-cursor-view",
GIMP_HELP_POINTER_INFO_DIALOG },
{ "dialogs-sample-points", GIMP_STOCK_SAMPLE_POINT,
- N_("_Sample Points"), NULL,
+ NC_("dialogs-action", "_Sample Points"), NULL,
N_("Open the sample points dialog"),
"gimp-sample-point-editor",
GIMP_HELP_SAMPLE_POINT_DIALOG },
{ "dialogs-colors", GIMP_STOCK_DEFAULT_COLORS,
- N_("Colo_rs"), NULL,
+ NC_("dialogs-action", "Colo_rs"), NULL,
N_("Open the FG/BG color dialog"),
"gimp-color-editor",
GIMP_HELP_COLOR_DIALOG },
{ "dialogs-brushes", GIMP_STOCK_BRUSH,
- N_("_Brushes"), "<control><shift>B",
+ NC_("dialogs-action", "_Brushes"), "<control><shift>B",
N_("Open the brushes dialog"),
"gimp-brush-grid|gimp-brush-list",
GIMP_HELP_BRUSH_DIALOG },
{ "dialogs-brush-editor", GIMP_STOCK_BRUSH,
- N_("Brush Editor"), NULL,
+ NC_("dialogs-action", "Brush Editor"), NULL,
N_("Open the brush editor"),
"gimp-brush-editor",
GIMP_HELP_BRUSH_EDIT },
{ "dialogs-patterns", GIMP_STOCK_PATTERN,
- N_("P_atterns"), "<control><shift>P",
+ NC_("dialogs-action", "P_atterns"), "<control><shift>P",
N_("Open the patterns dialog"),
"gimp-pattern-grid|gimp-pattern-list",
GIMP_HELP_PATTERN_DIALOG },
{ "dialogs-gradients", GIMP_STOCK_GRADIENT,
- N_("_Gradients"), "<control>G",
+ NC_("dialogs-action", "_Gradients"), "<control>G",
N_("Open the gradients dialog"),
"gimp-gradient-list|gimp-gradient-grid",
GIMP_HELP_GRADIENT_DIALOG },
{ "dialogs-gradient-editor", GIMP_STOCK_GRADIENT,
- N_("Gradient Editor"), NULL,
+ NC_("dialogs-action", "Gradient Editor"), NULL,
N_("Open the gradient editor"),
"gimp-gradient-editor",
GIMP_HELP_GRADIENT_EDIT },
{ "dialogs-palettes", GIMP_STOCK_PALETTE,
- N_("Pal_ettes"), NULL,
+ NC_("dialogs-action", "Pal_ettes"), NULL,
N_("Open the palettes dialog"),
"gimp-palette-list|gimp-palette-grid",
GIMP_HELP_PALETTE_DIALOG },
{ "dialogs-palette-editor", GIMP_STOCK_PALETTE,
- N_("Palette Editor"), NULL,
+ NC_("dialogs-action", "Palette Editor"), NULL,
N_("Open the palette editor"),
"gimp-palette-editor",
GIMP_HELP_PALETTE_EDIT },
{ "dialogs-fonts", GIMP_STOCK_FONT,
- N_("_Fonts"), NULL,
+ NC_("dialogs-action", "_Fonts"), NULL,
N_("Open the fonts dialog"),
"gimp-font-list|gimp-font-grid",
GIMP_HELP_FONT_DIALOG },
{ "dialogs-buffers", GIMP_STOCK_BUFFER,
- N_("B_uffers"), "",
+ NC_("dialogs-action", "B_uffers"), "",
N_("Open the named buffers dialog"),
"gimp-buffer-list|gimp-buffer-grid",
GIMP_HELP_BUFFER_DIALOG },
{ "dialogs-images", GIMP_STOCK_IMAGES,
- N_("_Images"), NULL,
+ NC_("dialogs-action", "_Images"), NULL,
N_("Open the images dialog"),
"gimp-image-list|gimp-image-grid",
GIMP_HELP_IMAGE_DIALOG },
{ "dialogs-document-history", "document-open-recent",
- N_("Document Histor_y"), "",
+ NC_("dialogs-action", "Document Histor_y"), "",
N_("Open the document history dialog"),
"gimp-document-list|gimp-document-grid",
GIMP_HELP_DOCUMENT_DIALOG },
{ "dialogs-templates", GIMP_STOCK_TEMPLATE,
- N_("_Templates"), "",
+ NC_("dialogs-action", "_Templates"), "",
N_("Open the image templates dialog"),
"gimp-template-list|gimp-template-grid",
GIMP_HELP_TEMPLATE_DIALOG },
{ "dialogs-tools", GIMP_STOCK_TOOLS,
- N_("T_ools"), NULL,
+ NC_("dialogs-action", "T_ools"), NULL,
N_("Open the tools dialog"),
"gimp-tool-list|gimp-tool-grid",
GIMP_HELP_TOOLS_DIALOG },
{ "dialogs-error-console", GIMP_STOCK_WARNING,
- N_("Error Co_nsole"), NULL,
+ NC_("dialogs-action", "Error Co_nsole"), NULL,
N_("Open the error console"),
"gimp-error-console",
GIMP_HELP_ERRORS_DIALOG }
@@ -203,31 +203,31 @@
static const GimpStringActionEntry dialogs_toplevel_actions[] =
{
{ "dialogs-preferences", GTK_STOCK_PREFERENCES,
- N_("_Preferences"), NULL,
+ NC_("dialogs-action", "_Preferences"), NULL,
N_("Open the preferences dialog"),
"gimp-preferences-dialog",
GIMP_HELP_PREFS_DIALOG },
{ "dialogs-keyboard-shortcuts", GIMP_STOCK_CHAR_PICKER,
- N_("_Keyboard Shortcuts"), NULL,
+ NC_("dialogs-action", "_Keyboard Shortcuts"), NULL,
N_("Open the keyboard shortcuts editor"),
"gimp-keyboard-shortcuts-dialog",
GIMP_HELP_KEYBOARD_SHORTCUTS },
{ "dialogs-module-dialog", GTK_STOCK_EXECUTE,
- N_("_Modules"), NULL,
+ NC_("dialogs-action", "_Modules"), NULL,
N_("Open the module manager dialog"),
"gimp-module-dialog",
GIMP_HELP_MODULE_DIALOG },
{ "dialogs-tips", GIMP_STOCK_INFO,
- N_("_Tip of the Day"), NULL,
+ NC_("dialogs-action", "_Tip of the Day"), NULL,
N_("Show some helpful tips on using GIMP"),
"gimp-tips-dialog",
GIMP_HELP_TIPS_DIALOG },
{ "dialogs-about", GTK_STOCK_ABOUT,
- N_("_About"), NULL,
+ NC_("dialogs-action", "_About"), NULL,
N_("About GIMP"),
"gimp-about-dialog",
GIMP_HELP_ABOUT_DIALOG }
@@ -237,12 +237,12 @@
void
dialogs_actions_setup (GimpActionGroup *group)
{
- gimp_action_group_add_string_actions (group,
+ gimp_action_group_add_string_actions (group, "dialogs-action",
dialogs_dockable_actions,
G_N_ELEMENTS (dialogs_dockable_actions),
G_CALLBACK (dialogs_create_dockable_cmd_callback));
- gimp_action_group_add_string_actions (group,
+ gimp_action_group_add_string_actions (group, "dialogs-action",
dialogs_toplevel_actions,
G_N_ELEMENTS (dialogs_toplevel_actions),
G_CALLBACK (dialogs_create_toplevel_cmd_callback));
Modified: trunk/app/actions/dock-actions.c
==============================================================================
--- trunk/app/actions/dock-actions.c (original)
+++ trunk/app/actions/dock-actions.c Wed Dec 3 15:27:42 2008
@@ -40,16 +40,16 @@
static const GimpActionEntry dock_actions[] =
{
{ "dock-move-to-screen-menu", GIMP_STOCK_MOVE_TO_SCREEN,
- N_("M_ove to Screen"), NULL, NULL, NULL,
+ NC_("dock-action", "M_ove to Screen"), NULL, NULL, NULL,
GIMP_HELP_DOCK_CHANGE_SCREEN },
{ "dock-close", GTK_STOCK_CLOSE,
- N_("Close Dock"), NULL, NULL,
+ NC_("dock-action", "Close Dock"), NULL, NULL,
G_CALLBACK (window_close_cmd_callback),
GIMP_HELP_DOCK_CLOSE },
{ "dock-open-display", NULL,
- N_("_Open Display..."), NULL,
+ NC_("dock-action", "_Open Display..."), NULL,
N_("Connect to another display"),
G_CALLBACK (window_open_display_cmd_callback),
NULL }
@@ -58,13 +58,13 @@
static const GimpToggleActionEntry dock_toggle_actions[] =
{
{ "dock-show-image-menu", NULL,
- N_("_Show Image Selection"), NULL, NULL,
+ NC_("dock-action", "_Show Image Selection"), NULL, NULL,
G_CALLBACK (dock_toggle_image_menu_cmd_callback),
TRUE,
GIMP_HELP_DOCK_IMAGE_MENU },
{ "dock-auto-follow-active", NULL,
- N_("Auto _Follow Active Image"), NULL, NULL,
+ NC_("dock-action", "Auto _Follow Active Image"), NULL, NULL,
G_CALLBACK (dock_toggle_auto_cmd_callback),
TRUE,
GIMP_HELP_DOCK_AUTO_BUTTON }
@@ -74,11 +74,11 @@
void
dock_actions_setup (GimpActionGroup *group)
{
- gimp_action_group_add_actions (group,
+ gimp_action_group_add_actions (group, "dock-action",
dock_actions,
G_N_ELEMENTS (dock_actions));
- gimp_action_group_add_toggle_actions (group,
+ gimp_action_group_add_toggle_actions (group, "dock-action",
dock_toggle_actions,
G_N_ELEMENTS (dock_toggle_actions));
Modified: trunk/app/actions/dockable-actions.c
==============================================================================
--- trunk/app/actions/dockable-actions.c (original)
+++ trunk/app/actions/dockable-actions.c Wed Dec 3 15:27:42 2008
@@ -46,21 +46,21 @@
static const GimpActionEntry dockable_actions[] =
{
{ "dockable-popup", NULL,
- N_("Dialogs Menu"), NULL, NULL, NULL,
+ NC_("dockable-action", "Dialogs Menu"), NULL, NULL, NULL,
GIMP_HELP_DOCK },
{ "dockable-menu", GTK_STOCK_MISSING_IMAGE, "" },
- { "dockable-add-tab-menu", NULL, N_("_Add Tab") },
- { "dockable-preview-size-menu", NULL, N_("_Preview Size") },
- { "dockable-tab-style-menu", NULL, N_("_Tab Style") },
+ { "dockable-add-tab-menu", NULL, NC_("dockable-action", "_Add Tab") },
+ { "dockable-preview-size-menu", NULL, NC_("dockable-action", "_Preview Size") },
+ { "dockable-tab-style-menu", NULL, NC_("dockable-action", "_Tab Style") },
{ "dockable-close-tab", GTK_STOCK_CLOSE,
- N_("_Close Tab"), "", NULL,
+ NC_("dockable-action", "_Close Tab"), "", NULL,
G_CALLBACK (dockable_close_tab_cmd_callback),
GIMP_HELP_DOCK_TAB_CLOSE },
{ "dockable-detach-tab", GIMP_STOCK_DETACH,
- N_("_Detach Tab"), "", NULL,
+ NC_("dockable-action", "_Detach Tab"), "", NULL,
G_CALLBACK (dockable_detach_tab_cmd_callback),
GIMP_HELP_DOCK_TAB_DETACH }
};
@@ -78,24 +78,38 @@
static const GimpRadioActionEntry dockable_view_size_actions[] =
{
- VIEW_SIZE ("tiny", N_("_Tiny"), GIMP_VIEW_SIZE_TINY),
- VIEW_SIZE ("extra-small", N_("E_xtra Small"), GIMP_VIEW_SIZE_EXTRA_SMALL),
- VIEW_SIZE ("small", N_("_Small"), GIMP_VIEW_SIZE_SMALL),
- VIEW_SIZE ("medium", N_("_Medium"), GIMP_VIEW_SIZE_MEDIUM),
- VIEW_SIZE ("large", N_("_Large"), GIMP_VIEW_SIZE_LARGE),
- VIEW_SIZE ("extra-large", N_("Ex_tra Large"), GIMP_VIEW_SIZE_EXTRA_LARGE),
- VIEW_SIZE ("huge", N_("_Huge"), GIMP_VIEW_SIZE_HUGE),
- VIEW_SIZE ("enormous", N_("_Enormous"), GIMP_VIEW_SIZE_ENORMOUS),
- VIEW_SIZE ("gigantic", N_("_Gigantic"), GIMP_VIEW_SIZE_GIGANTIC)
+ VIEW_SIZE ("tiny",
+ NC_("preview-size", "_Tiny"), GIMP_VIEW_SIZE_TINY),
+ VIEW_SIZE ("extra-small",
+ NC_("preview-size", "E_xtra Small"), GIMP_VIEW_SIZE_EXTRA_SMALL),
+ VIEW_SIZE ("small",
+ NC_("preview-size", "_Small"), GIMP_VIEW_SIZE_SMALL),
+ VIEW_SIZE ("medium",
+ NC_("preview-size", "_Medium"), GIMP_VIEW_SIZE_MEDIUM),
+ VIEW_SIZE ("large",
+ NC_("preview-size", "_Large"), GIMP_VIEW_SIZE_LARGE),
+ VIEW_SIZE ("extra-large",
+ NC_("preview-size", "Ex_tra Large"), GIMP_VIEW_SIZE_EXTRA_LARGE),
+ VIEW_SIZE ("huge",
+ NC_("preview-size", "_Huge"), GIMP_VIEW_SIZE_HUGE),
+ VIEW_SIZE ("enormous",
+ NC_("preview-size", "_Enormous"), GIMP_VIEW_SIZE_ENORMOUS),
+ VIEW_SIZE ("gigantic",
+ NC_("preview-size", "_Gigantic"), GIMP_VIEW_SIZE_GIGANTIC)
};
static const GimpRadioActionEntry dockable_tab_style_actions[] =
{
- TAB_STYLE ("icon", N_("_Icon"), GIMP_TAB_STYLE_ICON),
- TAB_STYLE ("preview", N_("Current _Status"), GIMP_TAB_STYLE_PREVIEW),
- TAB_STYLE ("name", N_("_Text"), GIMP_TAB_STYLE_NAME),
- TAB_STYLE ("icon-name", N_("I_con & Text"), GIMP_TAB_STYLE_ICON_NAME),
- TAB_STYLE ("preview-name", N_("St_atus & Text"), GIMP_TAB_STYLE_PREVIEW_NAME)
+ TAB_STYLE ("icon",
+ NC_("tab-style", "_Icon"), GIMP_TAB_STYLE_ICON),
+ TAB_STYLE ("preview",
+ NC_("tab-style", "Current _Status"), GIMP_TAB_STYLE_PREVIEW),
+ TAB_STYLE ("name",
+ NC_("tab-style", "_Text"), GIMP_TAB_STYLE_NAME),
+ TAB_STYLE ("icon-name",
+ NC_("tab-style", "I_con & Text"), GIMP_TAB_STYLE_ICON_NAME),
+ TAB_STYLE ("preview-name",
+ NC_("tab-style", "St_atus & Text"), GIMP_TAB_STYLE_PREVIEW_NAME)
};
#undef VIEW_SIZE
@@ -105,14 +119,14 @@
static const GimpToggleActionEntry dockable_toggle_actions[] =
{
{ "dockable-lock-tab", NULL,
- N_("Loc_k Tab to Dock"), NULL,
+ NC_("dockable-action", "Loc_k Tab to Dock"), NULL,
N_("Protect this tab from being dragged with the mouse pointer"),
G_CALLBACK (dockable_lock_tab_cmd_callback),
FALSE,
GIMP_HELP_DOCK_TAB_LOCK },
{ "dockable-show-button-bar", NULL,
- N_("Show _Button Bar"), NULL, NULL,
+ NC_("dockable-action", "Show _Button Bar"), NULL, NULL,
G_CALLBACK (dockable_show_button_bar_cmd_callback),
TRUE,
GIMP_HELP_DOCK_SHOW_BUTTON_BAR }
@@ -121,12 +135,12 @@
static const GimpRadioActionEntry dockable_view_type_actions[] =
{
{ "dockable-view-type-list", NULL,
- N_("View as _List"), NULL, NULL,
+ NC_("dockable-action", "View as _List"), NULL, NULL,
GIMP_VIEW_TYPE_LIST,
GIMP_HELP_DOCK_VIEW_AS_LIST },
{ "dockable-view-type-grid", NULL,
- N_("View as _Grid"), NULL, NULL,
+ NC_("dockable-action", "View as _Grid"), NULL, NULL,
GIMP_VIEW_TYPE_GRID,
GIMP_HELP_DOCK_VIEW_AS_GRID }
};
@@ -135,34 +149,34 @@
void
dockable_actions_setup (GimpActionGroup *group)
{
- gimp_action_group_add_actions (group,
+ gimp_action_group_add_actions (group, "dockable-action",
dockable_actions,
G_N_ELEMENTS (dockable_actions));
- gimp_action_group_add_toggle_actions (group,
+ gimp_action_group_add_toggle_actions (group, "dockable-action",
dockable_toggle_actions,
G_N_ELEMENTS (dockable_toggle_actions));
- gimp_action_group_add_string_actions (group,
+ gimp_action_group_add_string_actions (group, "dialogs-action",
dialogs_dockable_actions,
n_dialogs_dockable_actions,
G_CALLBACK (dockable_add_tab_cmd_callback));
- gimp_action_group_add_radio_actions (group,
+ gimp_action_group_add_radio_actions (group, "preview-size",
dockable_view_size_actions,
G_N_ELEMENTS (dockable_view_size_actions),
NULL,
GIMP_VIEW_SIZE_MEDIUM,
G_CALLBACK (dockable_view_size_cmd_callback));
- gimp_action_group_add_radio_actions (group,
+ gimp_action_group_add_radio_actions (group, "tab-style",
dockable_tab_style_actions,
G_N_ELEMENTS (dockable_tab_style_actions),
NULL,
GIMP_TAB_STYLE_PREVIEW,
G_CALLBACK (dockable_tab_style_cmd_callback));
- gimp_action_group_add_radio_actions (group,
+ gimp_action_group_add_radio_actions (group, "dockable-action",
dockable_view_type_actions,
G_N_ELEMENTS (dockable_view_type_actions),
NULL,
Modified: trunk/app/actions/documents-actions.c
==============================================================================
--- trunk/app/actions/documents-actions.c (original)
+++ trunk/app/actions/documents-actions.c Wed Dec 3 15:27:42 2008
@@ -39,59 +39,59 @@
static const GimpActionEntry documents_actions[] =
{
{ "documents-popup", "document-open-recent",
- N_("Documents Menu"), NULL, NULL, NULL,
+ NC_("documents-action", "Documents Menu"), NULL, NULL, NULL,
GIMP_HELP_DOCUMENT_DIALOG },
{ "documents-open", GTK_STOCK_OPEN,
- N_("_Open Image"), "",
+ NC_("documents-action", "_Open Image"), "",
N_("Open the selected entry"),
G_CALLBACK (documents_open_cmd_callback),
GIMP_HELP_DOCUMENT_OPEN },
{ "documents-raise-or-open", NULL,
- N_("_Raise or Open Image"), "",
+ NC_("documents-action", "_Raise or Open Image"), "",
N_("Raise window if already open"),
G_CALLBACK (documents_raise_or_open_cmd_callback),
GIMP_HELP_DOCUMENT_OPEN },
{ "documents-file-open-dialog", NULL,
- N_("File Open _Dialog"), "",
+ NC_("documents-action", "File Open _Dialog"), "",
N_("Open image dialog"),
G_CALLBACK (documents_file_open_dialog_cmd_callback),
GIMP_HELP_DOCUMENT_OPEN },
{ "documents-copy-location", GTK_STOCK_COPY,
- N_("Copy Image _Location"), "",
+ NC_("documents-action", "Copy Image _Location"), "",
N_("Copy image location to clipboard"),
G_CALLBACK (documents_copy_location_cmd_callback),
GIMP_HELP_DOCUMENT_COPY_LOCATION },
{ "documents-remove", GTK_STOCK_REMOVE,
- N_("Remove _Entry"), "",
+ NC_("documents-action", "Remove _Entry"), "",
N_("Remove the selected entry"),
G_CALLBACK (documents_remove_cmd_callback),
GIMP_HELP_DOCUMENT_REMOVE },
{ "documents-clear", GTK_STOCK_CLEAR,
- N_("_Clear History"), "",
+ NC_("documents-action", "_Clear History"), "",
N_("Clear the entire document history"),
G_CALLBACK (documents_clear_cmd_callback),
GIMP_HELP_DOCUMENT_CLEAR },
{ "documents-recreate-preview", GTK_STOCK_REFRESH,
- N_("Recreate _Preview"), "",
+ NC_("documents-action", "Recreate _Preview"), "",
N_("Recreate preview"),
G_CALLBACK (documents_recreate_preview_cmd_callback),
GIMP_HELP_DOCUMENT_REFRESH },
{ "documents-reload-previews", NULL,
- N_("Reload _all Previews"), "",
+ NC_("documents-action", "Reload _all Previews"), "",
N_("Reload all previews"),
G_CALLBACK (documents_reload_previews_cmd_callback),
GIMP_HELP_DOCUMENT_REFRESH },
{ "documents-remove-dangling", NULL,
- N_("Remove Dangling E_ntries"), "",
+ NC_("documents-action", "Remove Dangling E_ntries"), "",
N_("Remove dangling entries"),
G_CALLBACK (documents_remove_dangling_cmd_callback),
GIMP_HELP_DOCUMENT_REFRESH }
@@ -101,7 +101,7 @@
void
documents_actions_setup (GimpActionGroup *group)
{
- gimp_action_group_add_actions (group,
+ gimp_action_group_add_actions (group, "documents-action",
documents_actions,
G_N_ELEMENTS (documents_actions));
}
Modified: trunk/app/actions/drawable-actions.c
==============================================================================
--- trunk/app/actions/drawable-actions.c (original)
+++ trunk/app/actions/drawable-actions.c Wed Dec 3 15:27:42 2008
@@ -43,25 +43,25 @@
static const GimpActionEntry drawable_actions[] =
{
{ "drawable-equalize", NULL,
- N_("_Equalize"), NULL,
+ NC_("drawable-action", "_Equalize"), NULL,
N_("Automatic contrast enhancement"),
G_CALLBACK (drawable_equalize_cmd_callback),
GIMP_HELP_LAYER_EQUALIZE },
{ "drawable-invert", GIMP_STOCK_INVERT,
- N_("In_vert"), NULL,
+ NC_("drawable-action", "In_vert"), NULL,
N_("Invert the colors"),
G_CALLBACK (drawable_invert_cmd_callback),
GIMP_HELP_LAYER_INVERT },
{ "drawable-levels-stretch", NULL,
- N_("_White Balance"), NULL,
+ NC_("drawable-action", "_White Balance"), NULL,
N_("Automatic white balance correction"),
G_CALLBACK (drawable_levels_stretch_cmd_callback),
GIMP_HELP_LAYER_WHITE_BALANCE},
{ "drawable-offset", NULL,
- N_("_Offset..."), "<control><shift>O",
+ NC_("drawable-action", "_Offset..."), "<control><shift>O",
N_("Shift the pixels, optionally wrapping them at the borders"),
G_CALLBACK (drawable_offset_cmd_callback),
GIMP_HELP_LAYER_OFFSET }
@@ -70,14 +70,14 @@
static const GimpToggleActionEntry drawable_toggle_actions[] =
{
{ "drawable-linked", GIMP_STOCK_LINKED,
- N_("_Linked"), NULL,
+ NC_("drawable-action", "_Linked"), NULL,
N_("Toggle the linked state"),
G_CALLBACK (drawable_linked_cmd_callback),
FALSE,
GIMP_HELP_LAYER_LINKED },
{ "drawable-visible", GIMP_STOCK_VISIBLE,
- N_("_Visible"), NULL,
+ NC_("drawable-action", "_Visible"), NULL,
N_("Toggle visibility"),
G_CALLBACK (drawable_visible_cmd_callback),
FALSE,
@@ -87,13 +87,13 @@
static const GimpEnumActionEntry drawable_flip_actions[] =
{
{ "drawable-flip-horizontal", GIMP_STOCK_FLIP_HORIZONTAL,
- N_("Flip _Horizontally"), NULL,
+ NC_("drawable-action", "Flip _Horizontally"), NULL,
N_("Flip horizontally"),
GIMP_ORIENTATION_HORIZONTAL, FALSE,
GIMP_HELP_LAYER_FLIP_HORIZONTAL },
{ "drawable-flip-vertical", GIMP_STOCK_FLIP_VERTICAL,
- N_("Flip _Vertically"), NULL,
+ NC_("drawable-action", "Flip _Vertically"), NULL,
N_("Flip vertically"),
GIMP_ORIENTATION_VERTICAL, FALSE,
GIMP_HELP_LAYER_FLIP_VERTICAL }
@@ -102,19 +102,19 @@
static const GimpEnumActionEntry drawable_rotate_actions[] =
{
{ "drawable-rotate-90", GIMP_STOCK_ROTATE_90,
- N_("Rotate 90Â _clockwise"), NULL,
+ NC_("drawable-action", "Rotate 90Â _clockwise"), NULL,
N_("Rotate 90 degrees to the right"),
GIMP_ROTATE_90, FALSE,
GIMP_HELP_LAYER_ROTATE_90 },
{ "drawable-rotate-180", GIMP_STOCK_ROTATE_180,
- N_("Rotate _180Â"), NULL,
+ NC_("drawable-action", "Rotate _180Â"), NULL,
N_("Turn upside-down"),
GIMP_ROTATE_180, FALSE,
GIMP_HELP_LAYER_ROTATE_180 },
{ "drawable-rotate-270", GIMP_STOCK_ROTATE_270,
- N_("Rotate 90Â counter-clock_wise"), NULL,
+ NC_("drawable-action", "Rotate 90Â counter-clock_wise"), NULL,
N_("Rotate 90 degrees to the left"),
GIMP_ROTATE_270, FALSE,
GIMP_HELP_LAYER_ROTATE_270 }
@@ -124,20 +124,20 @@
void
drawable_actions_setup (GimpActionGroup *group)
{
- gimp_action_group_add_actions (group,
+ gimp_action_group_add_actions (group, "drawable-action",
drawable_actions,
G_N_ELEMENTS (drawable_actions));
- gimp_action_group_add_toggle_actions (group,
+ gimp_action_group_add_toggle_actions (group, "drawable-action",
drawable_toggle_actions,
G_N_ELEMENTS (drawable_toggle_actions));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, "drawable-action",
drawable_flip_actions,
G_N_ELEMENTS (drawable_flip_actions),
G_CALLBACK (drawable_flip_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, "drawable-action",
drawable_rotate_actions,
G_N_ELEMENTS (drawable_rotate_actions),
G_CALLBACK (drawable_rotate_cmd_callback));
Modified: trunk/app/actions/edit-actions.c
==============================================================================
--- trunk/app/actions/edit-actions.c (original)
+++ trunk/app/actions/edit-actions.c Wed Dec 3 15:27:42 2008
@@ -61,124 +61,124 @@
static const GimpActionEntry edit_actions[] =
{
- { "edit-menu", NULL, N_("_Edit") },
- { "edit-paste-as-menu", NULL, N_("_Paste as") },
- { "edit-buffer-menu", NULL, N_("_Buffer") },
+ { "edit-menu", NULL, NC_("edit-action", "_Edit") },
+ { "edit-paste-as-menu", NULL, NC_("edit-action", "_Paste as") },
+ { "edit-buffer-menu", NULL, NC_("edit-action", "_Buffer") },
{ "undo-popup",
- GTK_STOCK_UNDO, N_("Undo History Menu"), NULL, NULL, NULL,
+ GTK_STOCK_UNDO, NC_("edit-action", "Undo History Menu"), NULL, NULL, NULL,
GIMP_HELP_UNDO_DIALOG },
{ "edit-undo", GTK_STOCK_UNDO,
- N_("_Undo"), "<control>Z",
+ NC_("edit-action", "_Undo"), "<control>Z",
N_("Undo the last operation"),
G_CALLBACK (edit_undo_cmd_callback),
GIMP_HELP_EDIT_UNDO },
{ "edit-redo", GTK_STOCK_REDO,
- N_("_Redo"), "<control>Y",
+ NC_("edit-action", "_Redo"), "<control>Y",
N_("Redo the last operation that was undone"),
G_CALLBACK (edit_redo_cmd_callback),
GIMP_HELP_EDIT_REDO },
{ "edit-strong-undo", GTK_STOCK_UNDO,
- N_("Strong Undo"), "<control><shift>Z",
+ NC_("edit-action", "Strong Undo"), "<control><shift>Z",
N_("Undo the last operation, skipping visibility changes"),
G_CALLBACK (edit_strong_undo_cmd_callback),
GIMP_HELP_EDIT_STRONG_UNDO },
{ "edit-strong-redo", GTK_STOCK_REDO,
- N_("Strong Redo"), "<control><shift>Y",
+ NC_("edit-action", "Strong Redo"), "<control><shift>Y",
N_("Redo the last operation that was undone, skipping visibility changes"),
G_CALLBACK (edit_strong_redo_cmd_callback),
GIMP_HELP_EDIT_STRONG_REDO },
{ "edit-undo-clear", GTK_STOCK_CLEAR,
- N_("_Clear Undo History"), "",
+ NC_("edit-action", "_Clear Undo History"), "",
N_("Remove all operations from the undo history"),
G_CALLBACK (edit_undo_clear_cmd_callback),
GIMP_HELP_EDIT_UNDO_CLEAR },
{ "edit-fade", GTK_STOCK_UNDO,
- N_("_Fade..."), "",
+ NC_("edit-action", "_Fade..."), "",
N_("Modify paint mode and opacity of the last pixel manipulation"),
G_CALLBACK (edit_fade_cmd_callback),
GIMP_HELP_EDIT_FADE },
{ "edit-cut", GTK_STOCK_CUT,
- N_("Cu_t"), "<control>X",
+ NC_("edit-action", "Cu_t"), "<control>X",
N_("Move the selected pixels to the clipboard"),
G_CALLBACK (edit_cut_cmd_callback),
GIMP_HELP_EDIT_CUT },
{ "edit-copy", GTK_STOCK_COPY,
- N_("_Copy"), "<control>C",
+ NC_("edit-action", "_Copy"), "<control>C",
N_("Copy the selected pixels to the clipboard"),
G_CALLBACK (edit_copy_cmd_callback),
GIMP_HELP_EDIT_COPY },
{ "edit-copy-visible", NULL, /* GIMP_STOCK_COPY_VISIBLE, */
- N_("Copy _Visible"), "<control><shift>C",
+ NC_("edit-action", "Copy _Visible"), "<control><shift>C",
N_("Copy what is visible in the selected region"),
G_CALLBACK (edit_copy_visible_cmd_callback),
GIMP_HELP_EDIT_COPY_VISIBLE },
{ "edit-paste", GTK_STOCK_PASTE,
- N_("_Paste"), "<control>V",
+ NC_("edit-action", "_Paste"), "<control>V",
N_("Paste the content of the clipboard"),
G_CALLBACK (edit_paste_cmd_callback),
GIMP_HELP_EDIT_PASTE },
{ "edit-paste-into", GIMP_STOCK_PASTE_INTO,
- N_("Paste _Into"), NULL,
+ NC_("edit-action", "Paste _Into"), NULL,
N_("Paste the content of the clipboard into the current selection"),
G_CALLBACK (edit_paste_into_cmd_callback),
GIMP_HELP_EDIT_PASTE_INTO },
{ "edit-paste-as-new", GIMP_STOCK_PASTE_AS_NEW,
- N_("From _Clipboard"), "<control><shift>V",
+ NC_("edit-action", "From _Clipboard"), "<control><shift>V",
N_("Create a new image from the content of the clipboard"),
G_CALLBACK (edit_paste_as_new_cmd_callback),
GIMP_HELP_EDIT_PASTE_AS_NEW },
{ "edit-paste-as-new-short", GIMP_STOCK_PASTE_AS_NEW,
- N_("_New Image"), NULL,
+ NC_("edit-action", "_New Image"), NULL,
N_("Create a new image from the content of the clipboard"),
G_CALLBACK (edit_paste_as_new_cmd_callback),
GIMP_HELP_EDIT_PASTE_AS_NEW },
{ "edit-paste-as-new-layer", NULL,
- N_("New _Layer"), NULL,
+ NC_("edit-action", "New _Layer"), NULL,
N_("Create a new layer from the content of the clipboard"),
G_CALLBACK (edit_paste_as_new_layer_cmd_callback),
GIMP_HELP_EDIT_PASTE_AS_NEW_LAYER },
{ "edit-named-cut", GTK_STOCK_CUT,
- N_("Cu_t Named..."), "",
+ NC_("edit-action", "Cu_t Named..."), "",
N_("Move the selected pixels to a named buffer"),
G_CALLBACK (edit_named_cut_cmd_callback),
GIMP_HELP_BUFFER_CUT },
{ "edit-named-copy", GTK_STOCK_COPY,
- N_("_Copy Named..."), "",
+ NC_("edit-action", "_Copy Named..."), "",
N_("Copy the selected pixels to a named buffer"),
G_CALLBACK (edit_named_copy_cmd_callback),
GIMP_HELP_BUFFER_COPY },
{ "edit-named-copy-visible", NULL, /* GIMP_STOCK_COPY_VISIBLE, */
- N_("Copy _Visible Named..."), "",
+ NC_("edit-action", "Copy _Visible Named..."), "",
N_("Copy the selected region to a named buffer"),
G_CALLBACK (edit_named_copy_visible_cmd_callback),
GIMP_HELP_BUFFER_COPY },
{ "edit-named-paste", GTK_STOCK_PASTE,
- N_("_Paste Named..."), "",
+ NC_("edit-action", "_Paste Named..."), "",
N_("Paste the content of a named buffer"),
G_CALLBACK (edit_named_paste_cmd_callback),
GIMP_HELP_BUFFER_PASTE },
{ "edit-clear", GTK_STOCK_CLEAR,
- N_("Cl_ear"), "Delete",
+ NC_("edit-action", "Cl_ear"), "Delete",
N_("Clear the selected pixels"),
G_CALLBACK (edit_clear_cmd_callback),
GIMP_HELP_EDIT_CLEAR }
@@ -187,19 +187,19 @@
static const GimpEnumActionEntry edit_fill_actions[] =
{
{ "edit-fill-fg", GIMP_STOCK_TOOL_BUCKET_FILL,
- N_("Fill with _FG Color"), "<control>comma",
+ NC_("edit-action", "Fill with _FG Color"), "<control>comma",
N_("Fill the selection using the foreground color"),
GIMP_FOREGROUND_FILL, FALSE,
GIMP_HELP_EDIT_FILL_FG },
{ "edit-fill-bg", GIMP_STOCK_TOOL_BUCKET_FILL,
- N_("Fill with B_G Color"), "<control>period",
+ NC_("edit-action", "Fill with B_G Color"), "<control>period",
N_("Fill the selection using the background color"),
GIMP_BACKGROUND_FILL, FALSE,
GIMP_HELP_EDIT_FILL_BG },
{ "edit-fill-pattern", GIMP_STOCK_TOOL_BUCKET_FILL,
- N_("Fill with P_attern"), "<control>semicolon",
+ NC_("edit-action", "Fill with P_attern"), "<control>semicolon",
N_("Fill the selection using the active pattern"),
GIMP_PATTERN_FILL, FALSE,
GIMP_HELP_EDIT_FILL_PATTERN }
@@ -214,11 +214,11 @@
GimpPattern *pattern;
GtkAction *action;
- gimp_action_group_add_actions (group,
+ gimp_action_group_add_actions (group, "edit-action",
edit_actions,
G_N_ELEMENTS (edit_actions));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, "edit-action",
edit_fill_actions,
G_N_ELEMENTS (edit_fill_actions),
G_CALLBACK (edit_fill_cmd_callback));
Modified: trunk/app/actions/error-console-actions.c
==============================================================================
--- trunk/app/actions/error-console-actions.c (original)
+++ trunk/app/actions/error-console-actions.c Wed Dec 3 15:27:42 2008
@@ -37,17 +37,17 @@
static const GimpActionEntry error_console_actions[] =
{
{ "error-console-popup", GIMP_STOCK_WARNING,
- N_("Error Console Menu"), NULL, NULL, NULL,
+ NC_("error-console-action", "Error Console Menu"), NULL, NULL, NULL,
GIMP_HELP_ERRORS_DIALOG },
{ "error-console-clear", GTK_STOCK_CLEAR,
- N_("_Clear"), "",
+ NC_("error-console-action", "_Clear"), "",
N_("Clear error console"),
G_CALLBACK (error_console_clear_cmd_callback),
GIMP_HELP_ERRORS_CLEAR },
{ "error-console-select-all", NULL,
- N_("Select _All"), "",
+ NC_("error-console-action", "Select _All"), "",
N_("Select all errors"),
G_CALLBACK (error_console_select_all_cmd_callback),
GIMP_HELP_ERRORS_SELECT_ALL }
@@ -56,13 +56,13 @@
static const GimpEnumActionEntry error_console_save_actions[] =
{
{ "error-console-save-all", GTK_STOCK_SAVE_AS,
- N_("_Save Error Log to File..."), "",
+ NC_("error-console-action", "_Save Error Log to File..."), "",
N_("Save error log"),
FALSE, FALSE,
GIMP_HELP_ERRORS_SAVE },
{ "error-console-save-selection", GTK_STOCK_SAVE_AS,
- N_("Save S_election to File..."), "",
+ NC_("error-console-action", "Save S_election to File..."), "",
N_("Save selection"),
TRUE, FALSE,
GIMP_HELP_ERRORS_SAVE }
@@ -72,11 +72,11 @@
void
error_console_actions_setup (GimpActionGroup *group)
{
- gimp_action_group_add_actions (group,
+ gimp_action_group_add_actions (group, "error-console-action",
error_console_actions,
G_N_ELEMENTS (error_console_actions));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, "error-console-action",
error_console_save_actions,
G_N_ELEMENTS (error_console_save_actions),
G_CALLBACK (error_console_save_cmd_callback));
Modified: trunk/app/actions/file-actions.c
==============================================================================
--- trunk/app/actions/file-actions.c (original)
+++ trunk/app/actions/file-actions.c Wed Dec 3 15:27:42 2008
@@ -64,48 +64,48 @@
static const GimpActionEntry file_actions[] =
{
- { "file-menu", NULL, N_("_File") },
- { "file-create-menu", NULL, N_("Create") },
- { "file-open-recent-menu", NULL, N_("Open _Recent") },
+ { "file-menu", NULL, NC_("file-action", "_File") },
+ { "file-create-menu", NULL, NC_("file-action", "Create") },
+ { "file-open-recent-menu", NULL, NC_("file-action", "Open _Recent") },
{ "file-open", GTK_STOCK_OPEN,
- N_("_Open..."), NULL,
+ NC_("file-action", "_Open..."), NULL,
N_("Open an image file"),
G_CALLBACK (file_open_cmd_callback),
GIMP_HELP_FILE_OPEN },
{ "file-open-as-layers", GIMP_STOCK_LAYER,
- N_("Op_en as Layers..."), "<control><alt>O",
+ NC_("file-action", "Op_en as Layers..."), "<control><alt>O",
N_("Open an image file as layers"),
G_CALLBACK (file_open_as_layers_cmd_callback),
GIMP_HELP_FILE_OPEN_AS_LAYER },
{ "file-open-location", GIMP_STOCK_WEB,
- N_("Open _Location..."), NULL,
+ NC_("file-action", "Open _Location..."), NULL,
N_("Open an image file from a specified location"),
G_CALLBACK (file_open_location_cmd_callback),
GIMP_HELP_FILE_OPEN_LOCATION },
{ "file-save-as-template", NULL,
- N_("Save as _Template..."), NULL,
+ NC_("file-action", "Save as _Template..."), NULL,
N_("Create a new template from this image"),
G_CALLBACK (file_save_template_cmd_callback),
GIMP_HELP_FILE_SAVE_AS_TEMPLATE },
{ "file-revert", GTK_STOCK_REVERT_TO_SAVED,
- N_("Re_vert"), NULL,
+ NC_("file-action", "Re_vert"), NULL,
N_("Reload the image file from disk"),
G_CALLBACK (file_revert_cmd_callback),
GIMP_HELP_FILE_REVERT },
{ "file-close-all", GTK_STOCK_CLOSE,
- N_("Close all"), "<shift><control>W",
+ NC_("file-action", "Close all"), "<shift><control>W",
N_("Close all opened images"),
G_CALLBACK (file_close_all_cmd_callback),
GIMP_HELP_FILE_CLOSE_ALL },
{ "file-quit", GTK_STOCK_QUIT,
- N_("_Quit"), "<control>Q",
+ NC_("file-action", "_Quit"), "<control>Q",
N_("Quit the GNU Image Manipulation Program"),
G_CALLBACK (file_quit_cmd_callback),
GIMP_HELP_FILE_QUIT }
@@ -114,25 +114,25 @@
static const GimpEnumActionEntry file_save_actions[] =
{
{ "file-save", GTK_STOCK_SAVE,
- N_("_Save"), "<control>S",
+ NC_("file-action", "_Save"), "<control>S",
N_("Save this image"),
GIMP_SAVE_MODE_SAVE, FALSE,
GIMP_HELP_FILE_SAVE },
{ "file-save-as", GTK_STOCK_SAVE_AS,
- N_("Save _As..."), "<control><shift>S",
+ NC_("file-action", "Save _As..."), "<control><shift>S",
N_("Save this image with a different name"),
GIMP_SAVE_MODE_SAVE_AS, FALSE,
GIMP_HELP_FILE_SAVE_AS },
{ "file-save-a-copy", NULL,
- N_("Save a Cop_y..."), NULL,
+ NC_("file-action", "Save a Cop_y..."), NULL,
N_("Save this image with a different name, but keep its current name"),
GIMP_SAVE_MODE_SAVE_A_COPY, FALSE,
GIMP_HELP_FILE_SAVE_A_COPY },
{ "file-save-and-close", NULL,
- N_("Save and Close..."), NULL,
+ NC_("file-action", "Save and Close..."), NULL,
N_("Save this image and close its window"),
GIMP_SAVE_MODE_SAVE_AND_CLOSE, FALSE,
GIMP_HELP_FILE_SAVE }
@@ -145,11 +145,11 @@
gint n_entries;
gint i;
- gimp_action_group_add_actions (group,
+ gimp_action_group_add_actions (group, "file-action",
file_actions,
G_N_ELEMENTS (file_actions));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, "file-action",
file_save_actions,
G_N_ELEMENTS (file_save_actions),
G_CALLBACK (file_save_cmd_callback));
@@ -176,7 +176,7 @@
entries[i].accelerator = "";
}
- gimp_action_group_add_enum_actions (group, entries, n_entries,
+ gimp_action_group_add_enum_actions (group, NULL, entries, n_entries,
G_CALLBACK (file_open_recent_cmd_callback));
for (i = 0; i < n_entries; i++)
Modified: trunk/app/actions/fonts-actions.c
==============================================================================
--- trunk/app/actions/fonts-actions.c (original)
+++ trunk/app/actions/fonts-actions.c Wed Dec 3 15:27:42 2008
@@ -41,11 +41,11 @@
static const GimpActionEntry fonts_actions[] =
{
{ "fonts-popup", GIMP_STOCK_FONT,
- N_("Fonts Menu"), NULL, NULL, NULL,
+ NC_("fonts-action", "Fonts Menu"), NULL, NULL, NULL,
GIMP_HELP_FONT_DIALOG },
{ "fonts-refresh", GTK_STOCK_REFRESH,
- N_("_Rescan Font List"), "",
+ NC_("fonts-action", "_Rescan Font List"), "",
N_("Rescan font list"),
G_CALLBACK (fonts_refresh_cmd_callback),
GIMP_HELP_FONT_REFRESH }
@@ -55,7 +55,7 @@
void
fonts_actions_setup (GimpActionGroup *group)
{
- gimp_action_group_add_actions (group,
+ gimp_action_group_add_actions (group, "fonts-action",
fonts_actions,
G_N_ELEMENTS (fonts_actions));
}
Modified: trunk/app/actions/gradient-editor-actions.c
==============================================================================
--- trunk/app/actions/gradient-editor-actions.c (original)
+++ trunk/app/actions/gradient-editor-actions.c Wed Dec 3 15:27:42 2008
@@ -43,33 +43,33 @@
static const GimpActionEntry gradient_editor_actions[] =
{
{ "gradient-editor-popup", GIMP_STOCK_GRADIENT,
- N_("Gradient Editor Menu"), NULL, NULL, NULL,
+ NC_("gradient-editor-action", "Gradient Editor Menu"), NULL, NULL, NULL,
GIMP_HELP_GRADIENT_EDITOR_DIALOG },
{ "gradient-editor-left-color-type", NULL,
- N_("Left Color Type") },
+ NC_("gradient-editor-action", "Left Color Type") },
{ "gradient-editor-load-left-color", GTK_STOCK_REVERT_TO_SAVED,
- N_("_Load Left Color From") },
+ NC_("gradient-editor-action", "_Load Left Color From") },
{ "gradient-editor-save-left-color", GTK_STOCK_SAVE,
- N_("_Save Left Color To") },
+ NC_("gradient-editor-action", "_Save Left Color To") },
{ "gradient-editor-right-color-type", NULL,
- N_("Right Color Type") },
+ NC_("gradient-editor-action", "Right Color Type") },
{ "gradient-editor-load-right-color", GTK_STOCK_REVERT_TO_SAVED,
- N_("Load Right Color Fr_om") },
+ NC_("gradient-editor-action", "Load Right Color Fr_om") },
{ "gradient-editor-save-right-color", GTK_STOCK_SAVE,
- N_("Sa_ve Right Color To") },
+ NC_("gradient-editor-action", "Sa_ve Right Color To") },
{ "gradient-editor-blending-func", NULL, "blending-function" },
{ "gradient-editor-coloring-type", NULL, "coloring-type" },
{ "gradient-editor-left-color", NULL,
- N_("L_eft Endpoint's Color..."), NULL, NULL,
+ NC_("gradient-editor-action", "L_eft Endpoint's Color..."), NULL, NULL,
G_CALLBACK (gradient_editor_left_color_cmd_callback),
GIMP_HELP_GRADIENT_EDITOR_LEFT_COLOR },
{ "gradient-editor-right-color", NULL,
- N_("R_ight Endpoint's Color..."), NULL, NULL,
+ NC_("gradient-editor-action", "R_ight Endpoint's Color..."), NULL, NULL,
G_CALLBACK (gradient_editor_right_color_cmd_callback),
GIMP_HELP_GRADIENT_EDITOR_RIGHT_COLOR },
@@ -109,12 +109,12 @@
GIMP_HELP_GRADIENT_EDITOR_REDISTRIBUTE },
{ "gradient-editor-blend-color", NULL,
- N_("Ble_nd Endpoints' Colors"), NULL, NULL,
+ NC_("gradient-editor-action", "Ble_nd Endpoints' Colors"), NULL, NULL,
G_CALLBACK (gradient_editor_blend_color_cmd_callback),
GIMP_HELP_GRADIENT_EDITOR_BLEND_COLOR },
{ "gradient-editor-blend-opacity", NULL,
- N_("Blend Endpoints' Opacit_y"), NULL, NULL,
+ NC_("gradient-editor-action", "Blend Endpoints' Opacit_y"), NULL, NULL,
G_CALLBACK (gradient_editor_blend_opacity_cmd_callback),
GIMP_HELP_GRADIENT_EDITOR_BLEND_OPACITY }
};
@@ -122,7 +122,7 @@
static const GimpToggleActionEntry gradient_editor_toggle_actions[] =
{
{ "gradient-editor-edit-active", GIMP_STOCK_LINKED,
- N_("Edit Active Gradient"), NULL, NULL,
+ NC_("gradient-editor-action", "Edit Active Gradient"), NULL, NULL,
G_CALLBACK (data_editor_edit_active_cmd_callback),
FALSE,
GIMP_HELP_GRADIENT_EDITOR_EDIT_ACTIVE }
@@ -153,22 +153,22 @@
static const GimpEnumActionEntry gradient_editor_load_left_actions[] =
{
{ "gradient-editor-load-left-left-neighbor", NULL,
- N_("_Left Neighbor's Right Endpoint"), NULL, NULL,
+ NC_("gradient-editor-action", "_Left Neighbor's Right Endpoint"), NULL, NULL,
GRADIENT_EDITOR_COLOR_NEIGHBOR_ENDPOINT, FALSE,
GIMP_HELP_GRADIENT_EDITOR_LEFT_LOAD },
{ "gradient-editor-load-left-right-endpoint", NULL,
- N_("_Right Endpoint"), NULL, NULL,
+ NC_("gradient-editor-action", "_Right Endpoint"), NULL, NULL,
GRADIENT_EDITOR_COLOR_OTHER_ENDPOINT, FALSE,
GIMP_HELP_GRADIENT_EDITOR_LEFT_LOAD },
{ "gradient-editor-load-left-fg", NULL,
- N_("_Foreground Color"), NULL, NULL,
+ NC_("gradient-editor-action", "_Foreground Color"), NULL, NULL,
GRADIENT_EDITOR_COLOR_FOREGROUND, FALSE,
GIMP_HELP_GRADIENT_EDITOR_LEFT_LOAD },
{ "gradient-editor-load-left-bg", NULL,
- N_("_Background Color"), NULL, NULL,
+ NC_("gradient-editor-action", "_Background Color"), NULL, NULL,
GRADIENT_EDITOR_COLOR_BACKGROUND, FALSE,
GIMP_HELP_GRADIENT_EDITOR_LEFT_LOAD },
@@ -201,22 +201,22 @@
static const GimpEnumActionEntry gradient_editor_load_right_actions[] =
{
{ "gradient-editor-load-right-right-neighbor", NULL,
- N_("_Right Neighbor's Left Endpoint"), NULL, NULL,
+ NC_("gradient-editor-action", "_Right Neighbor's Left Endpoint"), NULL, NULL,
GRADIENT_EDITOR_COLOR_NEIGHBOR_ENDPOINT, FALSE,
GIMP_HELP_GRADIENT_EDITOR_RIGHT_LOAD },
{ "gradient-editor-load-right-left-endpoint", NULL,
- N_("_Left Endpoint"), NULL, NULL,
+ NC_("gradient-editor-action", "_Left Endpoint"), NULL, NULL,
GRADIENT_EDITOR_COLOR_OTHER_ENDPOINT, FALSE,
GIMP_HELP_GRADIENT_EDITOR_RIGHT_LOAD },
{ "gradient-editor-load-right-fg", NULL,
- N_("_Foreground Color"), NULL, NULL,
+ NC_("gradient-editor-action", "_Foreground Color"), NULL, NULL,
GRADIENT_EDITOR_COLOR_FOREGROUND, FALSE,
GIMP_HELP_GRADIENT_EDITOR_RIGHT_LOAD },
{ "gradient-editor-load-right-bg", NULL,
- N_("_Background Color"), NULL, NULL,
+ NC_("gradient-editor-action", "_Background Color"), NULL, NULL,
GRADIENT_EDITOR_COLOR_BACKGROUND, FALSE,
GIMP_HELP_GRADIENT_EDITOR_RIGHT_LOAD },
@@ -255,27 +255,27 @@
static const GimpRadioActionEntry gradient_editor_left_color_type_actions[] =
{
{ "gradient-editor-left-color-fixed", NULL,
- N_("_Fixed"), NULL, NULL,
+ NC_("gradient-editor-color-type", "_Fixed"), NULL, NULL,
GIMP_GRADIENT_COLOR_FIXED,
GIMP_HELP_GRADIENT_EDITOR_LEFT_COLOR },
{ "gradient-editor-left-color-foreground", NULL,
- N_("F_oreground Color"), NULL, NULL,
+ NC_("gradient-editor-color-type", "F_oreground Color"), NULL, NULL,
GIMP_GRADIENT_COLOR_FOREGROUND,
GIMP_HELP_GRADIENT_EDITOR_LEFT_COLOR },
{ "gradient-editor-left-color-foreground-transparent", NULL,
- N_("Fo_reground Color (Transparent)"), NULL, NULL,
+ NC_("gradient-editor-color-type", "Fo_reground Color (Transparent)"), NULL, NULL,
GIMP_GRADIENT_COLOR_FOREGROUND_TRANSPARENT,
GIMP_HELP_GRADIENT_EDITOR_LEFT_COLOR },
{ "gradient-editor-left-color-background", NULL,
- N_("_Background Color"), NULL, NULL,
+ NC_("gradient-editor-color-type", "_Background Color"), NULL, NULL,
GIMP_GRADIENT_COLOR_BACKGROUND,
GIMP_HELP_GRADIENT_EDITOR_LEFT_COLOR },
{ "gradient-editor-left-color-background-transparent", NULL,
- N_("B_ackground Color (Transparent)"), NULL, NULL,
+ NC_("gradient-editor-color-type", "B_ackground Color (Transparent)"), NULL, NULL,
GIMP_GRADIENT_COLOR_BACKGROUND_TRANSPARENT,
GIMP_HELP_GRADIENT_EDITOR_LEFT_COLOR }
};
@@ -283,27 +283,27 @@
static const GimpRadioActionEntry gradient_editor_right_color_type_actions[] =
{
{ "gradient-editor-right-color-fixed", NULL,
- N_("_Fixed"), NULL, NULL,
+ NC_("gradient-editor-color-type", "_Fixed"), NULL, NULL,
GIMP_GRADIENT_COLOR_FIXED,
GIMP_HELP_GRADIENT_EDITOR_RIGHT_COLOR },
{ "gradient-editor-right-color-foreground", NULL,
- N_("F_oreground Color"), NULL, NULL,
+ NC_("gradient-editor-color-type", "F_oreground Color"), NULL, NULL,
GIMP_GRADIENT_COLOR_FOREGROUND,
GIMP_HELP_GRADIENT_EDITOR_RIGHT_COLOR },
{ "gradient-editor-right-color-foreground-transparent", NULL,
- N_("Fo_reground Color (Transparent)"), NULL, NULL,
+ NC_("gradient-editor-color-type", "Fo_reground Color (Transparent)"), NULL, NULL,
GIMP_GRADIENT_COLOR_FOREGROUND_TRANSPARENT,
GIMP_HELP_GRADIENT_EDITOR_RIGHT_COLOR },
{ "gradient-editor-right-color-background", NULL,
- N_("_Background Color"), NULL, NULL,
+ NC_("gradient-editor-color-type", "_Background Color"), NULL, NULL,
GIMP_GRADIENT_COLOR_BACKGROUND,
GIMP_HELP_GRADIENT_EDITOR_RIGHT_COLOR },
{ "gradient-editor-right-color-background-transparent", NULL,
- N_("B_ackground Color (Transparent)"), NULL, NULL,
+ NC_("gradient-editor-color-type", "B_ackground Color (Transparent)"), NULL, NULL,
GIMP_GRADIENT_COLOR_BACKGROUND_TRANSPARENT,
GIMP_HELP_GRADIENT_EDITOR_RIGHT_COLOR }
};
@@ -311,32 +311,32 @@
static const GimpRadioActionEntry gradient_editor_blending_actions[] =
{
{ "gradient-editor-blending-linear", NULL,
- N_("_Linear"), NULL, NULL,
+ NC_("gradient-editor-blending", "_Linear"), NULL, NULL,
GIMP_GRADIENT_SEGMENT_LINEAR,
GIMP_HELP_GRADIENT_EDITOR_BLENDING },
{ "gradient-editor-blending-curved", NULL,
- N_("_Curved"), NULL, NULL,
+ NC_("gradient-editor-blending", "_Curved"), NULL, NULL,
GIMP_GRADIENT_SEGMENT_CURVED,
GIMP_HELP_GRADIENT_EDITOR_BLENDING },
{ "gradient-editor-blending-sine", NULL,
- N_("_Sinusoidal"), NULL, NULL,
+ NC_("gradient-editor-blending", "_Sinusoidal"), NULL, NULL,
GIMP_GRADIENT_SEGMENT_SINE,
GIMP_HELP_GRADIENT_EDITOR_BLENDING },
{ "gradient-editor-blending-sphere-increasing", NULL,
- N_("Spherical (i_ncreasing)"), NULL, NULL,
+ NC_("gradient-editor-blending", "Spherical (i_ncreasing)"), NULL, NULL,
GIMP_GRADIENT_SEGMENT_SPHERE_INCREASING,
GIMP_HELP_GRADIENT_EDITOR_BLENDING },
{ "gradient-editor-blending-sphere-decreasing", NULL,
- N_("Spherical (_decreasing)"), NULL, NULL,
+ NC_("gradient-editor-blending", "Spherical (_decreasing)"), NULL, NULL,
GIMP_GRADIENT_SEGMENT_SPHERE_DECREASING,
GIMP_HELP_GRADIENT_EDITOR_BLENDING },
{ "gradient-editor-blending-varies", NULL,
- N_("(Varies)"), NULL, NULL,
+ NC_("gradient-editor-blending", "(Varies)"), NULL, NULL,
-1,
GIMP_HELP_GRADIENT_EDITOR_BLENDING }
};
@@ -344,22 +344,22 @@
static const GimpRadioActionEntry gradient_editor_coloring_actions[] =
{
{ "gradient-editor-coloring-rgb", NULL,
- N_("_RGB"), NULL, NULL,
+ NC_("gradient-editor-coloring", "_RGB"), NULL, NULL,
GIMP_GRADIENT_SEGMENT_RGB,
GIMP_HELP_GRADIENT_EDITOR_COLORING },
{ "gradient-editor-coloring-hsv-ccw", NULL,
- N_("HSV (_counter-clockwise hue)"), NULL, NULL,
+ NC_("gradient-editor-coloring", "HSV (_counter-clockwise hue)"), NULL, NULL,
GIMP_GRADIENT_SEGMENT_HSV_CCW,
GIMP_HELP_GRADIENT_EDITOR_COLORING },
{ "gradient-editor-coloring-hsv-cw", NULL,
- N_("HSV (clockwise _hue)"), NULL, NULL,
+ NC_("gradient-editor-coloring", "HSV (clockwise _hue)"), NULL, NULL,
GIMP_GRADIENT_SEGMENT_HSV_CW,
GIMP_HELP_GRADIENT_EDITOR_COLORING },
{ "gradient-editor-coloring-varies", NULL,
- N_("(Varies)"), NULL, NULL,
+ NC_("gradient-editor-coloring", "(Varies)"), NULL, NULL,
-1,
GIMP_HELP_GRADIENT_EDITOR_COLORING }
};
@@ -389,64 +389,64 @@
void
gradient_editor_actions_setup (GimpActionGroup *group)
{
- gimp_action_group_add_actions (group,
+ gimp_action_group_add_actions (group, "gradient-editor-action",
gradient_editor_actions,
G_N_ELEMENTS (gradient_editor_actions));
- gimp_action_group_add_toggle_actions (group,
+ gimp_action_group_add_toggle_actions (group, "gradient-editor-action",
gradient_editor_toggle_actions,
G_N_ELEMENTS (gradient_editor_toggle_actions));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, "gradient-editor-action",
gradient_editor_load_left_actions,
G_N_ELEMENTS (gradient_editor_load_left_actions),
G_CALLBACK (gradient_editor_load_left_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, "gradient-editor-action",
gradient_editor_save_left_actions,
G_N_ELEMENTS (gradient_editor_save_left_actions),
G_CALLBACK (gradient_editor_save_left_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, "gradient-editor-action",
gradient_editor_load_right_actions,
G_N_ELEMENTS (gradient_editor_load_right_actions),
G_CALLBACK (gradient_editor_load_right_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, "gradient-editor-action",
gradient_editor_save_right_actions,
G_N_ELEMENTS (gradient_editor_save_right_actions),
G_CALLBACK (gradient_editor_save_right_cmd_callback));
- gimp_action_group_add_radio_actions (group,
+ gimp_action_group_add_radio_actions (group, "gradient-editor-color-type",
gradient_editor_left_color_type_actions,
G_N_ELEMENTS (gradient_editor_left_color_type_actions),
NULL,
0,
G_CALLBACK (gradient_editor_left_color_type_cmd_callback));
- gimp_action_group_add_radio_actions (group,
+ gimp_action_group_add_radio_actions (group, "gradient-editor-color-type",
gradient_editor_right_color_type_actions,
G_N_ELEMENTS (gradient_editor_right_color_type_actions),
NULL,
0,
G_CALLBACK (gradient_editor_right_color_type_cmd_callback));
- gimp_action_group_add_radio_actions (group,
+ gimp_action_group_add_radio_actions (group, "gradient-editor-blending",
gradient_editor_blending_actions,
G_N_ELEMENTS (gradient_editor_blending_actions),
NULL,
0,
G_CALLBACK (gradient_editor_blending_func_cmd_callback));
- gimp_action_group_add_radio_actions (group,
+ gimp_action_group_add_radio_actions (group, "gradient-editor-coloring",
gradient_editor_coloring_actions,
G_N_ELEMENTS (gradient_editor_coloring_actions),
NULL,
0,
G_CALLBACK (gradient_editor_coloring_type_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, NULL,
gradient_editor_zoom_actions,
G_N_ELEMENTS (gradient_editor_zoom_actions),
G_CALLBACK (gradient_editor_zoom_cmd_callback));
Modified: trunk/app/actions/gradients-actions.c
==============================================================================
--- trunk/app/actions/gradients-actions.c (original)
+++ trunk/app/actions/gradients-actions.c Wed Dec 3 15:27:42 2008
@@ -41,41 +41,41 @@
static const GimpActionEntry gradients_actions[] =
{
{ "gradients-popup", GIMP_STOCK_GRADIENT,
- N_("Gradients Menu"), NULL, NULL, NULL,
+ NC_("gradients-action", "Gradients Menu"), NULL, NULL, NULL,
GIMP_HELP_GRADIENT_DIALOG },
{ "gradients-new", GTK_STOCK_NEW,
- N_("_New Gradient"), "",
- N_("New gradient"),
+ NC_("gradients-action", "_New Gradient"), "",
+ N_("Create a new gradient"),
G_CALLBACK (data_new_cmd_callback),
GIMP_HELP_GRADIENT_NEW },
{ "gradients-duplicate", GIMP_STOCK_DUPLICATE,
- N_("D_uplicate Gradient"), NULL,
- N_("Duplicate gradient"),
+ NC_("gradients-action", "D_uplicate Gradient"), NULL,
+ N_("Duplicate this gradient"),
G_CALLBACK (data_duplicate_cmd_callback),
GIMP_HELP_GRADIENT_DUPLICATE },
{ "gradients-copy-location", GTK_STOCK_COPY,
- N_("Copy Gradient _Location"), "",
+ NC_("gradients-action", "Copy Gradient _Location"), "",
N_("Copy gradient file location to clipboard"),
G_CALLBACK (data_copy_location_cmd_callback),
GIMP_HELP_GRADIENT_COPY_LOCATION },
{ "gradients-save-as-pov", GTK_STOCK_SAVE_AS,
- N_("Save as _POV-Ray..."), "",
+ NC_("gradients-action", "Save as _POV-Ray..."), "",
N_("Save gradient as POV-Ray"),
G_CALLBACK (gradients_save_as_pov_ray_cmd_callback),
GIMP_HELP_GRADIENT_SAVE_AS_POV },
{ "gradients-delete", GTK_STOCK_DELETE,
- N_("_Delete Gradient"), "",
- N_("Delete gradient"),
+ NC_("gradients-action", "_Delete Gradient"), "",
+ N_("Delete this gradient"),
G_CALLBACK (data_delete_cmd_callback),
GIMP_HELP_GRADIENT_DELETE },
{ "gradients-refresh", GTK_STOCK_REFRESH,
- N_("_Refresh Gradients"), "",
+ NC_("gradients-action", "_Refresh Gradients"), "",
N_("Refresh gradients"),
G_CALLBACK (data_refresh_cmd_callback),
GIMP_HELP_GRADIENT_REFRESH }
@@ -84,7 +84,7 @@
static const GimpStringActionEntry gradients_edit_actions[] =
{
{ "gradients-edit", GTK_STOCK_EDIT,
- N_("_Edit Gradient..."), NULL,
+ NC_("gradients-action", "_Edit Gradient..."), NULL,
N_("Edit gradient"),
"gimp-gradient-editor",
GIMP_HELP_GRADIENT_EDIT }
@@ -94,11 +94,11 @@
void
gradients_actions_setup (GimpActionGroup *group)
{
- gimp_action_group_add_actions (group,
+ gimp_action_group_add_actions (group, "gradients-action",
gradients_actions,
G_N_ELEMENTS (gradients_actions));
- gimp_action_group_add_string_actions (group,
+ gimp_action_group_add_string_actions (group, "gradients-action",
gradients_edit_actions,
G_N_ELEMENTS (gradients_edit_actions),
G_CALLBACK (data_edit_cmd_callback));
Modified: trunk/app/actions/help-actions.c
==============================================================================
--- trunk/app/actions/help-actions.c (original)
+++ trunk/app/actions/help-actions.c Wed Dec 3 15:27:42 2008
@@ -35,16 +35,16 @@
static const GimpActionEntry help_actions[] =
{
- { "help-menu", NULL, N_("_Help") },
+ { "help-menu", NULL, NC_("help-action", "_Help") },
{ "help-help", GTK_STOCK_HELP,
- N_("_Help"), "F1",
+ NC_("help-action", "_Help"), "F1",
N_("Open the GIMP user manual"),
G_CALLBACK (help_help_cmd_callback),
GIMP_HELP_HELP },
{ "help-context-help", GTK_STOCK_HELP,
- N_("_Context Help"), "<shift>F1",
+ NC_("help-action", "_Context Help"), "<shift>F1",
N_("Show the help for a specific user interface item"),
G_CALLBACK (help_context_help_cmd_callback),
GIMP_HELP_HELP_CONTEXT }
@@ -54,7 +54,7 @@
void
help_actions_setup (GimpActionGroup *group)
{
- gimp_action_group_add_actions (group,
+ gimp_action_group_add_actions (group, "help-action",
help_actions,
G_N_ELEMENTS (help_actions));
}
Modified: trunk/app/actions/image-actions.c
==============================================================================
--- trunk/app/actions/image-actions.c (original)
+++ trunk/app/actions/image-actions.c Wed Dec 3 15:27:42 2008
@@ -45,92 +45,92 @@
static const GimpActionEntry image_actions[] =
{
{ "image-menubar", NULL,
- N_("Image Menu"), NULL, NULL, NULL,
+ NC_("image-action", "Image Menu"), NULL, NULL, NULL,
GIMP_HELP_IMAGE_WINDOW },
{ "image-popup", NULL,
- N_("Image Menu"), NULL, NULL, NULL,
+ NC_("image-action", "Image Menu"), NULL, NULL, NULL,
GIMP_HELP_IMAGE_WINDOW },
- { "image-menu", NULL, N_("_Image") },
- { "image-mode-menu", NULL, N_("_Mode") },
- { "image-transform-menu", NULL, N_("_Transform") },
- { "image-guides-menu", NULL, N_("_Guides") },
-
- { "colors-menu", NULL, N_("_Colors") },
- { "colors-info-menu", NULL, N_("I_nfo") },
- { "colors-auto-menu", NULL, N_("_Auto") },
- { "colors-map-menu", NULL, N_("_Map") },
- { "colors-components-menu", NULL, N_("C_omponents") },
+ { "image-menu", NULL, NC_("image-action", "_Image") },
+ { "image-mode-menu", NULL, NC_("image-action", "_Mode") },
+ { "image-transform-menu", NULL, NC_("image-action", "_Transform") },
+ { "image-guides-menu", NULL, NC_("image-action", "_Guides") },
+
+ { "colors-menu", NULL, NC_("image-action", "_Colors") },
+ { "colors-info-menu", NULL, NC_("image-action", "I_nfo") },
+ { "colors-auto-menu", NULL, NC_("image-action", "_Auto") },
+ { "colors-map-menu", NULL, NC_("image-action", "_Map") },
+ { "colors-components-menu", NULL, NC_("image-action", "C_omponents") },
{ "image-new", GTK_STOCK_NEW,
- N_("_New..."), "<control>N",
+ NC_("image-action", "_New..."), "<control>N",
N_("Create a new image"),
G_CALLBACK (image_new_cmd_callback),
GIMP_HELP_FILE_NEW },
{ "image-resize", GIMP_STOCK_RESIZE,
- N_("Can_vas Size..."), NULL,
+ NC_("image-action", "Can_vas Size..."), NULL,
N_("Adjust the image dimensions"),
G_CALLBACK (image_resize_cmd_callback),
GIMP_HELP_IMAGE_RESIZE },
{ "image-resize-to-layers", NULL,
- N_("F_it Canvas to Layers"), NULL,
+ NC_("image-action", "F_it Canvas to Layers"), NULL,
N_("Resize the image to enclose all layers"),
G_CALLBACK (image_resize_to_layers_cmd_callback),
GIMP_HELP_IMAGE_RESIZE_TO_LAYERS },
{ "image-resize-to-selection", NULL,
- N_("F_it Canvas to Selection"), NULL,
+ NC_("image-action", "F_it Canvas to Selection"), NULL,
N_("Resize the image to the extents of the selection"),
G_CALLBACK (image_resize_to_selection_cmd_callback),
GIMP_HELP_IMAGE_RESIZE_TO_SELECTION },
{ "image-print-size", GIMP_STOCK_PRINT_RESOLUTION,
- N_("_Print Size..."), NULL,
+ NC_("image-action", "_Print Size..."), NULL,
N_("Adjust the print resolution"),
G_CALLBACK (image_print_size_cmd_callback),
GIMP_HELP_IMAGE_PRINT_SIZE },
{ "image-scale", GIMP_STOCK_SCALE,
- N_("_Scale Image..."), NULL,
+ NC_("image-action", "_Scale Image..."), NULL,
N_("Change the size of the image content"),
G_CALLBACK (image_scale_cmd_callback),
GIMP_HELP_IMAGE_SCALE },
{ "image-crop", GIMP_STOCK_TOOL_CROP,
- N_("_Crop to Selection"), NULL,
+ NC_("image-action", "_Crop to Selection"), NULL,
N_("Crop the image to the extents of the selection"),
G_CALLBACK (image_crop_cmd_callback),
GIMP_HELP_IMAGE_CROP },
{ "image-duplicate", GIMP_STOCK_DUPLICATE,
- N_("_Duplicate"), "<control>D",
+ NC_("image-action", "_Duplicate"), "<control>D",
N_("Create a duplicate of this image"),
G_CALLBACK (image_duplicate_cmd_callback),
GIMP_HELP_IMAGE_DUPLICATE },
{ "image-merge-layers", NULL,
- N_("Merge Visible _Layers..."), "<control>M",
+ NC_("image-action", "Merge Visible _Layers..."), "<control>M",
N_("Merge all visible layers into one layer"),
G_CALLBACK (image_merge_layers_cmd_callback),
GIMP_HELP_IMAGE_MERGE_LAYERS },
{ "image-flatten", NULL,
- N_("_Flatten Image"), NULL,
+ NC_("image-action", "_Flatten Image"), NULL,
N_("Merge all layers into one and remove transparency"),
G_CALLBACK (image_flatten_image_cmd_callback),
GIMP_HELP_IMAGE_FLATTEN },
{ "image-configure-grid", GIMP_STOCK_GRID,
- N_("Configure G_rid..."), NULL,
+ NC_("image-action", "Configure G_rid..."), NULL,
N_("Configure the grid for this image"),
G_CALLBACK (image_configure_grid_cmd_callback),
GIMP_HELP_IMAGE_GRID },
{ "image-properties", GTK_STOCK_INFO,
- N_("Image Pr_operties"), "<alt>Return",
+ NC_("image-action", "Image Pr_operties"), "<alt>Return",
N_("Display information about this image"),
G_CALLBACK (image_properties_cmd_callback),
GIMP_HELP_IMAGE_PROPERTIES }
@@ -139,17 +139,17 @@
static const GimpRadioActionEntry image_convert_actions[] =
{
{ "image-convert-rgb", GIMP_STOCK_CONVERT_RGB,
- N_("_RGB"), NULL,
+ NC_("image-convert-action", "_RGB"), NULL,
N_("Convert the image to the RGB colorspace"),
GIMP_RGB, GIMP_HELP_IMAGE_CONVERT_RGB },
{ "image-convert-grayscale", GIMP_STOCK_CONVERT_GRAYSCALE,
- N_("_Grayscale"), NULL,
+ NC_("image-convert-action", "_Grayscale"), NULL,
N_("Convert the image to grayscale"),
GIMP_GRAY, GIMP_HELP_IMAGE_CONVERT_GRAYSCALE },
{ "image-convert-indexed", GIMP_STOCK_CONVERT_INDEXED,
- N_("_Indexed..."), NULL,
+ NC_("image-convert-action", "_Indexed..."), NULL,
N_("Convert the image to indexed colors"),
GIMP_INDEXED, GIMP_HELP_IMAGE_CONVERT_INDEXED }
};
@@ -157,13 +157,13 @@
static const GimpEnumActionEntry image_flip_actions[] =
{
{ "image-flip-horizontal", GIMP_STOCK_FLIP_HORIZONTAL,
- N_("Flip _Horizontally"), NULL,
+ NC_("image-action", "Flip _Horizontally"), NULL,
N_("Flip image horizontally"),
GIMP_ORIENTATION_HORIZONTAL, FALSE,
GIMP_HELP_IMAGE_FLIP_HORIZONTAL },
{ "image-flip-vertical", GIMP_STOCK_FLIP_VERTICAL,
- N_("Flip _Vertically"), NULL,
+ NC_("image-action", "Flip _Vertically"), NULL,
N_("Flip image vertically"),
GIMP_ORIENTATION_VERTICAL, FALSE,
GIMP_HELP_IMAGE_FLIP_VERTICAL }
@@ -172,19 +172,19 @@
static const GimpEnumActionEntry image_rotate_actions[] =
{
{ "image-rotate-90", GIMP_STOCK_ROTATE_90,
- N_("Rotate 90Â _clockwise"), NULL,
+ NC_("image-action", "Rotate 90Â _clockwise"), NULL,
N_("Rotate the image 90 degrees to the right"),
GIMP_ROTATE_90, FALSE,
GIMP_HELP_IMAGE_ROTATE_90 },
{ "image-rotate-180", GIMP_STOCK_ROTATE_180,
- N_("Rotate _180Â"), NULL,
+ NC_("image-action", "Rotate _180Â"), NULL,
N_("Turn the image upside-down"),
GIMP_ROTATE_180, FALSE,
GIMP_HELP_IMAGE_ROTATE_180 },
{ "image-rotate-270", GIMP_STOCK_ROTATE_270,
- N_("Rotate 90Â counter-clock_wise"), NULL,
+ NC_("image-action", "Rotate 90Â counter-clock_wise"), NULL,
N_("Rotate the image 90 degrees to the left"),
GIMP_ROTATE_270, FALSE,
GIMP_HELP_IMAGE_ROTATE_270 }
@@ -194,22 +194,22 @@
void
image_actions_setup (GimpActionGroup *group)
{
- gimp_action_group_add_actions (group,
+ gimp_action_group_add_actions (group, "image-action",
image_actions,
G_N_ELEMENTS (image_actions));
- gimp_action_group_add_radio_actions (group,
+ gimp_action_group_add_radio_actions (group, "image-convert-action",
image_convert_actions,
G_N_ELEMENTS (image_convert_actions),
NULL, 0,
G_CALLBACK (image_convert_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, "image-action",
image_flip_actions,
G_N_ELEMENTS (image_flip_actions),
G_CALLBACK (image_flip_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, "image-action",
image_rotate_actions,
G_N_ELEMENTS (image_rotate_actions),
G_CALLBACK (image_rotate_cmd_callback));
Modified: trunk/app/actions/images-actions.c
==============================================================================
--- trunk/app/actions/images-actions.c (original)
+++ trunk/app/actions/images-actions.c Wed Dec 3 15:27:42 2008
@@ -41,23 +41,23 @@
static const GimpActionEntry images_actions[] =
{
{ "images-popup", GIMP_STOCK_IMAGES,
- N_("Images Menu"), NULL, NULL, NULL,
+ NC_("images-action", "Images Menu"), NULL, NULL, NULL,
GIMP_HELP_IMAGE_DIALOG },
{ "images-raise-views", GTK_STOCK_GOTO_TOP,
- N_("_Raise Views"), "",
+ NC_("images-action", "_Raise Views"), "",
N_("Raise this image's displays"),
G_CALLBACK (images_raise_views_cmd_callback),
NULL },
{ "images-new-view", GTK_STOCK_NEW,
- N_("_New View"), "",
+ NC_("images-action", "_New View"), "",
N_("Create a new display for this image"),
G_CALLBACK (images_new_view_cmd_callback),
NULL },
{ "images-delete", GTK_STOCK_DELETE,
- N_("_Delete Image"), "",
+ NC_("images-action", "_Delete Image"), "",
N_("Delete this image"),
G_CALLBACK (images_delete_image_cmd_callback),
NULL }
@@ -68,7 +68,7 @@
images_actions_setup (GimpActionGroup *group)
{
gimp_action_group_add_actions (group,
- images_actions,
+ images_actions, "images-action",
G_N_ELEMENTS (images_actions));
}
Modified: trunk/app/actions/layers-actions.c
==============================================================================
--- trunk/app/actions/layers-actions.c (original)
+++ trunk/app/actions/layers-actions.c Wed Dec 3 15:27:42 2008
@@ -45,165 +45,165 @@
static const GimpActionEntry layers_actions[] =
{
{ "layers-popup", GIMP_STOCK_LAYERS,
- N_("Layers Menu"), NULL, NULL, NULL,
+ NC_("layers-action", "Layers Menu"), NULL, NULL, NULL,
GIMP_HELP_LAYER_DIALOG },
- { "layers-menu", NULL, N_("_Layer") },
- { "layers-stack-menu", NULL, N_("Stac_k") },
- { "layers-text-to-selection-menu", GIMP_STOCK_TOOL_TEXT, N_("Te_xt to Selection") },
- { "layers-mask-menu", NULL, N_("_Mask") },
- { "layers-transparency-menu", NULL, N_("Tr_ansparency") },
- { "layers-transform-menu", NULL, N_("_Transform") },
- { "layers-properties-menu", GTK_STOCK_PROPERTIES, N_("_Properties") },
- { "layers-opacity-menu", GIMP_STOCK_TRANSPARENCY, N_("_Opacity") },
- { "layers-mode-menu", GIMP_STOCK_TOOL_PENCIL, N_("Layer _Mode") },
+ { "layers-menu", NULL, NC_("layers-action", "_Layer") },
+ { "layers-stack-menu", NULL, NC_("layers-action", "Stac_k") },
+ { "layers-text-to-selection-menu", GIMP_STOCK_TOOL_TEXT, NC_("layers-action", "Te_xt to Selection") },
+ { "layers-mask-menu", NULL, NC_("layers-action", "_Mask") },
+ { "layers-transparency-menu", NULL, NC_("layers-action", "Tr_ansparency") },
+ { "layers-transform-menu", NULL, NC_("layers-action", "_Transform") },
+ { "layers-properties-menu", GTK_STOCK_PROPERTIES, NC_("layers-action", "_Properties") },
+ { "layers-opacity-menu", GIMP_STOCK_TRANSPARENCY, NC_("layers-action", "_Opacity") },
+ { "layers-mode-menu", GIMP_STOCK_TOOL_PENCIL, NC_("layers-action", "Layer _Mode") },
{ "layers-text-tool", GIMP_STOCK_TOOL_TEXT,
- N_("Te_xt Tool"), NULL,
+ NC_("layers-action", "Te_xt Tool"), NULL,
N_("Activate the text tool on this text layer"),
G_CALLBACK (layers_text_tool_cmd_callback),
GIMP_HELP_TOOL_TEXT },
{ "layers-edit-attributes", GTK_STOCK_EDIT,
- N_("_Edit Layer Attributes..."), NULL,
+ NC_("layers-action", "_Edit Layer Attributes..."), NULL,
N_("Edit the layer's name"),
G_CALLBACK (layers_edit_attributes_cmd_callback),
GIMP_HELP_LAYER_EDIT },
{ "layers-new", GTK_STOCK_NEW,
- N_("_New Layer..."), "<control><shift>N",
+ NC_("layers-action", "_New Layer..."), "<control><shift>N",
N_("Create a new layer and add it to the image"),
G_CALLBACK (layers_new_cmd_callback),
GIMP_HELP_LAYER_NEW },
{ "layers-new-last-values", GTK_STOCK_NEW,
- N_("_New Layer"), "",
+ NC_("layers-action", "_New Layer"), "",
N_("Create a new layer with last used values"),
G_CALLBACK (layers_new_last_vals_cmd_callback),
GIMP_HELP_LAYER_NEW },
{ "layers-new-from-visible", NULL,
- N_("New from _Visible"), NULL,
+ NC_("layers-action", "New from _Visible"), NULL,
N_("Create a new layer from what is visible in this image"),
G_CALLBACK (layers_new_from_visible_cmd_callback),
GIMP_HELP_LAYER_NEW_FROM_VISIBLE },
{ "layers-duplicate", GIMP_STOCK_DUPLICATE,
- N_("D_uplicate Layer"), "<control><shift>D",
+ NC_("layers-action", "D_uplicate Layer"), "<control><shift>D",
N_("Create a duplicate of the layer and add it to the image"),
G_CALLBACK (layers_duplicate_cmd_callback),
GIMP_HELP_LAYER_DUPLICATE },
{ "layers-delete", GTK_STOCK_DELETE,
- N_("_Delete Layer"), "",
+ NC_("layers-action", "_Delete Layer"), "",
N_("Delete this layer"),
G_CALLBACK (layers_delete_cmd_callback),
GIMP_HELP_LAYER_DELETE },
{ "layers-raise", GTK_STOCK_GO_UP,
- N_("_Raise Layer"), "",
+ NC_("layers-action", "_Raise Layer"), "",
N_("Raise this layer one step in the layer stack"),
G_CALLBACK (layers_raise_cmd_callback),
GIMP_HELP_LAYER_RAISE },
{ "layers-raise-to-top", GTK_STOCK_GOTO_TOP,
- N_("Layer to _Top"), "",
+ NC_("layers-action", "Layer to _Top"), "",
N_("Move this layer to the top of the layer stack"),
G_CALLBACK (layers_raise_to_top_cmd_callback),
GIMP_HELP_LAYER_RAISE_TO_TOP },
{ "layers-lower", GTK_STOCK_GO_DOWN,
- N_("_Lower Layer"), "",
+ NC_("layers-action", "_Lower Layer"), "",
N_("Lower this layer one step in the layer stack"),
G_CALLBACK (layers_lower_cmd_callback),
GIMP_HELP_LAYER_LOWER },
{ "layers-lower-to-bottom", GTK_STOCK_GOTO_BOTTOM,
- N_("Layer to _Bottom"), "",
+ NC_("layers-action", "Layer to _Bottom"), "",
N_("Move this layer to the bottom of the layer stack"),
G_CALLBACK (layers_lower_to_bottom_cmd_callback),
GIMP_HELP_LAYER_LOWER_TO_BOTTOM },
{ "layers-anchor", GIMP_STOCK_ANCHOR,
- N_("_Anchor Layer"), "<control>H",
+ NC_("layers-action", "_Anchor Layer"), "<control>H",
N_("Anchor the floating layer"),
G_CALLBACK (layers_anchor_cmd_callback),
GIMP_HELP_LAYER_ANCHOR },
{ "layers-merge-down", GIMP_STOCK_MERGE_DOWN,
- N_("Merge Do_wn"), NULL,
+ NC_("layers-action", "Merge Do_wn"), NULL,
N_("Merge this layer with the one below it"),
G_CALLBACK (layers_merge_down_cmd_callback),
GIMP_HELP_LAYER_MERGE_DOWN },
{ "layers-merge-layers", NULL,
- N_("Merge _Visible Layers..."), NULL,
+ NC_("layers-action", "Merge _Visible Layers..."), NULL,
N_("Merge all visible layers into one layer"),
G_CALLBACK (image_merge_layers_cmd_callback),
GIMP_HELP_IMAGE_MERGE_LAYERS },
{ "layers-flatten-image", NULL,
- N_("_Flatten Image"), NULL,
+ NC_("layers-action", "_Flatten Image"), NULL,
N_("Merge all layers into one and remove transparency"),
G_CALLBACK (image_flatten_image_cmd_callback),
GIMP_HELP_IMAGE_FLATTEN },
{ "layers-text-discard", GIMP_STOCK_TOOL_TEXT,
- N_("_Discard Text Information"), NULL,
+ NC_("layers-action", "_Discard Text Information"), NULL,
N_("Turn this text layer into a normal layer"),
G_CALLBACK (layers_text_discard_cmd_callback),
GIMP_HELP_LAYER_TEXT_DISCARD },
{ "layers-text-to-vectors", GIMP_STOCK_TOOL_TEXT,
- N_("Text to _Path"), NULL,
+ NC_("layers-action", "Text to _Path"), NULL,
N_("Create a path from this text layer"),
G_CALLBACK (layers_text_to_vectors_cmd_callback),
GIMP_HELP_LAYER_TEXT_TO_PATH },
{ "layers-text-along-vectors", GIMP_STOCK_TOOL_TEXT,
- N_("Text alon_g Path"), NULL,
+ NC_("layers-action", "Text alon_g Path"), NULL,
N_("Warp this layer's text along the current path"),
G_CALLBACK (layers_text_along_vectors_cmd_callback),
GIMP_HELP_LAYER_TEXT_ALONG_PATH },
{ "layers-resize", GIMP_STOCK_RESIZE,
- N_("Layer B_oundary Size..."), NULL,
+ NC_("layers-action", "Layer B_oundary Size..."), NULL,
N_("Adjust the layer dimensions"),
G_CALLBACK (layers_resize_cmd_callback),
GIMP_HELP_LAYER_RESIZE },
{ "layers-resize-to-image", GIMP_STOCK_LAYER_TO_IMAGESIZE,
- N_("Layer to _Image Size"), NULL,
+ NC_("layers-action", "Layer to _Image Size"), NULL,
N_("Resize the layer to the size of the image"),
G_CALLBACK (layers_resize_to_image_cmd_callback),
GIMP_HELP_LAYER_RESIZE_TO_IMAGE },
{ "layers-scale", GIMP_STOCK_SCALE,
- N_("_Scale Layer..."), NULL,
+ NC_("layers-action", "_Scale Layer..."), NULL,
N_("Change the size of the layer content"),
G_CALLBACK (layers_scale_cmd_callback),
GIMP_HELP_LAYER_SCALE },
{ "layers-crop", GIMP_STOCK_TOOL_CROP,
- N_("_Crop to Selection"), NULL,
+ NC_("layers-action", "_Crop to Selection"), NULL,
N_("Crop the layer to the extents of the selection"),
G_CALLBACK (layers_crop_cmd_callback),
GIMP_HELP_LAYER_CROP },
{ "layers-mask-add", GIMP_STOCK_LAYER_MASK,
- N_("Add La_yer Mask..."), NULL,
+ NC_("layers-action", "Add La_yer Mask..."), NULL,
N_("Add a mask that allows non-destructive editing of transparency"),
G_CALLBACK (layers_mask_add_cmd_callback),
GIMP_HELP_LAYER_MASK_ADD },
{ "layers-alpha-add", GIMP_STOCK_TRANSPARENCY,
- N_("Add Alpha C_hannel"), NULL,
+ NC_("layers-action", "Add Alpha C_hannel"), NULL,
N_("Add transparency information to the layer"),
G_CALLBACK (layers_alpha_add_cmd_callback),
GIMP_HELP_LAYER_ALPHA_ADD },
{ "layers-alpha-remove", NULL,
- N_("_Remove Alpha Channel"), NULL,
+ NC_("layers-action", "_Remove Alpha Channel"), NULL,
N_("Remove transparency information from the layer"),
G_CALLBACK (layers_alpha_remove_cmd_callback),
GIMP_HELP_LAYER_ALPHA_REMOVE }
@@ -212,27 +212,27 @@
static const GimpToggleActionEntry layers_toggle_actions[] =
{
{ "layers-lock-alpha", GIMP_STOCK_TRANSPARENCY,
- N_("Lock Alph_a Channel"), NULL,
+ NC_("layers-action", "Lock Alph_a Channel"), NULL,
N_("Keep transparency information on this layer from being modified"),
G_CALLBACK (layers_lock_alpha_cmd_callback),
FALSE,
GIMP_HELP_LAYER_LOCK_ALPHA },
{ "layers-mask-edit", GTK_STOCK_EDIT,
- N_("_Edit Layer Mask"), NULL,
+ NC_("layers-action", "_Edit Layer Mask"), NULL,
N_("Work on the layer mask"),
G_CALLBACK (layers_mask_edit_cmd_callback),
FALSE,
GIMP_HELP_LAYER_MASK_EDIT },
{ "layers-mask-show", GIMP_STOCK_VISIBLE,
- N_("S_how Layer Mask"), NULL, NULL,
+ NC_("layers-action", "S_how Layer Mask"), NULL, NULL,
G_CALLBACK (layers_mask_show_cmd_callback),
FALSE,
GIMP_HELP_LAYER_MASK_SHOW },
{ "layers-mask-disable", NULL,
- N_("_Disable Layer Mask"), NULL,
+ NC_("layers-action", "_Disable Layer Mask"), NULL,
N_("Dismiss the effect of the layer mask"),
G_CALLBACK (layers_mask_disable_cmd_callback),
FALSE,
@@ -242,13 +242,13 @@
static const GimpEnumActionEntry layers_mask_apply_actions[] =
{
{ "layers-mask-apply", NULL,
- N_("Apply Layer _Mask"), NULL,
+ NC_("layers-action", "Apply Layer _Mask"), NULL,
N_("Apply the effect of the layer mask and remove it"),
GIMP_MASK_APPLY, FALSE,
GIMP_HELP_LAYER_MASK_APPLY },
{ "layers-mask-delete", GTK_STOCK_DELETE,
- N_("Delete Layer Mas_k"), "",
+ NC_("layers-action", "Delete Layer Mas_k"), "",
N_("Remove the layer mask and its effect"),
GIMP_MASK_DISCARD, FALSE,
GIMP_HELP_LAYER_MASK_DELETE }
@@ -257,25 +257,25 @@
static const GimpEnumActionEntry layers_mask_to_selection_actions[] =
{
{ "layers-mask-selection-replace", GIMP_STOCK_SELECTION_REPLACE,
- N_("_Mask to Selection"), NULL,
+ NC_("layers-action", "_Mask to Selection"), NULL,
N_("Replace the selection with the layer mask"),
GIMP_CHANNEL_OP_REPLACE, FALSE,
GIMP_HELP_LAYER_MASK_SELECTION_REPLACE },
{ "layers-mask-selection-add", GIMP_STOCK_SELECTION_ADD,
- N_("_Add to Selection"), NULL,
+ NC_("layers-action", "_Add to Selection"), NULL,
N_("Add the layer mask to the current selection"),
GIMP_CHANNEL_OP_ADD, FALSE,
GIMP_HELP_LAYER_MASK_SELECTION_ADD },
{ "layers-mask-selection-subtract", GIMP_STOCK_SELECTION_SUBTRACT,
- N_("_Subtract from Selection"), NULL,
+ NC_("layers-action", "_Subtract from Selection"), NULL,
N_("Subtract the layer mask from the current selection"),
GIMP_CHANNEL_OP_SUBTRACT, FALSE,
GIMP_HELP_LAYER_MASK_SELECTION_SUBTRACT },
{ "layers-mask-selection-intersect", GIMP_STOCK_SELECTION_INTERSECT,
- N_("_Intersect with Selection"), NULL,
+ NC_("layers-action", "_Intersect with Selection"), NULL,
N_("Intersect the layer mask with the current selection"),
GIMP_CHANNEL_OP_INTERSECT, FALSE,
GIMP_HELP_LAYER_MASK_SELECTION_INTERSECT }
@@ -284,25 +284,25 @@
static const GimpEnumActionEntry layers_alpha_to_selection_actions[] =
{
{ "layers-alpha-selection-replace", GIMP_STOCK_SELECTION_REPLACE,
- N_("Al_pha to Selection"), NULL,
+ NC_("layers-action", "Al_pha to Selection"), NULL,
N_("Replace the selection with the layer's alpha channel"),
GIMP_CHANNEL_OP_REPLACE, FALSE,
GIMP_HELP_LAYER_ALPHA_SELECTION_REPLACE },
{ "layers-alpha-selection-add", GIMP_STOCK_SELECTION_ADD,
- N_("A_dd to Selection"), NULL,
+ NC_("layers-action", "A_dd to Selection"), NULL,
N_("Add the layer's alpha channel to the current selection"),
GIMP_CHANNEL_OP_ADD, FALSE,
GIMP_HELP_LAYER_ALPHA_SELECTION_ADD },
{ "layers-alpha-selection-subtract", GIMP_STOCK_SELECTION_SUBTRACT,
- N_("_Subtract from Selection"), NULL,
+ NC_("layers-action", "_Subtract from Selection"), NULL,
N_("Subtract the layer's alpha channel from the current selection"),
GIMP_CHANNEL_OP_SUBTRACT, FALSE,
GIMP_HELP_LAYER_ALPHA_SELECTION_SUBTRACT },
{ "layers-alpha-selection-intersect", GIMP_STOCK_SELECTION_INTERSECT,
- N_("_Intersect with Selection"), NULL,
+ NC_("layers-action", "_Intersect with Selection"), NULL,
N_("Intersect the layer's alpha channel with the current selection"),
GIMP_CHANNEL_OP_INTERSECT, FALSE,
GIMP_HELP_LAYER_ALPHA_SELECTION_INTERSECT }
@@ -311,25 +311,25 @@
static const GimpEnumActionEntry layers_text_to_selection_actions[] =
{
{ "layers-text-selection-replace", GIMP_STOCK_SELECTION_REPLACE,
- N_("_Text to Selection"), NULL,
+ NC_("layers-action", "_Text to Selection"), NULL,
N_("Replace the selection with the text layer's outline"),
GIMP_CHANNEL_OP_REPLACE, FALSE,
GIMP_HELP_LAYER_TEXT_SELECTION_REPLACE },
{ "layers-text-selection-add", GIMP_STOCK_SELECTION_ADD,
- N_("A_dd to Selection"), NULL,
+ NC_("layers-action", "A_dd to Selection"), NULL,
N_("Add the text layer's outline to the current selection"),
GIMP_CHANNEL_OP_ADD, FALSE,
GIMP_HELP_LAYER_TEXT_SELECTION_ADD },
{ "layers-text-selection-subtract", GIMP_STOCK_SELECTION_SUBTRACT,
- N_("_Subtract from Selection"), NULL,
+ NC_("layers-action", "_Subtract from Selection"), NULL,
N_("Subtract the text layer's outline from the current selection"),
GIMP_CHANNEL_OP_SUBTRACT, FALSE,
GIMP_HELP_LAYER_TEXT_SELECTION_SUBTRACT },
{ "layers-text-selection-intersect", GIMP_STOCK_SELECTION_INTERSECT,
- N_("_Intersect with Selection"), NULL,
+ NC_("layers-action", "_Intersect with Selection"), NULL,
N_("Intersect the text layer's outline with the current selection"),
GIMP_CHANNEL_OP_INTERSECT, FALSE,
GIMP_HELP_LAYER_TEXT_SELECTION_INTERSECT }
@@ -338,25 +338,25 @@
static const GimpEnumActionEntry layers_select_actions[] =
{
{ "layers-select-top", NULL,
- N_("Select _Top Layer"), "Home",
+ NC_("layers-action", "Select _Top Layer"), "Home",
N_("Select the topmost layer"),
GIMP_ACTION_SELECT_FIRST, FALSE,
GIMP_HELP_LAYER_TOP },
{ "layers-select-bottom", NULL,
- N_("Select _Bottom Layer"), "End",
+ NC_("layers-action", "Select _Bottom Layer"), "End",
N_("Select the bottommost layer"),
GIMP_ACTION_SELECT_LAST, FALSE,
GIMP_HELP_LAYER_BOTTOM },
{ "layers-select-previous", NULL,
- N_("Select _Previous Layer"), "Prior",
+ NC_("layers-action", "Select _Previous Layer"), "Prior",
N_("Select the layer above the current layer"),
GIMP_ACTION_SELECT_PREVIOUS, FALSE,
GIMP_HELP_LAYER_PREVIOUS },
{ "layers-select-next", NULL,
- N_("Select _Next Layer"), "Next",
+ NC_("layers-action", "Select _Next Layer"), "Next",
N_("Select the layer below the current layer"),
GIMP_ACTION_SELECT_NEXT, FALSE,
GIMP_HELP_LAYER_NEXT }
@@ -365,7 +365,7 @@
static const GimpEnumActionEntry layers_opacity_actions[] =
{
{ "layers-opacity-set", GIMP_STOCK_TRANSPARENCY,
- N_("Set Opacity"), NULL, NULL,
+ "Set Opacity", NULL, NULL,
GIMP_ACTION_SELECT_SET, TRUE,
GIMP_HELP_LAYER_OPACITY },
{ "layers-opacity-transparent", GIMP_STOCK_TRANSPARENCY,
@@ -418,45 +418,45 @@
void
layers_actions_setup (GimpActionGroup *group)
{
- gimp_action_group_add_actions (group,
+ gimp_action_group_add_actions (group, "layers-action",
layers_actions,
G_N_ELEMENTS (layers_actions));
- gimp_action_group_add_toggle_actions (group,
+ gimp_action_group_add_toggle_actions (group, "layers-action",
layers_toggle_actions,
G_N_ELEMENTS (layers_toggle_actions));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, "layers-action",
layers_mask_apply_actions,
G_N_ELEMENTS (layers_mask_apply_actions),
G_CALLBACK (layers_mask_apply_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, "layers-action",
layers_mask_to_selection_actions,
G_N_ELEMENTS (layers_mask_to_selection_actions),
G_CALLBACK (layers_mask_to_selection_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, "layers-action",
layers_alpha_to_selection_actions,
G_N_ELEMENTS (layers_alpha_to_selection_actions),
G_CALLBACK (layers_alpha_to_selection_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, "layers-action",
layers_text_to_selection_actions,
G_N_ELEMENTS (layers_alpha_to_selection_actions),
G_CALLBACK (layers_alpha_to_selection_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, "layers-action",
layers_select_actions,
G_N_ELEMENTS (layers_select_actions),
G_CALLBACK (layers_select_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, NULL,
layers_opacity_actions,
G_N_ELEMENTS (layers_opacity_actions),
G_CALLBACK (layers_opacity_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, NULL,
layers_mode_actions,
G_N_ELEMENTS (layers_mode_actions),
G_CALLBACK (layers_mode_cmd_callback));
Modified: trunk/app/actions/palette-editor-actions.c
==============================================================================
--- trunk/app/actions/palette-editor-actions.c (original)
+++ trunk/app/actions/palette-editor-actions.c Wed Dec 3 15:27:42 2008
@@ -41,18 +41,18 @@
static const GimpActionEntry palette_editor_actions[] =
{
{ "palette-editor-popup", GIMP_STOCK_PALETTE,
- N_("Palette Editor Menu"), NULL, NULL, NULL,
+ NC_("palette-editor-action", "Palette Editor Menu"), NULL, NULL, NULL,
GIMP_HELP_PALETTE_EDITOR_DIALOG },
{ "palette-editor-edit-color", GTK_STOCK_EDIT,
- N_("_Edit Color..."), "",
- N_("Edit color"),
+ NC_("palette-editor-action", "_Edit Color..."), "",
+ N_("Edit this color"),
G_CALLBACK (palette_editor_edit_color_cmd_callback),
GIMP_HELP_PALETTE_EDITOR_EDIT },
{ "palette-editor-delete-color", GTK_STOCK_DELETE,
- N_("_Delete Color"), "",
- N_("Delete color"),
+ NC_("palette-editor-action", "_Delete Color"), "",
+ N_("Delete this color"),
G_CALLBACK (palette_editor_delete_color_cmd_callback),
GIMP_HELP_PALETTE_EDITOR_DELETE }
};
@@ -60,7 +60,7 @@
static const GimpToggleActionEntry palette_editor_toggle_actions[] =
{
{ "palette-editor-edit-active", GIMP_STOCK_LINKED,
- N_("Edit Active Palette"), NULL, NULL,
+ NC_("palette-editor-action", "Edit Active Palette"), NULL, NULL,
G_CALLBACK (data_editor_edit_active_cmd_callback),
FALSE,
GIMP_HELP_PALETTE_EDITOR_EDIT_ACTIVE }
@@ -69,13 +69,13 @@
static const GimpEnumActionEntry palette_editor_new_actions[] =
{
{ "palette-editor-new-color-fg", GTK_STOCK_NEW,
- N_("New Color from _FG"), "",
+ NC_("palette-editor-action", "New Color from _FG"), "",
N_("New color from foreground color"),
FALSE, FALSE,
GIMP_HELP_PALETTE_EDITOR_NEW },
{ "palette-editor-new-color-bg", GTK_STOCK_NEW,
- N_("New Color from _BG"), "",
+ NC_("palette-editor-action", "New Color from _BG"), "",
N_("New color from background color"),
TRUE, FALSE,
GIMP_HELP_PALETTE_EDITOR_NEW }
@@ -106,20 +106,20 @@
void
palette_editor_actions_setup (GimpActionGroup *group)
{
- gimp_action_group_add_actions (group,
+ gimp_action_group_add_actions (group, "palette-editor-action",
palette_editor_actions,
G_N_ELEMENTS (palette_editor_actions));
- gimp_action_group_add_toggle_actions (group,
+ gimp_action_group_add_toggle_actions (group, "palette-editor-action",
palette_editor_toggle_actions,
G_N_ELEMENTS (palette_editor_toggle_actions));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, "palette-editor-action",
palette_editor_new_actions,
G_N_ELEMENTS (palette_editor_new_actions),
G_CALLBACK (palette_editor_new_color_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, NULL,
palette_editor_zoom_actions,
G_N_ELEMENTS (palette_editor_zoom_actions),
G_CALLBACK (palette_editor_zoom_cmd_callback));
Modified: trunk/app/actions/palettes-actions.c
==============================================================================
--- trunk/app/actions/palettes-actions.c (original)
+++ trunk/app/actions/palettes-actions.c Wed Dec 3 15:27:42 2008
@@ -41,47 +41,47 @@
static const GimpActionEntry palettes_actions[] =
{
{ "palettes-popup", GIMP_STOCK_PALETTE,
- N_("Palettes Menu"), NULL, NULL, NULL,
+ NC_("palettes-action", "Palettes Menu"), NULL, NULL, NULL,
GIMP_HELP_PALETTE_DIALOG },
{ "palettes-new", GTK_STOCK_NEW,
- N_("_New Palette"), "",
- N_("New palette"),
+ NC_("palettes-action", "_New Palette"), "",
+ N_("Create a new palette"),
G_CALLBACK (data_new_cmd_callback),
GIMP_HELP_PALETTE_NEW },
{ "palettes-import", GTK_STOCK_CONVERT,
- N_("_Import Palette..."), "",
+ NC_("palettes-action", "_Import Palette..."), "",
N_("Import palette"),
G_CALLBACK (palettes_import_cmd_callback),
GIMP_HELP_PALETTE_IMPORT },
{ "palettes-duplicate", GIMP_STOCK_DUPLICATE,
- N_("D_uplicate Palette"), NULL,
- N_("Duplicate palette"),
+ NC_("palettes-action", "D_uplicate Palette"), NULL,
+ N_("Duplicate this palette"),
G_CALLBACK (data_duplicate_cmd_callback),
GIMP_HELP_PALETTE_DUPLICATE },
{ "palettes-merge", NULL,
- N_("_Merge Palettes..."), NULL,
+ NC_("palettes-action", "_Merge Palettes..."), NULL,
N_("Merge palettes"),
G_CALLBACK (palettes_merge_cmd_callback),
GIMP_HELP_PALETTE_MERGE },
{ "palettes-copy-location", GTK_STOCK_COPY,
- N_("Copy Palette _Location"), "",
+ NC_("palettes-action", "Copy Palette _Location"), "",
N_("Copy palette file location to clipboard"),
G_CALLBACK (data_copy_location_cmd_callback),
GIMP_HELP_PALETTE_COPY_LOCATION },
{ "palettes-delete", GTK_STOCK_DELETE,
- N_("_Delete Palette"), "",
- N_("Delete palette"),
+ NC_("palettes-action", "_Delete Palette"), "",
+ N_("Delete this palette"),
G_CALLBACK (data_delete_cmd_callback),
GIMP_HELP_PALETTE_DELETE },
{ "palettes-refresh", GTK_STOCK_REFRESH,
- N_("_Refresh Palettes"), "",
+ NC_("palettes-action", "_Refresh Palettes"), "",
N_("Refresh palettes"),
G_CALLBACK (data_refresh_cmd_callback),
GIMP_HELP_PALETTE_REFRESH }
@@ -90,7 +90,7 @@
static const GimpStringActionEntry palettes_edit_actions[] =
{
{ "palettes-edit", GTK_STOCK_EDIT,
- N_("_Edit Palette..."), NULL,
+ NC_("palettes-action", "_Edit Palette..."), NULL,
N_("Edit palette"),
"gimp-palette-editor",
GIMP_HELP_PALETTE_EDIT }
@@ -100,11 +100,11 @@
void
palettes_actions_setup (GimpActionGroup *group)
{
- gimp_action_group_add_actions (group,
+ gimp_action_group_add_actions (group, "palettes-action",
palettes_actions,
G_N_ELEMENTS (palettes_actions));
- gimp_action_group_add_string_actions (group,
+ gimp_action_group_add_string_actions (group, "palettes-action",
palettes_edit_actions,
G_N_ELEMENTS (palettes_edit_actions),
G_CALLBACK (data_edit_cmd_callback));
Modified: trunk/app/actions/patterns-actions.c
==============================================================================
--- trunk/app/actions/patterns-actions.c (original)
+++ trunk/app/actions/patterns-actions.c Wed Dec 3 15:27:42 2008
@@ -40,41 +40,41 @@
static const GimpActionEntry patterns_actions[] =
{
{ "patterns-popup", GIMP_STOCK_PATTERN,
- N_("Patterns Menu"), NULL, NULL, NULL,
+ NC_("patterns-action", "Patterns Menu"), NULL, NULL, NULL,
GIMP_HELP_PATTERN_DIALOG },
{ "patterns-open-as-image", GTK_STOCK_OPEN,
- N_("_Open Pattern as Image"), "",
+ NC_("patterns-action", "_Open Pattern as Image"), "",
N_("Open pattern as image"),
G_CALLBACK (data_open_as_image_cmd_callback),
GIMP_HELP_PATTERN_OPEN_AS_IMAGE },
{ "patterns-new", GTK_STOCK_NEW,
- N_("_New Pattern"), "",
- N_("New pattern"),
+ NC_("patterns-action", "_New Pattern"), "",
+ N_("Create a new pattern"),
G_CALLBACK (data_new_cmd_callback),
GIMP_HELP_PATTERN_NEW },
{ "patterns-duplicate", GIMP_STOCK_DUPLICATE,
- N_("D_uplicate Pattern"), NULL,
- N_("Duplicate pattern"),
+ NC_("patterns-action", "D_uplicate Pattern"), NULL,
+ N_("Duplicate this pattern"),
G_CALLBACK (data_duplicate_cmd_callback),
GIMP_HELP_PATTERN_DUPLICATE },
{ "patterns-copy-location", GTK_STOCK_COPY,
- N_("Copy Pattern _Location"), "",
+ NC_("patterns-action", "Copy Pattern _Location"), "",
N_("Copy pattern file location to clipboard"),
G_CALLBACK (data_copy_location_cmd_callback),
GIMP_HELP_PATTERN_COPY_LOCATION },
{ "patterns-delete", GTK_STOCK_DELETE,
- N_("_Delete Pattern"), "",
- N_("Delete pattern"),
+ NC_("patterns-action", "_Delete Pattern"), "",
+ N_("Delete this pattern"),
G_CALLBACK (data_delete_cmd_callback),
GIMP_HELP_PATTERN_DELETE },
{ "patterns-refresh", GTK_STOCK_REFRESH,
- N_("_Refresh Patterns"), "",
+ NC_("patterns-action", "_Refresh Patterns"), "",
N_("Refresh patterns"),
G_CALLBACK (data_refresh_cmd_callback),
GIMP_HELP_PATTERN_REFRESH }
@@ -83,7 +83,7 @@
static const GimpStringActionEntry patterns_edit_actions[] =
{
{ "patterns-edit", GTK_STOCK_EDIT,
- N_("_Edit Pattern..."), NULL,
+ NC_("patterns-action", "_Edit Pattern..."), NULL,
N_("Edit pattern"),
"gimp-pattern-editor",
GIMP_HELP_PATTERN_EDIT }
@@ -93,11 +93,11 @@
void
patterns_actions_setup (GimpActionGroup *group)
{
- gimp_action_group_add_actions (group,
+ gimp_action_group_add_actions (group, "patterns-action",
patterns_actions,
G_N_ELEMENTS (patterns_actions));
- gimp_action_group_add_string_actions (group,
+ gimp_action_group_add_string_actions (group, "patterns-action",
patterns_edit_actions,
G_N_ELEMENTS (patterns_edit_actions),
G_CALLBACK (data_edit_cmd_callback));
Modified: trunk/app/actions/plug-in-actions.c
==============================================================================
--- trunk/app/actions/plug-in-actions.c (original)
+++ trunk/app/actions/plug-in-actions.c Wed Dec 3 15:27:42 2008
@@ -81,28 +81,47 @@
static const GimpActionEntry plug_in_actions[] =
{
- { "plug-in-menu", NULL, N_("Filte_rs") },
- { "plug-in-recent-menu", NULL, N_("Recently Used") },
- { "plug-in-blur-menu", NULL, N_("_Blur") },
- { "plug-in-noise-menu", NULL, N_("_Noise") },
- { "plug-in-edge-detect-menu", NULL, N_("Edge-De_tect") },
- { "plug-in-enhance-menu", NULL, N_("En_hance") },
- { "plug-in-combine-menu", NULL, N_("C_ombine") },
- { "plug-in-generic-menu", NULL, N_("_Generic") },
- { "plug-in-light-shadow-menu", NULL, N_("_Light and Shadow") },
- { "plug-in-distorts-menu", NULL, N_("_Distorts") },
- { "plug-in-artistic-menu", NULL, N_("_Artistic") },
- { "plug-in-decor-menu", NULL, N_("_Decor") },
- { "plug-in-map-menu", NULL, N_("_Map") },
- { "plug-in-render-menu", NULL, N_("_Render") },
- { "plug-in-render-clouds-menu", NULL, N_("_Clouds") },
- { "plug-in-render-nature-menu", NULL, N_("_Nature") },
- { "plug-in-render-pattern-menu", NULL, N_("_Pattern") },
- { "plug-in-web-menu", NULL, N_("_Web") },
- { "plug-in-animation-menu", NULL, N_("An_imation") },
+ { "plug-in-menu", NULL, NC_("plug-in-action",
+ "Filte_rs") },
+ { "plug-in-recent-menu", NULL, NC_("plug-in-action",
+ "Recently Used") },
+ { "plug-in-blur-menu", NULL, NC_("plug-in-action",
+ "_Blur") },
+ { "plug-in-noise-menu", NULL, NC_("plug-in-action",
+ "_Noise") },
+ { "plug-in-edge-detect-menu", NULL, NC_("plug-in-action",
+ "Edge-De_tect") },
+ { "plug-in-enhance-menu", NULL, NC_("plug-in-action",
+ "En_hance") },
+ { "plug-in-combine-menu", NULL, NC_("plug-in-action",
+ "C_ombine") },
+ { "plug-in-generic-menu", NULL, NC_("plug-in-action",
+ "_Generic") },
+ { "plug-in-light-shadow-menu", NULL, NC_("plug-in-action",
+ "_Light and Shadow") },
+ { "plug-in-distorts-menu", NULL, NC_("plug-in-action",
+ "_Distorts") },
+ { "plug-in-artistic-menu", NULL, NC_("plug-in-action",
+ "_Artistic") },
+ { "plug-in-decor-menu", NULL, NC_("plug-in-action",
+ "_Decor") },
+ { "plug-in-map-menu", NULL, NC_("plug-in-action",
+ "_Map") },
+ { "plug-in-render-menu", NULL, NC_("plug-in-action",
+ "_Render") },
+ { "plug-in-render-clouds-menu", NULL, NC_("plug-in-action",
+ "_Clouds") },
+ { "plug-in-render-nature-menu", NULL, NC_("plug-in-action",
+ "_Nature") },
+ { "plug-in-render-pattern-menu", NULL, NC_("plug-in-action",
+ "_Pattern") },
+ { "plug-in-web-menu", NULL, NC_("plug-in-action",
+ "_Web") },
+ { "plug-in-animation-menu", NULL, NC_("plug-in-action",
+ "An_imation") },
{ "plug-in-reset-all", GIMP_STOCK_RESET,
- N_("Reset all _Filters"), NULL,
+ NC_("plug-in-action", "Reset all _Filters"), NULL,
N_("Reset all plug-ins to their default settings"),
G_CALLBACK (plug_in_reset_all_cmd_callback),
GIMP_HELP_FILTER_RESET_ALL }
@@ -111,13 +130,13 @@
static const GimpEnumActionEntry plug_in_repeat_actions[] =
{
{ "plug-in-repeat", GTK_STOCK_EXECUTE,
- N_("Re_peat Last"), "<control>F",
+ NC_("plug-in-action", "Re_peat Last"), "<control>F",
N_("Rerun the last used plug-in using the same settings"),
GIMP_RUN_WITH_LAST_VALS, FALSE,
GIMP_HELP_FILTER_REPEAT },
{ "plug-in-reshow", GIMP_STOCK_RESHOW_FILTER,
- N_("R_e-Show Last"), "<control><shift>F",
+ NC_("plug-in-action", "R_e-Show Last"), "<control><shift>F",
N_("Show the last used plug-in dialog again"),
GIMP_RUN_INTERACTIVE, FALSE,
GIMP_HELP_FILTER_RESHOW }
@@ -135,11 +154,11 @@
gint n_entries;
gint i;
- gimp_action_group_add_actions (group,
+ gimp_action_group_add_actions (group, "plug-in-action",
plug_in_actions,
G_N_ELEMENTS (plug_in_actions));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, "plug-in-action",
plug_in_repeat_actions,
G_N_ELEMENTS (plug_in_repeat_actions),
G_CALLBACK (plug_in_repeat_cmd_callback));
Modified: trunk/app/actions/quick-mask-actions.c
==============================================================================
--- trunk/app/actions/quick-mask-actions.c (original)
+++ trunk/app/actions/quick-mask-actions.c Wed Dec 3 15:27:42 2008
@@ -40,11 +40,11 @@
static const GimpActionEntry quick_mask_actions[] =
{
{ "quick-mask-popup", NULL,
- N_("Quick Mask Menu"), NULL, NULL, NULL,
+ NC_("quick-mask-action", "Quick Mask Menu"), NULL, NULL, NULL,
GIMP_HELP_QUICK_MASK },
{ "quick-mask-configure", NULL,
- N_("_Configure Color and Opacity..."), NULL, NULL,
+ NC_("quick-mask-action", "_Configure Color and Opacity..."), NULL, NULL,
G_CALLBACK (quick_mask_configure_cmd_callback),
GIMP_HELP_QUICK_MASK_EDIT }
};
@@ -52,7 +52,8 @@
static const GimpToggleActionEntry quick_mask_toggle_actions[] =
{
{ "quick-mask-toggle", GIMP_STOCK_QUICK_MASK_ON,
- N_("Toggle _Quick Mask"), "<shift>Q", N_("Toggle Quick Mask"),
+ NC_("quick-mask-action", "Toggle _Quick Mask"), "<shift>Q",
+ N_("Toggle Quick Mask"),
G_CALLBACK (quick_mask_toggle_cmd_callback),
FALSE,
GIMP_HELP_QUICK_MASK_TOGGLE }
@@ -61,12 +62,12 @@
static const GimpRadioActionEntry quick_mask_invert_actions[] =
{
{ "quick-mask-invert-on", NULL,
- N_("Mask _Selected Areas"), NULL, NULL,
+ NC_("quick-mask-action", "Mask _Selected Areas"), NULL, NULL,
TRUE,
GIMP_HELP_QUICK_MASK_INVERT },
{ "quick-mask-invert-off", NULL,
- N_("Mask _Unselected Areas"), NULL, NULL,
+ NC_("quick-mask-action", "Mask _Unselected Areas"), NULL, NULL,
FALSE,
GIMP_HELP_QUICK_MASK_INVERT }
};
@@ -75,15 +76,15 @@
void
quick_mask_actions_setup (GimpActionGroup *group)
{
- gimp_action_group_add_actions (group,
+ gimp_action_group_add_actions (group, "quick-mask-action",
quick_mask_actions,
G_N_ELEMENTS (quick_mask_actions));
- gimp_action_group_add_toggle_actions (group,
+ gimp_action_group_add_toggle_actions (group, "quick-mask-action",
quick_mask_toggle_actions,
G_N_ELEMENTS (quick_mask_toggle_actions));
- gimp_action_group_add_radio_actions (group,
+ gimp_action_group_add_radio_actions (group, "quick-mask-action",
quick_mask_invert_actions,
G_N_ELEMENTS (quick_mask_invert_actions),
NULL,
Modified: trunk/app/actions/sample-points-actions.c
==============================================================================
--- trunk/app/actions/sample-points-actions.c (original)
+++ trunk/app/actions/sample-points-actions.c Wed Dec 3 15:27:42 2008
@@ -37,15 +37,15 @@
static const GimpActionEntry sample_points_actions[] =
{
{ "sample-points-popup", GIMP_STOCK_SAMPLE_POINT,
- N_("Sample Point Menu"), NULL, NULL, NULL,
+ NC_("sample-points-action", "Sample Point Menu"), NULL, NULL, NULL,
GIMP_HELP_SAMPLE_POINT_DIALOG }
};
static const GimpToggleActionEntry sample_points_toggle_actions[] =
{
{ "sample-points-sample-merged", NULL,
- N_("_Sample Merged"), "",
- N_("Sample Merged"),
+ NC_("sample-points-action", "_Sample Merged"), "",
+ N_("Use the composite color of all visible layers"),
G_CALLBACK (sample_points_sample_merged_cmd_callback),
TRUE,
GIMP_HELP_SAMPLE_POINT_SAMPLE_MERGED }
@@ -55,11 +55,11 @@
void
sample_points_actions_setup (GimpActionGroup *group)
{
- gimp_action_group_add_actions (group,
+ gimp_action_group_add_actions (group, "sample-points-action",
sample_points_actions,
G_N_ELEMENTS (sample_points_actions));
- gimp_action_group_add_toggle_actions (group,
+ gimp_action_group_add_toggle_actions (group, "sample-points-action",
sample_points_toggle_actions,
G_N_ELEMENTS (sample_points_toggle_actions));
}
Modified: trunk/app/actions/select-actions.c
==============================================================================
--- trunk/app/actions/select-actions.c (original)
+++ trunk/app/actions/select-actions.c Wed Dec 3 15:27:42 2008
@@ -42,79 +42,79 @@
static const GimpActionEntry select_actions[] =
{
{ "selection-popup", GIMP_STOCK_TOOL_RECT_SELECT,
- N_("Selection Editor Menu"), NULL, NULL, NULL,
+ NC_("select-action", "Selection Editor Menu"), NULL, NULL, NULL,
GIMP_HELP_SELECTION_DIALOG },
- { "select-menu", NULL, N_("_Select") },
+ { "select-menu", NULL, NC_("select-action", "_Select") },
{ "select-all", GIMP_STOCK_SELECTION_ALL,
- N_("select|_All"), "<control>A",
+ NC_("select-action", "_All"), "<control>A",
N_("Select everything"),
G_CALLBACK (select_all_cmd_callback),
GIMP_HELP_SELECTION_ALL },
{ "select-none", GIMP_STOCK_SELECTION_NONE,
- N_("select|_None"), "<control><shift>A",
+ NC_("select-action", "_None"), "<control><shift>A",
N_("Dismiss the selection"),
G_CALLBACK (select_none_cmd_callback),
GIMP_HELP_SELECTION_NONE },
{ "select-invert", GIMP_STOCK_INVERT,
- N_("_Invert"), "<control>I",
+ NC_("select-action", "_Invert"), "<control>I",
N_("Invert the selection"),
G_CALLBACK (select_invert_cmd_callback),
GIMP_HELP_SELECTION_INVERT },
{ "select-float", GIMP_STOCK_FLOATING_SELECTION,
- N_("_Float"), "<control><shift>L",
+ NC_("select-action", "_Float"), "<control><shift>L",
N_("Create a floating selection"),
G_CALLBACK (select_float_cmd_callback),
GIMP_HELP_SELECTION_FLOAT },
{ "select-feather", NULL,
- N_("Fea_ther..."), NULL,
+ NC_("select-action", "Fea_ther..."), NULL,
N_("Blur the selection border so that it fades out smoothly"),
G_CALLBACK (select_feather_cmd_callback),
GIMP_HELP_SELECTION_FEATHER },
{ "select-sharpen", NULL,
- N_("_Sharpen"), NULL,
+ NC_("select-action", "_Sharpen"), NULL,
N_("Remove fuzzyness from the selection"),
G_CALLBACK (select_sharpen_cmd_callback),
GIMP_HELP_SELECTION_SHARPEN },
{ "select-shrink", GIMP_STOCK_SELECTION_SHRINK,
- N_("S_hrink..."), NULL,
+ NC_("select-action", "S_hrink..."), NULL,
N_("Contract the selection"),
G_CALLBACK (select_shrink_cmd_callback),
GIMP_HELP_SELECTION_SHRINK },
{ "select-grow", GIMP_STOCK_SELECTION_GROW,
- N_("_Grow..."), NULL,
+ NC_("select-action", "_Grow..."), NULL,
N_("Enlarge the selection"),
G_CALLBACK (select_grow_cmd_callback),
GIMP_HELP_SELECTION_GROW },
{ "select-border", GIMP_STOCK_SELECTION_BORDER,
- N_("Bo_rder..."), NULL,
+ NC_("select-action", "Bo_rder..."), NULL,
N_("Replace the selection by its border"),
G_CALLBACK (select_border_cmd_callback),
GIMP_HELP_SELECTION_BORDER },
{ "select-save", GIMP_STOCK_SELECTION_TO_CHANNEL,
- N_("Save to _Channel"), NULL,
+ NC_("select-action", "Save to _Channel"), NULL,
N_("Save the selection to a channel"),
G_CALLBACK (select_save_cmd_callback),
GIMP_HELP_SELECTION_TO_CHANNEL },
{ "select-stroke", GIMP_STOCK_SELECTION_STROKE,
- N_("_Stroke Selection..."), NULL,
+ NC_("select-action", "_Stroke Selection..."), NULL,
N_("Paint along the selection outline"),
G_CALLBACK (select_stroke_cmd_callback),
GIMP_HELP_SELECTION_STROKE },
{ "select-stroke-last-values", GIMP_STOCK_SELECTION_STROKE,
- N_("_Stroke Selection"), NULL,
+ NC_("select-action", "_Stroke Selection"), NULL,
N_("Stroke the selection with last used values"),
G_CALLBACK (select_stroke_last_vals_cmd_callback),
GIMP_HELP_SELECTION_STROKE }
@@ -124,9 +124,9 @@
void
select_actions_setup (GimpActionGroup *group)
{
- gimp_action_group_add_actions (group,
+ gimp_action_group_add_actions (group, "select-action",
select_actions,
- G_N_ELEMENTS (select_actions));
+ G_N_ELEMENTS (select_actions));
}
void
Modified: trunk/app/actions/templates-actions.c
==============================================================================
--- trunk/app/actions/templates-actions.c (original)
+++ trunk/app/actions/templates-actions.c Wed Dec 3 15:27:42 2008
@@ -39,36 +39,36 @@
static const GimpActionEntry templates_actions[] =
{
{ "templates-popup", GIMP_STOCK_TEMPLATE,
- N_("Templates Menu"), NULL, NULL, NULL,
+ NC_("templates-action", "Templates Menu"), NULL, NULL, NULL,
GIMP_HELP_TEMPLATE_DIALOG },
{ "templates-create-image", GIMP_STOCK_IMAGE,
- N_("_Create Image from Template"), "",
+ NC_("templates-action", "_Create Image from Template"), "",
N_("Create a new image from the selected template"),
G_CALLBACK (templates_create_image_cmd_callback),
GIMP_HELP_TEMPLATE_IMAGE_NEW },
{ "templates-new", GTK_STOCK_NEW,
- N_("_New Template..."), "",
+ NC_("templates-action", "_New Template..."), "",
N_("Create a new template"),
G_CALLBACK (templates_new_cmd_callback),
GIMP_HELP_TEMPLATE_NEW },
{ "templates-duplicate", GIMP_STOCK_DUPLICATE,
- N_("D_uplicate Template..."), "",
- N_("Duplicate the selected template"),
+ NC_("templates-action", "D_uplicate Template..."), "",
+ N_("Duplicate this template"),
G_CALLBACK (templates_duplicate_cmd_callback),
GIMP_HELP_TEMPLATE_DUPLICATE },
{ "templates-edit", GTK_STOCK_EDIT,
- N_("_Edit Template..."), "",
- N_("Edit the selected template"),
+ NC_("templates-action", "_Edit Template..."), "",
+ N_("Edit this template"),
G_CALLBACK (templates_edit_cmd_callback),
GIMP_HELP_TEMPLATE_EDIT },
{ "templates-delete", GTK_STOCK_DELETE,
- N_("_Delete Template"), "",
- N_("Delete the selected template"),
+ NC_("templates-action", "_Delete Template"), "",
+ N_("Delete this template"),
G_CALLBACK (templates_delete_cmd_callback),
GIMP_HELP_TEMPLATE_DELETE }
};
@@ -77,7 +77,7 @@
void
templates_actions_setup (GimpActionGroup *group)
{
- gimp_action_group_add_actions (group,
+ gimp_action_group_add_actions (group, "templates-action",
templates_actions,
G_N_ELEMENTS (templates_actions));
}
Modified: trunk/app/actions/text-editor-actions.c
==============================================================================
--- trunk/app/actions/text-editor-actions.c (original)
+++ trunk/app/actions/text-editor-actions.c Wed Dec 3 15:27:42 2008
@@ -41,13 +41,13 @@
GIMP_HELP_TEXT_EDITOR_DIALOG },
{ "text-editor-load", GTK_STOCK_OPEN,
- N_("Open"), "",
+ NC_("text-editor-action", "Open"), "",
N_("Load text from file"),
G_CALLBACK (text_editor_load_cmd_callback),
NULL },
{ "text-editor-clear", GTK_STOCK_CLEAR,
- N_("Clear"), "",
+ NC_("text-editor-action", "Clear"), "",
N_("Clear all text"),
G_CALLBACK (text_editor_clear_cmd_callback),
NULL }
@@ -56,13 +56,13 @@
static const GimpRadioActionEntry text_editor_direction_actions[] =
{
{ "text-editor-direction-ltr", GIMP_STOCK_TEXT_DIR_LTR,
- N_("LTR"), "",
+ NC_("text-editor-action", "LTR"), "",
N_("From left to right"),
GIMP_TEXT_DIRECTION_LTR,
NULL },
{ "text-editor-direction-rtl", GIMP_STOCK_TEXT_DIR_RTL,
- N_("RTL"), "",
+ NC_("text-editor-action", "RTL"), "",
N_("From right to left"),
GIMP_TEXT_DIRECTION_RTL,
NULL }
@@ -72,11 +72,11 @@
void
text_editor_actions_setup (GimpActionGroup *group)
{
- gimp_action_group_add_actions (group,
+ gimp_action_group_add_actions (group, "text-editor-action",
text_editor_actions,
G_N_ELEMENTS (text_editor_actions));
- gimp_action_group_add_radio_actions (group,
+ gimp_action_group_add_radio_actions (group, "text-editor-action",
text_editor_direction_actions,
G_N_ELEMENTS (text_editor_direction_actions),
NULL,
Modified: trunk/app/actions/text-tool-actions.c
==============================================================================
--- trunk/app/actions/text-tool-actions.c (original)
+++ trunk/app/actions/text-tool-actions.c Wed Dec 3 15:27:42 2008
@@ -47,52 +47,52 @@
static const GimpActionEntry text_tool_actions[] =
{
{ "text-tool-popup", NULL,
- N_("Text Tool Menu"), NULL, NULL, NULL,
+ NC_("text-tool-action", "Text Tool Menu"), NULL, NULL, NULL,
NULL },
{ "text-tool-input-methods-menu", NULL,
- N_("Input _Methods"), NULL, NULL, NULL,
+ NC_("text-tool-action", "Input _Methods"), NULL, NULL, NULL,
NULL },
{ "text-tool-cut", GTK_STOCK_CUT,
- N_("Cu_t"), NULL, NULL,
+ NC_("text-tool-action", "Cu_t"), NULL, NULL,
G_CALLBACK (text_tool_cut_cmd_callback),
NULL },
{ "text-tool-copy", GTK_STOCK_COPY,
- N_("_Copy"), NULL, NULL,
+ NC_("text-tool-action", "_Copy"), NULL, NULL,
G_CALLBACK (text_tool_copy_cmd_callback),
NULL },
{ "text-tool-paste", GTK_STOCK_PASTE,
- N_("_Paste"), NULL, NULL,
+ NC_("text-tool-action", "_Paste"), NULL, NULL,
G_CALLBACK (text_tool_paste_cmd_callback),
NULL },
{ "text-tool-delete", GTK_STOCK_DELETE,
- N_("_Delete"), NULL, NULL,
+ NC_("text-tool-action", "_Delete"), NULL, NULL,
G_CALLBACK (text_tool_delete_cmd_callback),
NULL },
{ "text-tool-load", GTK_STOCK_OPEN,
- N_("_Open text file..."), NULL, NULL,
+ NC_("text-tool-action", "_Open text file..."), NULL, NULL,
G_CALLBACK (text_tool_load_cmd_callback),
NULL },
{ "text-tool-clear", GTK_STOCK_CLEAR,
- N_("Cl_ear"), "",
+ NC_("text-tool-action", "Cl_ear"), "",
N_("Clear all text"),
G_CALLBACK (text_tool_clear_cmd_callback),
NULL },
{ "text-tool-text-to-path", GIMP_STOCK_PATH,
- N_("_Path from Text"), "",
+ NC_("text-tool-action", "_Path from Text"), "",
N_("Create a path from the outlines of the current text"),
G_CALLBACK (text_tool_text_to_path_cmd_callback),
NULL },
{ "text-tool-text-along-path", GIMP_STOCK_PATH,
- N_("Text _along Path"), "",
+ NC_("text-tool-action", "Text _along Path"), "",
N_("Bend the text along the currently active path"),
G_CALLBACK (text_tool_text_along_path_cmd_callback),
NULL }
@@ -101,12 +101,12 @@
static const GimpRadioActionEntry text_tool_direction_actions[] =
{
{ "text-tool-direction-ltr", GIMP_STOCK_TEXT_DIR_LTR,
- N_("From left to right"), NULL, NULL,
+ NC_("text-tool-action", "From left to right"), NULL, NULL,
GIMP_TEXT_DIRECTION_LTR,
NULL },
{ "text-tool-direction-rtl", GIMP_STOCK_TEXT_DIR_RTL,
- N_("From right to left"), NULL, NULL,
+ NC_("text-tool-action", "From right to left"), NULL, NULL,
GIMP_TEXT_DIRECTION_RTL,
NULL }
};
@@ -115,11 +115,11 @@
void
text_tool_actions_setup (GimpActionGroup *group)
{
- gimp_action_group_add_actions (group,
+ gimp_action_group_add_actions (group, "text-tool-action",
text_tool_actions,
G_N_ELEMENTS (text_tool_actions));
- gimp_action_group_add_radio_actions (group,
+ gimp_action_group_add_radio_actions (group, "text-tool-action",
text_tool_direction_actions,
G_N_ELEMENTS (text_tool_direction_actions),
NULL,
Modified: trunk/app/actions/tool-options-actions.c
==============================================================================
--- trunk/app/actions/tool-options-actions.c (original)
+++ trunk/app/actions/tool-options-actions.c Wed Dec 3 15:27:42 2008
@@ -53,38 +53,38 @@
static const GimpActionEntry tool_options_actions[] =
{
{ "tool-options-popup", GIMP_STOCK_TOOL_OPTIONS,
- N_("Tool Options Menu"), NULL, NULL, NULL,
+ NC_("tool-options-action", "Tool Options Menu"), NULL, NULL, NULL,
GIMP_HELP_TOOL_OPTIONS_DIALOG },
{ "tool-options-save-menu", GTK_STOCK_SAVE,
- N_("_Save Options To"), "", NULL, NULL,
+ NC_("tool-options-action", "_Save Options To"), "", NULL, NULL,
GIMP_HELP_TOOL_OPTIONS_SAVE },
{ "tool-options-restore-menu", GTK_STOCK_REVERT_TO_SAVED,
- N_("_Restore Options From"), "", NULL, NULL,
+ NC_("tool-options-action", "_Restore Options From"), "", NULL, NULL,
GIMP_HELP_TOOL_OPTIONS_RESTORE },
{ "tool-options-rename-menu", GTK_STOCK_EDIT,
- N_("Re_name Saved Options"), NULL, NULL, NULL,
+ NC_("tool-options-action", "Re_name Saved Options"), NULL, NULL, NULL,
GIMP_HELP_TOOL_OPTIONS_RENAME },
{ "tool-options-delete-menu", GTK_STOCK_DELETE,
- N_("_Delete Saved Options"), "", NULL, NULL,
+ NC_("tool-options-action", "_Delete Saved Options"), "", NULL, NULL,
GIMP_HELP_TOOL_OPTIONS_DELETE },
{ "tool-options-save-new", GTK_STOCK_NEW,
- N_("_New Entry..."), "", NULL,
+ NC_("tool-options-action", "_New Entry..."), "", NULL,
G_CALLBACK (tool_options_save_new_cmd_callback),
GIMP_HELP_TOOL_OPTIONS_SAVE },
{ "tool-options-reset", GIMP_STOCK_RESET,
- N_("R_eset Tool Options"), "",
- N_("Reset to default values"),
+ NC_("tool-options-action", "R_eset Tool Options"), "",
+ NC_("tool-options-action", "Reset to default values"),
G_CALLBACK (tool_options_reset_cmd_callback),
GIMP_HELP_TOOL_OPTIONS_RESET },
{ "tool-options-reset-all", GIMP_STOCK_RESET,
- N_("Reset _all Tool Options"), "",
+ NC_("tool-options-action", "Reset _all Tool Options"), "",
N_("Reset all tool options"),
G_CALLBACK (tool_options_reset_all_cmd_callback),
GIMP_HELP_TOOL_OPTIONS_RESET }
@@ -101,7 +101,7 @@
void
tool_options_actions_setup (GimpActionGroup *group)
{
- gimp_action_group_add_actions (group,
+ gimp_action_group_add_actions (group, "tool-options-action",
tool_options_actions,
G_N_ELEMENTS (tool_options_actions));
@@ -204,7 +204,7 @@
entry.label = gimp_object_get_name (GIMP_OBJECT (options));
entry.value = i;
- gimp_action_group_add_enum_actions (group, &entry, 1, callback);
+ gimp_action_group_add_enum_actions (group, NULL, &entry, 1, callback);
g_free ((gchar *) entry.name);
}
Modified: trunk/app/actions/tools-actions.c
==============================================================================
--- trunk/app/actions/tools-actions.c (original)
+++ trunk/app/actions/tools-actions.c Wed Dec 3 15:27:42 2008
@@ -44,41 +44,41 @@
static const GimpActionEntry tools_actions[] =
{
{ "tools-popup", GIMP_STOCK_TOOLS,
- N_("Tools Menu"), NULL, NULL, NULL,
+ NC_("tools-action", "Tools Menu"), NULL, NULL, NULL,
GIMP_HELP_TOOLS_DIALOG },
- { "tools-menu", NULL, N_("_Tools") },
- { "tools-select-menu", NULL, N_("_Selection Tools") },
- { "tools-paint-menu", NULL, N_("_Paint Tools") },
- { "tools-transform-menu", NULL, N_("_Transform Tools") },
- { "tools-color-menu", NULL, N_("_Color Tools") },
+ { "tools-menu", NULL, NC_("tools-action", "_Tools") },
+ { "tools-select-menu", NULL, NC_("tools-action", "_Selection Tools") },
+ { "tools-paint-menu", NULL, NC_("tools-action", "_Paint Tools") },
+ { "tools-transform-menu", NULL, NC_("tools-action", "_Transform Tools") },
+ { "tools-color-menu", NULL, NC_("tools-action", "_Color Tools") },
{ "tools-raise", GTK_STOCK_GO_UP,
- N_("R_aise Tool"), NULL,
+ NC_("tools-action", "R_aise Tool"), NULL,
N_("Raise tool"),
G_CALLBACK (tools_raise_cmd_callback),
NULL },
{ "tools-raise-to-top", GTK_STOCK_GOTO_TOP,
- N_("Ra_ise to Top"), NULL,
+ NC_("tools-action", "Ra_ise to Top"), NULL,
N_("Raise tool to top"),
G_CALLBACK (tools_raise_to_top_cmd_callback),
NULL },
{ "tools-lower", GTK_STOCK_GO_DOWN,
- N_("L_ower Tool"), NULL,
+ NC_("tools-action", "L_ower Tool"), NULL,
N_("Lower tool"),
G_CALLBACK (tools_lower_cmd_callback),
NULL },
{ "tools-lower-to-bottom", GTK_STOCK_GOTO_BOTTOM,
- N_("Lo_wer to Bottom"), NULL,
+ NC_("tools-action", "Lo_wer to Bottom"), NULL,
N_("Lower tool to bottom"),
G_CALLBACK (tools_lower_to_bottom_cmd_callback),
NULL },
{ "tools-reset", GIMP_STOCK_RESET,
- N_("_Reset Order & Visibility"), NULL,
+ NC_("tools-action", "_Reset Order & Visibility"), NULL,
N_("Reset tool order and visibility"),
G_CALLBACK (tools_reset_cmd_callback),
NULL }
@@ -87,7 +87,7 @@
static const GimpToggleActionEntry tools_toggle_actions[] =
{
{ "tools-visibility", GIMP_STOCK_VISIBLE,
- N_("_Show in Toolbox"), NULL, NULL,
+ NC_("tools-action", "_Show in Toolbox"), NULL, NULL,
G_CALLBACK (tools_toggle_visibility_cmd_callback),
TRUE,
NULL /* FIXME */ }
@@ -96,13 +96,13 @@
static const GimpStringActionEntry tools_alternative_actions[] =
{
{ "tools-by-color-select-short", GIMP_STOCK_TOOL_BY_COLOR_SELECT,
- N_("_By Color"), NULL,
+ NC_("tools-action", "_By Color"), NULL,
N_("Select regions with similar colors"),
"gimp-by-color-select-tool",
GIMP_HELP_TOOL_BY_COLOR_SELECT },
{ "tools-rotate-arbitrary", GIMP_STOCK_TOOL_ROTATE,
- N_("_Arbitrary Rotation..."), "",
+ NC_("tools-action", "_Arbitrary Rotation..."), "",
N_("Rotate by an arbitrary angle"),
"gimp-rotate-layer",
GIMP_HELP_TOOL_ROTATE }
@@ -563,15 +563,15 @@
GtkAction *action;
GList *list;
- gimp_action_group_add_actions (group,
+ gimp_action_group_add_actions (group, "tools-action",
tools_actions,
G_N_ELEMENTS (tools_actions));
- gimp_action_group_add_toggle_actions (group,
+ gimp_action_group_add_toggle_actions (group, "tools-action",
tools_toggle_actions,
G_N_ELEMENTS (tools_toggle_actions));
- gimp_action_group_add_string_actions (group,
+ gimp_action_group_add_string_actions (group, "tools-action",
tools_alternative_actions,
G_N_ELEMENTS (tools_alternative_actions),
G_CALLBACK (tools_select_cmd_callback));
@@ -580,61 +580,61 @@
"tools-by-color-select-short");
gtk_action_set_accel_path (action, "<Actions>/tools/tools-by-color-select");
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, NULL,
tools_color_average_radius_actions,
G_N_ELEMENTS (tools_color_average_radius_actions),
G_CALLBACK (tools_color_average_radius_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, NULL,
tools_paint_brush_scale_actions,
G_N_ELEMENTS (tools_paint_brush_scale_actions),
G_CALLBACK (tools_paint_brush_scale_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, NULL,
tools_ink_blob_size_actions,
G_N_ELEMENTS (tools_ink_blob_size_actions),
G_CALLBACK (tools_ink_blob_size_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, NULL,
tools_ink_blob_aspect_actions,
G_N_ELEMENTS (tools_ink_blob_aspect_actions),
G_CALLBACK (tools_ink_blob_aspect_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, NULL,
tools_ink_blob_angle_actions,
G_N_ELEMENTS (tools_ink_blob_angle_actions),
G_CALLBACK (tools_ink_blob_angle_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, NULL,
tools_foreground_select_brush_size_actions,
G_N_ELEMENTS (tools_foreground_select_brush_size_actions),
G_CALLBACK (tools_fg_select_brush_size_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, NULL,
tools_transform_preview_opacity_actions,
G_N_ELEMENTS (tools_transform_preview_opacity_actions),
G_CALLBACK (tools_transform_preview_opacity_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, NULL,
tools_value_1_actions,
G_N_ELEMENTS (tools_value_1_actions),
G_CALLBACK (tools_value_1_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, NULL,
tools_value_2_actions,
G_N_ELEMENTS (tools_value_2_actions),
G_CALLBACK (tools_value_2_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, NULL,
tools_value_3_actions,
G_N_ELEMENTS (tools_value_3_actions),
G_CALLBACK (tools_value_3_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, NULL,
tools_value_4_actions,
G_N_ELEMENTS (tools_value_4_actions),
G_CALLBACK (tools_value_4_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, NULL,
tools_object_1_actions,
G_N_ELEMENTS (tools_object_1_actions),
G_CALLBACK (tools_object_1_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, NULL,
tools_object_2_actions,
G_N_ELEMENTS (tools_object_2_actions),
G_CALLBACK (tools_object_2_cmd_callback));
@@ -669,7 +669,7 @@
entry.help_id = tool_info->help_id;
entry.value = identifier;
- gimp_action_group_add_string_actions (group,
+ gimp_action_group_add_string_actions (group, NULL,
&entry, 1,
G_CALLBACK (tools_select_cmd_callback));
Modified: trunk/app/actions/vectors-actions.c
==============================================================================
--- trunk/app/actions/vectors-actions.c (original)
+++ trunk/app/actions/vectors-actions.c Wed Dec 3 15:27:42 2008
@@ -42,102 +42,102 @@
static const GimpActionEntry vectors_actions[] =
{
{ "vectors-popup", GIMP_STOCK_PATHS,
- N_("Paths Menu"), NULL, NULL, NULL,
+ NC_("vectors-action", "Paths Menu"), NULL, NULL, NULL,
GIMP_HELP_PATH_DIALOG },
{ "vectors-path-tool", GIMP_STOCK_TOOL_PATH,
- N_("Path _Tool"), NULL, NULL,
+ NC_("vectors-action", "Path _Tool"), NULL, NULL,
G_CALLBACK (vectors_vectors_tool_cmd_callback),
GIMP_HELP_TOOL_VECTORS },
{ "vectors-edit-attributes", GTK_STOCK_EDIT,
- N_("_Edit Path Attributes..."), NULL,
+ NC_("vectors-action", "_Edit Path Attributes..."), NULL,
N_("Edit path attributes"),
G_CALLBACK (vectors_edit_attributes_cmd_callback),
GIMP_HELP_PATH_EDIT },
{ "vectors-new", GTK_STOCK_NEW,
- N_("_New Path..."), "",
- N_("New path..."),
+ NC_("vectors-action", "_New Path..."), "",
+ N_("Create a new path..."),
G_CALLBACK (vectors_new_cmd_callback),
GIMP_HELP_PATH_NEW },
{ "vectors-new-last-values", GTK_STOCK_NEW,
- N_("_New Path"), "",
- N_("New path with last values"),
+ NC_("vectors-action", "_New Path with last values"), "",
+ N_("Create a new path with last values"),
G_CALLBACK (vectors_new_last_vals_cmd_callback),
GIMP_HELP_PATH_NEW },
{ "vectors-duplicate", GIMP_STOCK_DUPLICATE,
- N_("D_uplicate Path"), NULL,
- N_("Duplicate path"),
+ NC_("vectors-action", "D_uplicate Path"), NULL,
+ N_("Duplicate this path"),
G_CALLBACK (vectors_duplicate_cmd_callback),
GIMP_HELP_PATH_DUPLICATE },
{ "vectors-delete", GTK_STOCK_DELETE,
- N_("_Delete Path"), "",
- N_("Delete path"),
+ NC_("vectors-action", "_Delete Path"), "",
+ N_("Delete this path"),
G_CALLBACK (vectors_delete_cmd_callback),
GIMP_HELP_PATH_DELETE },
{ "vectors-merge-visible", NULL,
- N_("Merge _Visible Paths"), NULL, NULL,
+ NC_("vectors-action", "Merge _Visible Paths"), NULL, NULL,
G_CALLBACK (vectors_merge_visible_cmd_callback),
GIMP_HELP_PATH_MERGE_VISIBLE },
{ "vectors-raise", GTK_STOCK_GO_UP,
- N_("_Raise Path"), "",
+ NC_("vectors-action", "_Raise Path"), "",
N_("Raise path"),
G_CALLBACK (vectors_raise_cmd_callback),
GIMP_HELP_PATH_RAISE },
{ "vectors-raise-to-top", GTK_STOCK_GOTO_TOP,
- N_("Raise Path to _Top"), "",
+ NC_("vectors-action", "Raise Path to _Top"), "",
N_("Raise path to top"),
G_CALLBACK (vectors_raise_to_top_cmd_callback),
GIMP_HELP_PATH_RAISE_TO_TOP },
{ "vectors-lower", GTK_STOCK_GO_DOWN,
- N_("_Lower Path"), "",
+ NC_("vectors-action", "_Lower Path"), "",
N_("Lower path"),
G_CALLBACK (vectors_lower_cmd_callback),
GIMP_HELP_PATH_LOWER },
{ "vectors-lower-to-bottom", GTK_STOCK_GOTO_BOTTOM,
- N_("Lower Path to _Bottom"), "",
+ NC_("vectors-action", "Lower Path to _Bottom"), "",
N_("Lower path to bottom"),
G_CALLBACK (vectors_lower_to_bottom_cmd_callback),
GIMP_HELP_PATH_LOWER_TO_BOTTOM },
{ "vectors-stroke", GIMP_STOCK_PATH_STROKE,
- N_("Stro_ke Path..."), NULL,
+ NC_("vectors-action", "Stro_ke Path..."), NULL,
N_("Paint along the path"),
G_CALLBACK (vectors_stroke_cmd_callback),
GIMP_HELP_PATH_STROKE },
{ "vectors-stroke-last-values", GIMP_STOCK_PATH_STROKE,
- N_("Stro_ke Path"), NULL,
+ NC_("vectors-action", "Stro_ke Path"), NULL,
N_("Paint along the path with last values"),
G_CALLBACK (vectors_stroke_last_vals_cmd_callback),
GIMP_HELP_PATH_STROKE },
{ "vectors-copy", GTK_STOCK_COPY,
- N_("Co_py Path"), "", NULL,
+ NC_("vectors-action", "Co_py Path"), "", NULL,
G_CALLBACK (vectors_copy_cmd_callback),
GIMP_HELP_PATH_COPY },
{ "vectors-paste", GTK_STOCK_PASTE,
- N_("Paste Pat_h"), "", NULL,
+ NC_("vectors-action", "Paste Pat_h"), "", NULL,
G_CALLBACK (vectors_paste_cmd_callback),
GIMP_HELP_PATH_PASTE },
{ "vectors-export", GTK_STOCK_SAVE,
- N_("E_xport Path..."), "", NULL,
+ NC_("vectors-action", "E_xport Path..."), "", NULL,
G_CALLBACK (vectors_export_cmd_callback),
GIMP_HELP_PATH_EXPORT },
{ "vectors-import", GTK_STOCK_OPEN,
- N_("I_mport Path..."), "", NULL,
+ NC_("vectors-action", "I_mport Path..."), "", NULL,
G_CALLBACK (vectors_import_cmd_callback),
GIMP_HELP_PATH_IMPORT }
};
@@ -145,13 +145,13 @@
static const GimpToggleActionEntry vectors_toggle_actions[] =
{
{ "vectors-visible", GIMP_STOCK_VISIBLE,
- N_("_Visible"), NULL, NULL,
+ NC_("vectors-action", "_Visible"), NULL, NULL,
G_CALLBACK (vectors_visible_cmd_callback),
FALSE,
GIMP_HELP_PATH_VISIBLE },
{ "vectors-linked", GIMP_STOCK_LINKED,
- N_("_Linked"), NULL, NULL,
+ NC_("vectors-action", "_Linked"), NULL, NULL,
G_CALLBACK (vectors_linked_cmd_callback),
FALSE,
GIMP_HELP_PATH_LINKED }
@@ -160,31 +160,32 @@
static const GimpEnumActionEntry vectors_to_selection_actions[] =
{
{ "vectors-selection-replace", GIMP_STOCK_SELECTION_REPLACE,
- N_("Path to Sele_ction"), NULL,
+ NC_("vectors-action", "Path to Sele_ction"), NULL,
N_("Path to selection"),
GIMP_CHANNEL_OP_REPLACE, FALSE,
GIMP_HELP_PATH_SELECTION_REPLACE },
{ "vectors-selection-from-vectors", GIMP_STOCK_SELECTION_REPLACE,
- N_("Fr_om Path"), "<shift>V", NULL,
+ NC_("vectors-action", "Fr_om Path"), "<shift>V",
+ N_("Replace selection with path"),
GIMP_CHANNEL_OP_REPLACE, FALSE,
GIMP_HELP_PATH_SELECTION_REPLACE },
{ "vectors-selection-add", GIMP_STOCK_SELECTION_ADD,
- N_("_Add to Selection"), NULL,
- N_("Add"),
+ NC_("vectors-action", "_Add to Selection"), NULL,
+ N_("Add path to selection"),
GIMP_CHANNEL_OP_ADD, FALSE,
GIMP_HELP_PATH_SELECTION_ADD },
{ "vectors-selection-subtract", GIMP_STOCK_SELECTION_SUBTRACT,
- N_("_Subtract from Selection"), NULL,
- N_("Subtract"),
+ NC_("vectors-action", "_Subtract from Selection"), NULL,
+ N_("Subtract path from selection"),
GIMP_CHANNEL_OP_SUBTRACT, FALSE,
GIMP_HELP_PATH_SELECTION_SUBTRACT },
{ "vectors-selection-intersect", GIMP_STOCK_SELECTION_INTERSECT,
- N_("_Intersect with Selection"), NULL,
- N_("Intersect"),
+ NC_("vectors-action", "_Intersect with Selection"), NULL,
+ N_("Intersect path with selection"),
GIMP_CHANNEL_OP_INTERSECT, FALSE,
GIMP_HELP_PATH_SELECTION_INTERSECT }
};
@@ -192,19 +193,19 @@
static const GimpEnumActionEntry vectors_selection_to_vectors_actions[] =
{
{ "vectors-selection-to-vectors", GIMP_STOCK_SELECTION_TO_PATH,
- N_("Selecti_on to Path"), NULL,
+ NC_("vectors-action", "Selecti_on to Path"), NULL,
N_("Selection to path"),
FALSE, FALSE,
GIMP_HELP_SELECTION_TO_PATH },
{ "vectors-selection-to-vectors-short", GIMP_STOCK_SELECTION_TO_PATH,
- N_("To _Path"), NULL,
+ NC_("vectors-action", "To _Path"), NULL,
N_("Selection to path"),
FALSE, FALSE,
GIMP_HELP_SELECTION_TO_PATH },
{ "vectors-selection-to-vectors-advanced", GIMP_STOCK_SELECTION_TO_PATH,
- N_("Selection to Path (_Advanced)"), NULL,
+ NC_("vectors-action", "Selection to Path (_Advanced)"), NULL,
N_("Advanced options"),
TRUE, FALSE,
GIMP_HELP_SELECTION_TO_PATH }
@@ -214,20 +215,20 @@
void
vectors_actions_setup (GimpActionGroup *group)
{
- gimp_action_group_add_actions (group,
+ gimp_action_group_add_actions (group, "vectors-action",
vectors_actions,
G_N_ELEMENTS (vectors_actions));
- gimp_action_group_add_toggle_actions (group,
+ gimp_action_group_add_toggle_actions (group, "vectors-action",
vectors_toggle_actions,
G_N_ELEMENTS (vectors_toggle_actions));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, "vectors-action",
vectors_to_selection_actions,
G_N_ELEMENTS (vectors_to_selection_actions),
G_CALLBACK (vectors_to_selection_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, "vectors-action",
vectors_selection_to_vectors_actions,
G_N_ELEMENTS (vectors_selection_to_vectors_actions),
G_CALLBACK (vectors_selection_to_vectors_cmd_callback));
Modified: trunk/app/actions/view-actions.c
==============================================================================
--- trunk/app/actions/view-actions.c (original)
+++ trunk/app/actions/view-actions.c Wed Dec 3 15:27:42 2008
@@ -66,63 +66,63 @@
static const GimpActionEntry view_actions[] =
{
- { "view-menu", NULL, N_("_View") },
- { "view-zoom-menu", NULL, N_("_Zoom") },
- { "view-padding-color-menu", NULL, N_("_Padding Color") },
+ { "view-menu", NULL, NC_("view-action", "_View") },
+ { "view-zoom-menu", NULL, NC_("view-action", "_Zoom") },
+ { "view-padding-color-menu", NULL, NC_("view-action", "_Padding Color") },
{ "view-move-to-screen-menu", GIMP_STOCK_MOVE_TO_SCREEN,
- N_("Move to Screen"), NULL, NULL, NULL,
+ NC_("view-action", "Move to Screen"), NULL, NULL, NULL,
GIMP_HELP_VIEW_CHANGE_SCREEN },
{ "view-new", GTK_STOCK_NEW,
- N_("_New View"), "",
+ NC_("view-action", "_New View"), "",
N_("Create another view on this image"),
G_CALLBACK (view_new_cmd_callback),
GIMP_HELP_VIEW_NEW },
{ "view-close", GTK_STOCK_CLOSE,
- N_( "_Close"), "<control>W",
+ NC_("view-action", "_Close"), "<control>W",
N_("Close this image window"),
G_CALLBACK (window_close_cmd_callback),
GIMP_HELP_FILE_CLOSE },
{ "view-zoom-fit-in", GTK_STOCK_ZOOM_FIT,
- N_("_Fit Image in Window"), "<control><shift>E",
+ NC_("view-action", "_Fit Image in Window"), "<control><shift>E",
N_("Adjust the zoom ratio so that the image becomes fully visible"),
G_CALLBACK (view_zoom_fit_in_cmd_callback),
GIMP_HELP_VIEW_ZOOM_FIT_IN },
{ "view-zoom-fill", GTK_STOCK_ZOOM_FIT,
- N_("Fi_ll Window"), NULL,
+ NC_("view-action", "Fi_ll Window"), NULL,
N_("Adjust the zoom ratio so that the entire window is used"),
G_CALLBACK (view_zoom_fill_cmd_callback),
GIMP_HELP_VIEW_ZOOM_FILL },
{ "view-zoom-revert", NULL,
- N_("Re_vert Zoom"), "grave",
+ NC_("view-action", "Re_vert Zoom"), "grave",
N_("Restore the previous zoom level"),
G_CALLBACK (view_zoom_revert_cmd_callback),
GIMP_HELP_VIEW_ZOOM_REVERT },
{ "view-navigation-window", GIMP_STOCK_NAVIGATION,
- N_("Na_vigation Window"), NULL,
+ NC_("view-action", "Na_vigation Window"), NULL,
N_("Show an overview window for this image"),
G_CALLBACK (view_navigation_window_cmd_callback),
GIMP_HELP_NAVIGATION_DIALOG },
{ "view-display-filters", GIMP_STOCK_DISPLAY_FILTER,
- N_("Display _Filters..."), NULL,
+ NC_("view-action", "Display _Filters..."), NULL,
N_("Configure filters applied to this view"),
G_CALLBACK (view_display_filters_cmd_callback),
GIMP_HELP_DISPLAY_FILTER_DIALOG },
{ "view-shrink-wrap", GTK_STOCK_ZOOM_FIT,
- N_("Shrink _Wrap"), "<control>E",
+ NC_("view-action", "Shrink _Wrap"), "<control>E",
N_("Reduce the image window to the size of the image display"),
G_CALLBACK (view_shrink_wrap_cmd_callback),
GIMP_HELP_VIEW_SHRINK_WRAP },
{ "view-open-display", NULL,
- N_("_Open Display..."), NULL,
+ NC_("view-action", "_Open Display..."), NULL,
N_("Connect to another display"),
G_CALLBACK (window_open_display_cmd_callback),
NULL }
@@ -131,105 +131,105 @@
static const GimpToggleActionEntry view_toggle_actions[] =
{
{ "view-dot-for-dot", NULL,
- N_("_Dot for Dot"), NULL,
+ NC_("view-action", "_Dot for Dot"), NULL,
N_("A pixel on the screen represents an image pixel"),
G_CALLBACK (view_dot_for_dot_cmd_callback),
TRUE,
GIMP_HELP_VIEW_DOT_FOR_DOT },
{ "view-show-selection", NULL,
- N_("Show _Selection"), "<control>T",
+ NC_("view-action", "Show _Selection"), "<control>T",
N_("Display the selection outline"),
G_CALLBACK (view_toggle_selection_cmd_callback),
TRUE,
GIMP_HELP_VIEW_SHOW_SELECTION },
{ "view-show-layer-boundary", NULL,
- N_("Show _Layer Boundary"), NULL,
+ NC_("view-action", "Show _Layer Boundary"), NULL,
N_("Draw a border around the active layer"),
G_CALLBACK (view_toggle_layer_boundary_cmd_callback),
TRUE,
GIMP_HELP_VIEW_SHOW_LAYER_BOUNDARY },
{ "view-show-guides", NULL,
- N_("Show _Guides"), "<control><shift>T",
+ NC_("view-action", "Show _Guides"), "<control><shift>T",
N_("Display the image's guides"),
G_CALLBACK (view_toggle_guides_cmd_callback),
TRUE,
GIMP_HELP_VIEW_SHOW_GUIDES },
{ "view-show-grid", NULL,
- N_("S_how Grid"), NULL,
+ NC_("view-action", "S_how Grid"), NULL,
N_("Display the image's grid"),
G_CALLBACK (view_toggle_grid_cmd_callback),
FALSE,
GIMP_HELP_VIEW_SHOW_GRID },
{ "view-show-sample-points", NULL,
- N_("Show Sample Points"), NULL,
+ NC_("view-action", "Show Sample Points"), NULL,
N_("Display the image's color sample points"),
G_CALLBACK (view_toggle_sample_points_cmd_callback),
TRUE,
GIMP_HELP_VIEW_SHOW_SAMPLE_POINTS },
{ "view-snap-to-guides", NULL,
- N_("Sn_ap to Guides"), NULL,
+ NC_("view-action", "Sn_ap to Guides"), NULL,
N_("Tool operations snap to guides"),
G_CALLBACK (view_snap_to_guides_cmd_callback),
TRUE,
GIMP_HELP_VIEW_SNAP_TO_GUIDES },
{ "view-snap-to-grid", NULL,
- N_("Sna_p to Grid"), NULL,
+ NC_("view-action", "Sna_p to Grid"), NULL,
N_("Tool operations snap to the grid"),
G_CALLBACK (view_snap_to_grid_cmd_callback),
FALSE,
GIMP_HELP_VIEW_SNAP_TO_GRID },
{ "view-snap-to-canvas", NULL,
- N_("Snap to _Canvas Edges"), NULL,
+ NC_("view-action", "Snap to _Canvas Edges"), NULL,
N_("Tool operations snap to the canvas edges"),
G_CALLBACK (view_snap_to_canvas_cmd_callback),
FALSE,
GIMP_HELP_VIEW_SNAP_TO_CANVAS },
{ "view-snap-to-vectors", NULL,
- N_("Snap t_o Active Path"), NULL,
+ NC_("view-action", "Snap t_o Active Path"), NULL,
N_("Tool operations snap to the active path"),
G_CALLBACK (view_snap_to_vectors_cmd_callback),
FALSE,
GIMP_HELP_VIEW_SNAP_TO_VECTORS },
{ "view-show-menubar", NULL,
- N_("Show _Menubar"), NULL,
+ NC_("view-action", "Show _Menubar"), NULL,
N_("Show this window's menubar"),
G_CALLBACK (view_toggle_menubar_cmd_callback),
TRUE,
GIMP_HELP_VIEW_SHOW_MENUBAR },
{ "view-show-rulers", NULL,
- N_("Show R_ulers"), "<control><shift>R",
+ NC_("view-action", "Show R_ulers"), "<control><shift>R",
N_("Show this window's rulers"),
G_CALLBACK (view_toggle_rulers_cmd_callback),
TRUE,
GIMP_HELP_VIEW_SHOW_RULERS },
{ "view-show-scrollbars", NULL,
- N_("Show Scroll_bars"), NULL,
+ NC_("view-action", "Show Scroll_bars"), NULL,
N_("Show this window's scrollbars"),
G_CALLBACK (view_toggle_scrollbars_cmd_callback),
TRUE,
GIMP_HELP_VIEW_SHOW_SCROLLBARS },
{ "view-show-statusbar", NULL,
- N_("Show S_tatusbar"), NULL,
+ NC_("view-action", "Show S_tatusbar"), NULL,
N_("Show this window's statusbar"),
G_CALLBACK (view_toggle_statusbar_cmd_callback),
TRUE,
GIMP_HELP_VIEW_SHOW_STATUSBAR },
{ "view-fullscreen", GTK_STOCK_FULLSCREEN,
- N_("Fullscr_een"), "F11",
+ NC_("view-action", "Fullscr_een"), "F11",
N_("Toggle fullscreen view"),
G_CALLBACK (view_fullscreen_cmd_callback),
FALSE,
@@ -261,25 +261,25 @@
GIMP_HELP_VIEW_ZOOM_IN },
{ "view-zoom-out", GTK_STOCK_ZOOM_OUT,
- N_("Zoom _Out"), "minus",
+ NC_("view-zoom-action", "Zoom _Out"), "minus",
N_("Zoom out"),
GIMP_ACTION_SELECT_PREVIOUS, FALSE,
GIMP_HELP_VIEW_ZOOM_OUT },
{ "view-zoom-in", GTK_STOCK_ZOOM_IN,
- N_("Zoom _In"), "plus",
+ NC_("view-zoom-action", "Zoom _In"), "plus",
N_("Zoom in"),
GIMP_ACTION_SELECT_NEXT, FALSE,
GIMP_HELP_VIEW_ZOOM_IN },
{ "view-zoom-out-accel", GIMP_STOCK_CHAR_PICKER,
- N_("Zoom Out"), "KP_Subtract",
+ NC_("view-zoom-action", "Zoom Out"), "KP_Subtract",
N_("Zoom out"),
GIMP_ACTION_SELECT_PREVIOUS, FALSE,
GIMP_HELP_VIEW_ZOOM_OUT },
{ "view-zoom-in-accel", GIMP_STOCK_CHAR_PICKER,
- N_("Zoom In"), "KP_Add",
+ NC_("view-zoom-action", "Zoom In"), "KP_Add",
N_("Zoom in"),
GIMP_ACTION_SELECT_NEXT, FALSE,
GIMP_HELP_VIEW_ZOOM_IN },
@@ -298,61 +298,61 @@
static const GimpRadioActionEntry view_zoom_explicit_actions[] =
{
{ "view-zoom-16-1", NULL,
- N_("1_6:1 (1600%)"), NULL,
+ NC_("view-zoom-action", "1_6:1 (1600%)"), NULL,
N_("Zoom 16:1"),
160000,
GIMP_HELP_VIEW_ZOOM_IN },
{ "view-zoom-8-1", NULL,
- N_("_8:1 (800%)"), NULL,
+ NC_("view-zoom-action", "_8:1 (800%)"), NULL,
N_("Zoom 8:1"),
80000,
GIMP_HELP_VIEW_ZOOM_IN },
{ "view-zoom-4-1", NULL,
- N_("_4:1 (400%)"), NULL,
+ NC_("view-zoom-action", "_4:1 (400%)"), NULL,
N_("Zoom 4:1"),
40000,
GIMP_HELP_VIEW_ZOOM_IN },
{ "view-zoom-2-1", NULL,
- N_("_2:1 (200%)"), NULL,
+ NC_("view-zoom-action", "_2:1 (200%)"), NULL,
N_("Zoom 2:1"),
20000,
GIMP_HELP_VIEW_ZOOM_IN },
{ "view-zoom-1-1", GTK_STOCK_ZOOM_100,
- N_("_1:1 (100%)"), "1",
+ NC_("view-zoom-action", "_1:1 (100%)"), "1",
N_("Zoom 1:1"),
10000,
GIMP_HELP_VIEW_ZOOM_100 },
{ "view-zoom-1-2", NULL,
- N_("1:_2 (50%)"), NULL,
+ NC_("view-zoom-action", "1:_2 (50%)"), NULL,
N_("Zoom 1:2"),
5000,
GIMP_HELP_VIEW_ZOOM_OUT },
{ "view-zoom-1-4", NULL,
- N_("1:_4 (25%)"), NULL,
+ NC_("view-zoom-action", "1:_4 (25%)"), NULL,
N_("Zoom 1:4"),
2500,
GIMP_HELP_VIEW_ZOOM_OUT },
{ "view-zoom-1-8", NULL,
- N_("1:_8 (12.5%)"), NULL,
+ NC_("view-zoom-action", "1:_8 (12.5%)"), NULL,
N_("Zoom 1:8"),
1250,
GIMP_HELP_VIEW_ZOOM_OUT },
{ "view-zoom-1-16", NULL,
- N_("1:1_6 (6.25%)"), NULL,
+ NC_("view-zoom-action", "1:1_6 (6.25%)"), NULL,
N_("Zoom 1:16"),
625,
GIMP_HELP_VIEW_ZOOM_OUT },
{ "view-zoom-other", NULL,
- N_("Othe_r..."), NULL,
+ NC_("view-zoom-action", "Othe_r..."), NULL,
N_("Set a custom zoom factor"),
0,
GIMP_HELP_VIEW_ZOOM_OTHER }
@@ -361,31 +361,31 @@
static const GimpEnumActionEntry view_padding_color_actions[] =
{
{ "view-padding-color-theme", NULL,
- N_("From _Theme"), NULL,
+ NC_("view-padding-color", "From _Theme"), NULL,
N_("Use the current theme's background color"),
GIMP_CANVAS_PADDING_MODE_DEFAULT, FALSE,
GIMP_HELP_VIEW_PADDING_COLOR },
{ "view-padding-color-light-check", NULL,
- N_("_Light Check Color"), NULL,
+ NC_("view-padding-color", "_Light Check Color"), NULL,
N_("Use the light check color"),
GIMP_CANVAS_PADDING_MODE_LIGHT_CHECK, FALSE,
GIMP_HELP_VIEW_PADDING_COLOR },
{ "view-padding-color-dark-check", NULL,
- N_("_Dark Check Color"), NULL,
+ NC_("view-padding-color", "_Dark Check Color"), NULL,
N_("Use the dark check color"),
GIMP_CANVAS_PADDING_MODE_DARK_CHECK, FALSE,
GIMP_HELP_VIEW_PADDING_COLOR },
{ "view-padding-color-custom", GTK_STOCK_SELECT_COLOR,
- N_("Select _Custom Color..."), NULL,
+ NC_("view-padding-color", "Select _Custom Color..."), NULL,
N_("Use an arbitrary color"),
GIMP_CANVAS_PADDING_MODE_CUSTOM, FALSE,
GIMP_HELP_VIEW_PADDING_COLOR },
{ "view-padding-color-prefs", GIMP_STOCK_RESET,
- N_("As in _Preferences"), NULL,
+ NC_("view-padding-color", "As in _Preferences"), NULL,
N_("Reset padding color to what's configured in preferences"),
GIMP_CANVAS_PADDING_MODE_RESET, FALSE,
GIMP_HELP_VIEW_PADDING_COLOR }
@@ -473,37 +473,37 @@
{
GtkAction *action;
- gimp_action_group_add_actions (group,
+ gimp_action_group_add_actions (group, "view-action",
view_actions,
G_N_ELEMENTS (view_actions));
- gimp_action_group_add_toggle_actions (group,
+ gimp_action_group_add_toggle_actions (group, "view-action",
view_toggle_actions,
G_N_ELEMENTS (view_toggle_actions));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, "view-zoom-action",
view_zoom_actions,
G_N_ELEMENTS (view_zoom_actions),
G_CALLBACK (view_zoom_cmd_callback));
- gimp_action_group_add_radio_actions (group,
+ gimp_action_group_add_radio_actions (group, "view-zoom-action",
view_zoom_explicit_actions,
G_N_ELEMENTS (view_zoom_explicit_actions),
NULL,
10000,
G_CALLBACK (view_zoom_explicit_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, "view-padding-color",
view_padding_color_actions,
G_N_ELEMENTS (view_padding_color_actions),
G_CALLBACK (view_padding_color_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, NULL,
view_scroll_horizontal_actions,
G_N_ELEMENTS (view_scroll_horizontal_actions),
G_CALLBACK (view_scroll_horizontal_cmd_callback));
- gimp_action_group_add_enum_actions (group,
+ gimp_action_group_add_enum_actions (group, NULL,
view_scroll_vertical_actions,
G_N_ELEMENTS (view_scroll_vertical_actions),
G_CALLBACK (view_scroll_vertical_cmd_callback));
Modified: trunk/app/actions/window-actions.c
==============================================================================
--- trunk/app/actions/window-actions.c (original)
+++ trunk/app/actions/window-actions.c Wed Dec 3 15:27:42 2008
@@ -178,7 +178,8 @@
radio_group = g_object_get_data (G_OBJECT (group),
"change-to-screen-radio-group");
- radio_group = gimp_action_group_add_radio_actions (group, entries, n_screens,
+ radio_group = gimp_action_group_add_radio_actions (group, NULL,
+ entries, n_screens,
radio_group, 0,
G_CALLBACK (window_move_to_screen_cmd_callback));
g_object_set_data (G_OBJECT (group), "change-to-screen-radio-group",
Modified: trunk/app/actions/windows-actions.c
==============================================================================
--- trunk/app/actions/windows-actions.c (original)
+++ trunk/app/actions/windows-actions.c Wed Dec 3 15:27:42 2008
@@ -77,12 +77,15 @@
static const GimpActionEntry windows_actions[] =
{
- { "windows-menu", NULL, N_("_Windows") },
- { "windows-docks-menu", NULL, N_("_Recently Closed Docks") },
- { "windows-dialogs-menu", NULL, N_("_Dockable Dialogs") },
+ { "windows-menu", NULL, NC_("windows-action",
+ "_Windows") },
+ { "windows-docks-menu", NULL, NC_("windows-action",
+ "_Recently Closed Docks") },
+ { "windows-dialogs-menu", NULL, NC_("windows-action",
+ "_Dockable Dialogs") },
{ "windows-show-toolbox", NULL,
- N_("Tool_box"), "<control>B",
+ NC_("windows-action", "Tool_box"), "<control>B",
N_("Raise the toolbox"),
G_CALLBACK (windows_show_toolbox_cmd_callback),
GIMP_HELP_TOOLBOX }
@@ -94,7 +97,7 @@
{
GList *list;
- gimp_action_group_add_actions (group,
+ gimp_action_group_add_actions (group, "windows-action",
windows_actions,
G_N_ELEMENTS (windows_actions));
@@ -215,7 +218,7 @@
entry.callback = G_CALLBACK (windows_show_display_cmd_callback);
entry.help_id = NULL;
- gimp_action_group_add_actions (group, &entry, 1);
+ gimp_action_group_add_actions (group, NULL, &entry, 1);
action = gtk_action_group_get_action (GTK_ACTION_GROUP (group),
action_name);
@@ -280,7 +283,7 @@
entry.callback = G_CALLBACK (windows_show_dock_cmd_callback);
entry.help_id = GIMP_HELP_WINDOWS_SHOW_DOCK;
- gimp_action_group_add_actions (group, &entry, 1);
+ gimp_action_group_add_actions (group, NULL, &entry, 1);
action = gtk_action_group_get_action (GTK_ACTION_GROUP (group),
action_name);
@@ -368,7 +371,7 @@
entry.callback = G_CALLBACK (windows_open_recent_cmd_callback);
entry.help_id = GIMP_HELP_WINDOWS_OPEN_RECENT_DOCK;
- gimp_action_group_add_actions (group, &entry, 1);
+ gimp_action_group_add_actions (group, NULL, &entry, 1);
action = gtk_action_group_get_action (GTK_ACTION_GROUP (group),
action_name);
Modified: trunk/app/widgets/gimpactiongroup.c
==============================================================================
--- trunk/app/widgets/gimpactiongroup.c (original)
+++ trunk/app/widgets/gimpactiongroup.c Wed Dec 3 15:27:42 2008
@@ -352,6 +352,7 @@
void
gimp_action_group_add_actions (GimpActionGroup *group,
+ const gchar *label_context,
const GimpActionEntry *entries,
guint n_entries)
{
@@ -368,8 +369,11 @@
if (! gimp_action_group_check_unique_action (group, entries[i].name))
continue;
- label = (gchar *) g_strip_context (entries[i].label,
- gettext (entries[i].label));
+ if (label_context)
+ label = (gchar *) g_dpgettext2 (NULL, label_context, entries[i].label);
+ else
+ label = gettext (entries[i].label);
+
tooltip = gettext (entries[i].tooltip);
if (! group->mnemonics)
@@ -401,6 +405,7 @@
void
gimp_action_group_add_toggle_actions (GimpActionGroup *group,
+ const gchar *label_context,
const GimpToggleActionEntry *entries,
guint n_entries)
{
@@ -417,8 +422,11 @@
if (! gimp_action_group_check_unique_action (group, entries[i].name))
continue;
- label = (gchar *) g_strip_context (entries[i].label,
- gettext (entries[i].label));
+ if (label_context)
+ label = (gchar *) g_dpgettext2 (NULL, label_context, entries[i].label);
+ else
+ label = gettext (entries[i].label);
+
tooltip = gettext (entries[i].tooltip);
if (! group->mnemonics)
@@ -452,6 +460,7 @@
GSList *
gimp_action_group_add_radio_actions (GimpActionGroup *group,
+ const gchar *label_context,
const GimpRadioActionEntry *entries,
guint n_entries,
GSList *radio_group,
@@ -472,8 +481,11 @@
if (! gimp_action_group_check_unique_action (group, entries[i].name))
continue;
- label = (gchar *) g_strip_context (entries[i].label,
- gettext (entries[i].label));
+ if (label_context)
+ label = (gchar *) g_dpgettext2 (NULL, label_context, entries[i].label);
+ else
+ label = gettext (entries[i].label);
+
tooltip = gettext (entries[i].tooltip);
if (! group->mnemonics)
@@ -517,6 +529,7 @@
void
gimp_action_group_add_enum_actions (GimpActionGroup *group,
+ const gchar *label_context,
const GimpEnumActionEntry *entries,
guint n_entries,
GCallback callback)
@@ -534,8 +547,11 @@
if (! gimp_action_group_check_unique_action (group, entries[i].name))
continue;
- label = (gchar *) g_strip_context (entries[i].label,
- gettext (entries[i].label));
+ if (label_context)
+ label = (gchar *) g_dpgettext2 (NULL, label_context, entries[i].label);
+ else
+ label = gettext (entries[i].label);
+
tooltip = gettext (entries[i].tooltip);
if (! group->mnemonics)
@@ -569,6 +585,7 @@
void
gimp_action_group_add_string_actions (GimpActionGroup *group,
+ const gchar *label_context,
const GimpStringActionEntry *entries,
guint n_entries,
GCallback callback)
@@ -586,8 +603,11 @@
if (! gimp_action_group_check_unique_action (group, entries[i].name))
continue;
- label = (gchar *) g_strip_context (entries[i].label,
- gettext (entries[i].label));
+ if (label_context)
+ label = (gchar *) g_dpgettext2 (NULL, label_context, entries[i].label);
+ else
+ label = gettext (entries[i].label);
+
tooltip = gettext (entries[i].tooltip);
if (! group->mnemonics)
Modified: trunk/app/widgets/gimpactiongroup.h
==============================================================================
--- trunk/app/widgets/gimpactiongroup.h (original)
+++ trunk/app/widgets/gimpactiongroup.h Wed Dec 3 15:27:42 2008
@@ -145,25 +145,30 @@
gpointer update_data);
void gimp_action_group_add_actions (GimpActionGroup *group,
+ const gchar *label_context,
const GimpActionEntry *entries,
guint n_entries);
void gimp_action_group_add_toggle_actions (GimpActionGroup *group,
+ const gchar *label_context,
const GimpToggleActionEntry *entries,
guint n_entries);
GSList *gimp_action_group_add_radio_actions (GimpActionGroup *group,
+ const gchar *label_context,
const GimpRadioActionEntry *entries,
guint n_entries,
GSList *radio_group,
gint value,
GCallback callback);
void gimp_action_group_add_enum_actions (GimpActionGroup *group,
+ const gchar *label_context,
const GimpEnumActionEntry *entries,
guint n_entries,
GCallback callback);
void gimp_action_group_add_string_actions (GimpActionGroup *group,
+ const gchar *label_context,
const GimpStringActionEntry *entries,
- guint n_entries,
- GCallback callback);
+ guint n_entries,
+ GCallback callback);
void gimp_action_group_add_plug_in_actions (GimpActionGroup *group,
const GimpPlugInActionEntry *entries,
guint n_entries,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
