gimp r25777 - in trunk: . app/core app/dialogs app/tools libgimpwidgets plug-ins/gfig

[neo svn gnome org]

Author: neo
Date: Fri May 23 14:09:55 2008
New Revision: 25777
URL: http://svn.gnome.org/viewvc/gimp?rev=25777&view=rev

Log:
2008-05-23  Sven Neumann  <sven gimp org>

	* 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.


Modified:
   trunk/ChangeLog
   trunk/app/core/gimpchannel-select.c
   trunk/app/core/gimpdrawable-bucket-fill.c
   trunk/app/core/gimpdrawable-transform.c
   trunk/app/core/gimpimage-crop.c
   trunk/app/dialogs/image-scale-dialog.c
   trunk/app/tools/gimpbycolorselecttool.c
   trunk/app/tools/gimpfliptool.c
   trunk/app/tools/gimpforegroundselecttool.c
   trunk/app/tools/gimpfreeselecttool.c
   trunk/app/tools/gimpfuzzyselecttool.c
   trunk/app/tools/gimpmovetool.c
   trunk/app/tools/gimpperspectivetool.c
   trunk/app/tools/gimppolygonselecttool.c
   trunk/app/tools/gimprotatetool.c
   trunk/app/tools/gimpscaletool.c
   trunk/app/tools/gimpsheartool.c
   trunk/libgimpwidgets/gimpcolorprofilestore.c
   trunk/plug-ins/gfig/gfig-dialog.c

Modified: trunk/app/core/gimpchannel-select.c
==============================================================================
--- trunk/app/core/gimpchannel-select.c	(original)
+++ trunk/app/core/gimpchannel-select.c	Fri May 23 14:09:55 2008
@@ -18,6 +18,8 @@
 
 #include "config.h"
 
+#include <string.h>
+
 #include <glib-object.h>
 
 #include "libgimpbase/gimpbase.h"
@@ -55,7 +57,7 @@
   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 @@
   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 @@
   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 @@
   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 @@
   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,

Modified: trunk/app/core/gimpdrawable-bucket-fill.c
==============================================================================
--- trunk/app/core/gimpdrawable-bucket-fill.c	(original)
+++ trunk/app/core/gimpdrawable-bucket-fill.c	Fri May 23 14:09:55 2008
@@ -18,6 +18,8 @@
 
 #include "config.h"
 
+#include <string.h>
+
 #include <glib-object.h>
 
 #include "libgimpcolor/gimpcolor.h"
