diff --git a/ChangeLog b/ChangeLog index 500c458ca1..9c2210b4be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,25 @@ +2008-05-23 Sven Neumann + + * app/core/gimpchannel-select.c + * app/core/gimpdrawable-bucket-fill.c + * app/core/gimpdrawable-transform.c + * app/core/gimpimage-crop.c + * app/dialogs/image-scale-dialog.c + * app/tools/gimpbycolorselecttool.c + * app/tools/gimpfliptool.c + * app/tools/gimpforegroundselecttool.c + * app/tools/gimpfreeselecttool.c + * app/tools/gimpfuzzyselecttool.c + * app/tools/gimpmovetool.c + * app/tools/gimpperspectivetool.c + * app/tools/gimppolygonselecttool.c + * app/tools/gimprotatetool.c + * app/tools/gimpscaletool.c + * app/tools/gimpsheartool.c + * libgimpwidgets/gimpcolorprofilestore.c + * plug-ins/gfig/gfig-dialog.c: use C_() instead of Q_() for + translations with context. + 2008-05-23 Sven Neumann * autogen.sh (GLIB_REQUIRED_VERSION): require glib-gettextize 2.16. diff --git a/app/core/gimpchannel-select.c b/app/core/gimpchannel-select.c index c3edc27891..c4bea594bc 100644 --- a/app/core/gimpchannel-select.c +++ b/app/core/gimpchannel-select.c @@ -18,6 +18,8 @@ #include "config.h" +#include + #include #include "libgimpbase/gimpbase.h" @@ -55,7 +57,7 @@ gimp_channel_select_rectangle (GimpChannel *channel, g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (channel))); if (push_undo) - gimp_channel_push_undo (channel, Q_("command|Rectangle Select")); + gimp_channel_push_undo (channel, C_("command", "Rectangle Select")); /* if applicable, replace the current selection */ if (op == GIMP_CHANNEL_OP_REPLACE) @@ -106,7 +108,7 @@ gimp_channel_select_ellipse (GimpChannel *channel, g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (channel))); if (push_undo) - gimp_channel_push_undo (channel, Q_("command|Ellipse Select")); + gimp_channel_push_undo (channel, C_("command", "Ellipse Select")); /* if applicable, replace the current selection */ if (op == GIMP_CHANNEL_OP_REPLACE) @@ -160,7 +162,7 @@ gimp_channel_select_round_rect (GimpChannel *channel, g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (channel))); if (push_undo) - gimp_channel_push_undo (channel, Q_("command|Rounded Rectangle Select")); + gimp_channel_push_undo (channel, C_("command", "Rounded Rectangle Select")); /* if applicable, replace the current selection */ if (op == GIMP_CHANNEL_OP_REPLACE) @@ -515,7 +517,7 @@ gimp_channel_select_fuzzy (GimpChannel *channel, if (! sample_merged) gimp_item_offsets (GIMP_ITEM (drawable), &add_on_x, &add_on_y); - gimp_channel_select_channel (channel, Q_("command|Fuzzy Select"), + gimp_channel_select_channel (channel, C_("command", "Fuzzy Select"), add_on, add_on_x, add_on_y, op, feather, @@ -562,7 +564,7 @@ gimp_channel_select_by_color (GimpChannel *channel, if (! sample_merged) gimp_item_offsets (GIMP_ITEM (drawable), &add_on_x, &add_on_y); - gimp_channel_select_channel (channel, Q_("command|Select by Color"), + gimp_channel_select_channel (channel, C_("command", "Select by Color"), add_on, add_on_x, add_on_y, op, feather, diff --git a/app/core/gimpdrawable-bucket-fill.c b/app/core/gimpdrawable-bucket-fill.c index aea11d2ede..77746a6b9b 100644 --- a/app/core/gimpdrawable-bucket-fill.c +++ b/app/core/gimpdrawable-bucket-fill.c @@ -18,6 +18,8 @@ #include "config.h" +#include + #include #include "libgimpcolor/gimpcolor.h" @@ -281,7 +283,7 @@ gimp_drawable_bucket_fill_full (GimpDrawable *drawable, /* Apply it to the image */ pixel_region_init (&bufPR, buf_tiles, 0, 0, (x2 - x1), (y2 - y1), FALSE); gimp_drawable_apply_region (drawable, &bufPR, - TRUE, Q_("command|Bucket Fill"), + TRUE, C_("command", "Bucket Fill"), opacity, paint_mode, NULL, x1, y1); tile_manager_unref (buf_tiles); diff --git a/app/core/gimpdrawable-transform.c b/app/core/gimpdrawable-transform.c index c4c4db1005..978c2c05fb 100644 --- a/app/core/gimpdrawable-transform.c +++ b/app/core/gimpdrawable-transform.c @@ -19,6 +19,7 @@ #include "config.h" #include +#include #include @@ -624,7 +625,8 @@ gimp_drawable_transform_flip (GimpDrawable *drawable, /* Start a transform undo group */ gimp_image_undo_group_start (image, - GIMP_UNDO_GROUP_TRANSFORM, Q_("command|Flip")); + GIMP_UNDO_GROUP_TRANSFORM, + C_("command", "Flip")); /* Cut/Copy from the specified drawable */ orig_tiles = gimp_drawable_transform_cut (drawable, context, &new_layer); @@ -710,7 +712,8 @@ gimp_drawable_transform_rotate (GimpDrawable *drawable, /* Start a transform undo group */ gimp_image_undo_group_start (image, - GIMP_UNDO_GROUP_TRANSFORM, Q_("command|Rotate")); + GIMP_UNDO_GROUP_TRANSFORM, + C_("command", "Rotate")); /* Cut/Copy from the specified drawable */ orig_tiles = gimp_drawable_transform_cut (drawable, context, &new_layer); diff --git a/app/core/gimpimage-crop.c b/app/core/gimpimage-crop.c index 497006a1e3..929b7f3e65 100644 --- a/app/core/gimpimage-crop.c +++ b/app/core/gimpimage-crop.c @@ -123,7 +123,7 @@ gimp_image_crop (GimpImage *image, if (crop_layers) gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_IMAGE_CROP, - Q_("command|Crop Image")); + C_("command", "Crop Image")); else gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_IMAGE_RESIZE, _("Resize Image")); diff --git a/app/dialogs/image-scale-dialog.c b/app/dialogs/image-scale-dialog.c index 8f03e9cf5f..97917bb0e1 100644 --- a/app/dialogs/image-scale-dialog.c +++ b/app/dialogs/image-scale-dialog.c @@ -18,6 +18,8 @@ #include "config.h" +#include + #include #include "libgimpbase/gimpbase.h" @@ -106,7 +108,7 @@ image_scale_dialog_new (GimpImage *image, dialog->image = image; dialog->dialog = scale_dialog_new (GIMP_VIEWABLE (image), context, - Q_("dialog-title|Scale Image"), + C_("dialog-title", "Scale Image"), "gimp-image-scale", parent, gimp_standard_help_func, diff --git a/app/tools/gimpbycolorselecttool.c b/app/tools/gimpbycolorselecttool.c index 916bfe86c2..3bebc3d2aa 100644 --- a/app/tools/gimpbycolorselecttool.c +++ b/app/tools/gimpbycolorselecttool.c @@ -20,6 +20,8 @@ #include "config.h" +#include + #include #include "libgimpcolor/gimpcolor.h" @@ -77,7 +79,7 @@ gimp_by_color_select_tool_class_init (GimpByColorSelectToolClass *klass) region_class = GIMP_REGION_SELECT_TOOL_CLASS (klass); - region_class->undo_desc = Q_("command|Select by Color"); + region_class->undo_desc = C_("command", "Select by Color"); region_class->get_mask = gimp_by_color_select_tool_get_mask; } diff --git a/app/tools/gimpfliptool.c b/app/tools/gimpfliptool.c index d4868f8d24..d5fba0be83 100644 --- a/app/tools/gimpfliptool.c +++ b/app/tools/gimpfliptool.c @@ -18,6 +18,8 @@ #include "config.h" +#include + #include #include "libgimpwidgets/gimpwidgets.h" @@ -109,7 +111,7 @@ gimp_flip_tool_init (GimpFlipTool *flip_tool) gimp_tool_control_set_toggle_tool_cursor (tool->control, GIMP_TOOL_CURSOR_FLIP_VERTICAL); - tr_tool->undo_desc = Q_("command|Flip"); + tr_tool->undo_desc = C_("command", "Flip"); } static void diff --git a/app/tools/gimpforegroundselecttool.c b/app/tools/gimpforegroundselecttool.c index 57ac51512b..0bc2192d22 100644 --- a/app/tools/gimpforegroundselecttool.c +++ b/app/tools/gimpforegroundselecttool.c @@ -761,7 +761,7 @@ gimp_foreground_select_tool_apply (GimpForegroundSelectTool *fg_select, g_return_if_fail (fg_select->mask != NULL); gimp_channel_select_channel (gimp_image_get_mask (display->image), - Q_("command|Foreground Select"), + C_("command", "Foreground Select"), fg_select->mask, 0, 0, options->operation, options->feather, diff --git a/app/tools/gimpfreeselecttool.c b/app/tools/gimpfreeselecttool.c index 376bc3470e..e7a145165c 100644 --- a/app/tools/gimpfreeselecttool.c +++ b/app/tools/gimpfreeselecttool.c @@ -1248,7 +1248,7 @@ gimp_free_select_tool_real_select (GimpFreeSelectTool *fst, Private *priv = GET_PRIVATE (fst); gimp_channel_select_polygon (gimp_image_get_mask (display->image), - Q_("command|Free Select"), + C_("command", "Free Select"), priv->n_points, priv->points, priv->operation_at_start, diff --git a/app/tools/gimpfuzzyselecttool.c b/app/tools/gimpfuzzyselecttool.c index c08aae4400..c736f956a3 100644 --- a/app/tools/gimpfuzzyselecttool.c +++ b/app/tools/gimpfuzzyselecttool.c @@ -20,6 +20,8 @@ #include "config.h" +#include + #include #include "libgimpwidgets/gimpwidgets.h" @@ -75,7 +77,7 @@ gimp_fuzzy_select_tool_class_init (GimpFuzzySelectToolClass *klass) region_class = GIMP_REGION_SELECT_TOOL_CLASS (klass); - region_class->undo_desc = Q_("command|Fuzzy Select"); + region_class->undo_desc = C_("command", "Fuzzy Select"); region_class->get_mask = gimp_fuzzy_select_tool_get_mask; } diff --git a/app/tools/gimpmovetool.c b/app/tools/gimpmovetool.c index c62341b4f2..53cde1726f 100644 --- a/app/tools/gimpmovetool.c +++ b/app/tools/gimpmovetool.c @@ -18,6 +18,8 @@ #include "config.h" +#include + #include #include @@ -122,7 +124,7 @@ gimp_move_tool_register (GimpToolRegisterCallback callback, gimp_move_options_gui, 0, "gimp-move-tool", - Q_("tool|Move"), + C_("tool", "Move"), _("Move Tool: Move layers, selections, and other objects"), N_("_Move"), "M", NULL, GIMP_HELP_TOOL_MOVE, diff --git a/app/tools/gimpperspectivetool.c b/app/tools/gimpperspectivetool.c index 83dd135f86..3ff86dc309 100644 --- a/app/tools/gimpperspectivetool.c +++ b/app/tools/gimpperspectivetool.c @@ -18,6 +18,8 @@ #include "config.h" +#include + #include #include "libgimpwidgets/gimpwidgets.h" @@ -94,7 +96,7 @@ gimp_perspective_tool_init (GimpPerspectiveTool *perspective_tool) gimp_tool_control_set_tool_cursor (tool->control, GIMP_TOOL_CURSOR_PERSPECTIVE); - tr_tool->undo_desc = Q_("command|Perspective"); + tr_tool->undo_desc = C_("command", "Perspective"); tr_tool->progress_text = _("Perspective transformation"); tr_tool->use_grid = TRUE; diff --git a/app/tools/gimppolygonselecttool.c b/app/tools/gimppolygonselecttool.c index 02a9e84203..5de8d854d2 100644 --- a/app/tools/gimppolygonselecttool.c +++ b/app/tools/gimppolygonselecttool.c @@ -23,6 +23,8 @@ #include "config.h" +#include + #include #include @@ -571,7 +573,7 @@ gimp_polygon_select_tool_real_select (GimpPolygonSelectTool *poly_sel_tool, options = GIMP_SELECTION_TOOL_GET_OPTIONS (poly_sel_tool); gimp_channel_select_polygon (gimp_image_get_mask (display->image), - Q_("command|Polygon Select"), + C_("command", "Polygon Select"), poly_sel_tool->n_points, poly_sel_tool->points, options->operation, diff --git a/app/tools/gimprotatetool.c b/app/tools/gimprotatetool.c index 501f0f0c87..41fad58138 100644 --- a/app/tools/gimprotatetool.c +++ b/app/tools/gimprotatetool.c @@ -18,6 +18,8 @@ #include "config.h" +#include + #include #include "libgimpmath/gimpmath.h" @@ -110,7 +112,7 @@ gimp_rotate_tool_init (GimpRotateTool *rotate_tool) gimp_tool_control_set_tool_cursor (tool->control, GIMP_TOOL_CURSOR_ROTATE); - tr_tool->undo_desc = Q_("command|Rotate"); + tr_tool->undo_desc = C_("command", "Rotate"); tr_tool->progress_text = _("Rotating"); tr_tool->use_grid = TRUE; diff --git a/app/tools/gimpscaletool.c b/app/tools/gimpscaletool.c index aee9813e11..6c025e3f59 100644 --- a/app/tools/gimpscaletool.c +++ b/app/tools/gimpscaletool.c @@ -103,7 +103,7 @@ gimp_scale_tool_init (GimpScaleTool *scale_tool) gimp_tool_control_set_tool_cursor (tool->control, GIMP_TOOL_CURSOR_RESIZE); - tr_tool->undo_desc = Q_("command|Scale"); + tr_tool->undo_desc = C_("command", "Scale"); tr_tool->progress_text = _("Scaling"); tr_tool->use_grid = TRUE; diff --git a/app/tools/gimpsheartool.c b/app/tools/gimpsheartool.c index 5910741256..5690194a9d 100644 --- a/app/tools/gimpsheartool.c +++ b/app/tools/gimpsheartool.c @@ -19,6 +19,7 @@ #include "config.h" #include +#include #include @@ -106,7 +107,7 @@ gimp_shear_tool_init (GimpShearTool *shear_tool) gimp_tool_control_set_tool_cursor (tool->control, GIMP_TOOL_CURSOR_SHEAR); - tr_tool->undo_desc = Q_("command|Shear"); + tr_tool->undo_desc = C_("command", "Shear"); tr_tool->progress_text = _("Shearing"); tr_tool->use_grid = TRUE; diff --git a/libgimpwidgets/gimpcolorprofilestore.c b/libgimpwidgets/gimpcolorprofilestore.c index ada4ae92af..ea891a71a1 100644 --- a/libgimpwidgets/gimpcolorprofilestore.c +++ b/libgimpwidgets/gimpcolorprofilestore.c @@ -277,7 +277,7 @@ gimp_color_profile_store_add (GimpColorProfileStore *store, g_return_if_fail (label != NULL || filename == NULL); if (! filename && ! label) - label = Q_("profile|None"); + label = C_("profile", "None"); gimp_color_profile_store_get_separator (store, &separator, TRUE); diff --git a/plug-ins/gfig/gfig-dialog.c b/plug-ins/gfig/gfig-dialog.c index d446013bff..0bdb046295 100644 --- a/plug-ins/gfig/gfig-dialog.c +++ b/plug-ins/gfig/gfig-dialog.c @@ -490,7 +490,7 @@ gfig_dialog (void) gtk_widget_show (toggle); /* "snap to grid" checkbutton at bottom of style frame */ - toggle = gtk_check_button_new_with_label (Q_("checkbutton|Snap to grid")); + toggle = gtk_check_button_new_with_label (C_("checkbutton", "Snap to grid")); gtk_box_pack_end (GTK_BOX (vbox), toggle, FALSE, FALSE, 0); g_signal_connect (toggle, "toggled", G_CALLBACK (gimp_toggle_button_update),