@@ -281,7 +283,7 @@
   /*  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);

Modified: trunk/app/core/gimpdrawable-transform.c
==============================================================================
--- trunk/app/core/gimpdrawable-transform.c	(original)
+++ trunk/app/core/gimpdrawable-transform.c	Fri May 23 14:09:55 2008
@@ -19,6 +19,7 @@
 #include "config.h"
 
 #include <stdlib.h>
+#include <string.h>
 
 #include <glib-object.h>
 
@@ -624,7 +625,8 @@
 
   /* 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 @@
 
   /* 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);

Modified: trunk/app/core/gimpimage-crop.c
==============================================================================
--- trunk/app/core/gimpimage-crop.c	(original)
+++ trunk/app/core/gimpimage-crop.c	Fri May 23 14:09:55 2008
@@ -123,7 +123,7 @@
 
       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"));

Modified: trunk/app/dialogs/image-scale-dialog.c
==============================================================================
--- trunk/app/dialogs/image-scale-dialog.c	(original)
+++ trunk/app/dialogs/image-scale-dialog.c	Fri May 23 14:09:55 2008
@@ -18,6 +18,8 @@
 
 #include "config.h"
 
+#include <string.h>
+
 #include <gtk/gtk.h>
 
 #include "libgimpbase/gimpbase.h"
@@ -106,7 +108,7 @@
 
   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,

Modified: trunk/app/tools/gimpbycolorselecttool.c
==============================================================================
--- trunk/app/tools/gimpbycolorselecttool.c	(original)
+++ trunk/app/tools/gimpbycolorselecttool.c	Fri May 23 14:09:55 2008
@@ -20,6 +20,8 @@
 
 #include "config.h"
 
+#include <string.h>
+
 #include <gtk/gtk.h>
 
 #include "libgimpcolor/gimpcolor.h"
@@ -77,7 +79,7 @@
 
   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;
 }
 

Modified: trunk/app/tools/gimpfliptool.c
==============================================================================
--- trunk/app/tools/gimpfliptool.c	(original)
+++ trunk/app/tools/gimpfliptool.c	Fri May 23 14:09:55 2008
@@ -18,6 +18,8 @@
 
 #include "config.h"
 
+#include <string.h>
+
 #include <gtk/gtk.h>
 
 #include "libgimpwidgets/gimpwidgets.h"
@@ -109,7 +111,7 @@
   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

Modified: trunk/app/tools/gimpforegroundselecttool.c
==============================================================================
--- trunk/app/tools/gimpforegroundselecttool.c	(original)
+++ trunk/app/tools/gimpforegroundselecttool.c	Fri May 23 14:09:55 2008
@@ -761,7 +761,7 @@
   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,

Modified: trunk/app/tools/gimpfreeselecttool.c
==============================================================================
--- trunk/app/tools/gimpfreeselecttool.c	(original)
+++ trunk/app/tools/gimpfreeselecttool.c	Fri May 23 14:09:55 2008
@@ -1248,7 +1248,7 @@
   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,

Modified: trunk/app/tools/gimpfuzzyselecttool.c
==============================================================================
--- trunk/app/tools/gimpfuzzyselecttool.c	(original)
+++ trunk/app/tools/gimpfuzzyselecttool.c	Fri May 23 14:09:55 2008
@@ -20,6 +20,8 @@
 
 #include "config.h"
 
+#include <string.h>
+
 #include <gtk/gtk.h>
 
 #include "libgimpwidgets/gimpwidgets.h"
@@ -75,7 +77,7 @@
 
   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;
 }
 

Modified: trunk/app/tools/gimpmovetool.c
==============================================================================
--- trunk/app/tools/gimpmovetool.c	(original)
+++ trunk/app/tools/gimpmovetool.c	Fri May 23 14:09:55 2008
@@ -18,6 +18,8 @@
 
 #include "config.h"
 
+#include <string.h>
+
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
@@ -122,7 +124,7 @@
                 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,

Modified: trunk/app/tools/gimpperspectivetool.c
==============================================================================
--- trunk/app/tools/gimpperspectivetool.c	(original)
+++ trunk/app/tools/gimpperspectivetool.c	Fri May 23 14:09:55 2008
@@ -18,6 +18,8 @@
 
 #include "config.h"
 
+#include <string.h>
+
 #include <gtk/gtk.h>
 
 #include "libgimpwidgets/gimpwidgets.h"
@@ -94,7 +96,7 @@
   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;

Modified: trunk/app/tools/gimppolygonselecttool.c
==============================================================================
--- trunk/app/tools/gimppolygonselecttool.c	(original)
+++ trunk/app/tools/gimppolygonselecttool.c	Fri May 23 14:09:55 2008
@@ -23,6 +23,8 @@
 
 #include "config.h"
 
+#include <string.h>
+
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
@@ -571,7 +573,7 @@
   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,

Modified: trunk/app/tools/gimprotatetool.c
==============================================================================
--- trunk/app/tools/gimprotatetool.c	(original)
+++ trunk/app/tools/gimprotatetool.c	Fri May 23 14:09:55 2008
@@ -18,6 +18,8 @@
 
 #include "config.h"
 
+#include <string.h>
+
 #include <gtk/gtk.h>
 
 #include "libgimpmath/gimpmath.h"
@@ -110,7 +112,7 @@
 
   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;

Modified: trunk/app/tools/gimpscaletool.c
==============================================================================
--- trunk/app/tools/gimpscaletool.c	(original)
+++ trunk/app/tools/gimpscaletool.c	Fri May 23 14:09:55 2008
@@ -103,7 +103,7 @@
 
   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;

Modified: trunk/app/tools/gimpsheartool.c
==============================================================================
--- trunk/app/tools/gimpsheartool.c	(original)
+++ trunk/app/tools/gimpsheartool.c	Fri May 23 14:09:55 2008
@@ -19,6 +19,7 @@
 #include "config.h"
 
 #include <stdlib.h>
+#include <string.h>
 
 #include <gtk/gtk.h>
 
@@ -106,7 +107,7 @@
 
   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;

Modified: trunk/libgimpwidgets/gimpcolorprofilestore.c
==============================================================================
--- trunk/libgimpwidgets/gimpcolorprofilestore.c	(original)
+++ trunk/libgimpwidgets/gimpcolorprofilestore.c	Fri May 23 14:09:55 2008
@@ -277,7 +277,7 @@
   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);
 

Modified: trunk/plug-ins/gfig/gfig-dialog.c
==============================================================================
--- trunk/plug-ins/gfig/gfig-dialog.c	(original)
+++ trunk/plug-ins/gfig/gfig-dialog.c	Fri May 23 14:09:55 2008
@@ -490,7 +490,7 @@
   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),