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

app/core/gimpchannel-select.c app/core/gimpdrawable-bucket-fill.c 

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.

svn path=/trunk/; revision=25777
This commit is contained in:
Sven Neumann 2008-05-23 14:09:55 +00:00 committed by Sven Neumann
parent e5f0bd3b3b
commit 5aa59b3ba0
19 changed files with 69 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ChangeLog
View File

@ -1,3 +1,25 @@
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.
2008-05-23 Sven Neumann <sven@gimp.org> 2008-05-23 Sven Neumann <sven@gimp.org>
* autogen.sh (GLIB_REQUIRED_VERSION): require glib-gettextize 2.16. * autogen.sh (GLIB_REQUIRED_VERSION): require glib-gettextize 2.16.

12
app/core/gimpchannel-select.c
View File

@ -18,6 +18,8 @@
#include "config.h" #include "config.h"
#include <string.h>
#include <glib-object.h> #include <glib-object.h>
#include "libgimpbase/gimpbase.h" #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))); g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (channel)));
if (push_undo) 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 applicable, replace the current selection */
if (op == GIMP_CHANNEL_OP_REPLACE) 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))); g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (channel)));
if (push_undo) 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 applicable, replace the current selection */
if (op == GIMP_CHANNEL_OP_REPLACE) 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))); g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (channel)));
if (push_undo) 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 applicable, replace the current selection */
if (op == GIMP_CHANNEL_OP_REPLACE) if (op == GIMP_CHANNEL_OP_REPLACE)
@ -515,7 +517,7 @@ gimp_channel_select_fuzzy (GimpChannel *channel,
if (! sample_merged) if (! sample_merged)
gimp_item_offsets (GIMP_ITEM (drawable), &add_on_x, &add_on_y); 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, add_on, add_on_x, add_on_y,
op, op,
feather, feather,
@ -562,7 +564,7 @@ gimp_channel_select_by_color (GimpChannel *channel,
if (! sample_merged) if (! sample_merged)
gimp_item_offsets (GIMP_ITEM (drawable), &add_on_x, &add_on_y); 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, add_on, add_on_x, add_on_y,
op, op,
feather, feather,

4
app/core/gimpdrawable-bucket-fill.c
View File

@ -18,6 +18,8 @@
#include "config.h" #include "config.h"
#include <string.h>
#include <glib-object.h> #include <glib-object.h>
#include "libgimpcolor/gimpcolor.h" #include "libgimpcolor/gimpcolor.h"
@ -281,7 +283,7 @@ gimp_drawable_bucket_fill_full (GimpDrawable *drawable,
/* Apply it to the image */ /* Apply it to the image */
pixel_region_init (&bufPR, buf_tiles, 0, 0, (x2 - x1), (y2 - y1), FALSE); pixel_region_init (&bufPR, buf_tiles, 0, 0, (x2 - x1), (y2 - y1), FALSE);
gimp_drawable_apply_region (drawable, &bufPR, gimp_drawable_apply_region (drawable, &bufPR,
TRUE, Q_("command|Bucket Fill"), TRUE, C_("command", "Bucket Fill"),
opacity, paint_mode, opacity, paint_mode,
NULL, x1, y1); NULL, x1, y1);
tile_manager_unref (buf_tiles); tile_manager_unref (buf_tiles);

7
app/core/gimpdrawable-transform.c
View File

@ -19,6 +19,7 @@
#include "config.h" #include "config.h"
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <glib-object.h> #include <glib-object.h>
@ -624,7 +625,8 @@ gimp_drawable_transform_flip (GimpDrawable *drawable,
/* Start a transform undo group */ /* Start a transform undo group */
gimp_image_undo_group_start (image, 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 */ /* Cut/Copy from the specified drawable */
orig_tiles = gimp_drawable_transform_cut (drawable, context, &new_layer); 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 */ /* Start a transform undo group */
gimp_image_undo_group_start (image, 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 */ /* Cut/Copy from the specified drawable */
orig_tiles = gimp_drawable_transform_cut (drawable, context, &new_layer); orig_tiles = gimp_drawable_transform_cut (drawable, context, &new_layer);

2
app/core/gimpimage-crop.c
View File

@ -123,7 +123,7 @@ gimp_image_crop (GimpImage *image,
if (crop_layers) if (crop_layers)
gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_IMAGE_CROP, gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_IMAGE_CROP,
Q_("command|Crop Image")); C_("command", "Crop Image"));
else else
gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_IMAGE_RESIZE, gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_IMAGE_RESIZE,
_("Resize Image")); _("Resize Image"));

4
app/dialogs/image-scale-dialog.c
View File

@ -18,6 +18,8 @@
#include "config.h" #include "config.h"
#include <string.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "libgimpbase/gimpbase.h" #include "libgimpbase/gimpbase.h"
@ -106,7 +108,7 @@ image_scale_dialog_new (GimpImage *image,
dialog->image = image; dialog->image = image;
dialog->dialog = scale_dialog_new (GIMP_VIEWABLE (image), context, dialog->dialog = scale_dialog_new (GIMP_VIEWABLE (image), context,
Q_("dialog-title|Scale Image"), C_("dialog-title", "Scale Image"),
"gimp-image-scale", "gimp-image-scale",
parent, parent,
gimp_standard_help_func, gimp_standard_help_func,

4
app/tools/gimpbycolorselecttool.c
View File

@ -20,6 +20,8 @@
#include "config.h" #include "config.h"
#include <string.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h" #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 = 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; region_class->get_mask = gimp_by_color_select_tool_get_mask;
} }

4
app/tools/gimpfliptool.c
View File

@ -18,6 +18,8 @@
#include "config.h" #include "config.h"
#include <string.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "libgimpwidgets/gimpwidgets.h" #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_control_set_toggle_tool_cursor (tool->control,
GIMP_TOOL_CURSOR_FLIP_VERTICAL); GIMP_TOOL_CURSOR_FLIP_VERTICAL);
tr_tool->undo_desc = Q_("command|Flip"); tr_tool->undo_desc = C_("command", "Flip");
} }
static void static void

2
app/tools/gimpforegroundselecttool.c
View File

@ -761,7 +761,7 @@ gimp_foreground_select_tool_apply (GimpForegroundSelectTool *fg_select,
g_return_if_fail (fg_select->mask != NULL); g_return_if_fail (fg_select->mask != NULL);
gimp_channel_select_channel (gimp_image_get_mask (display->image), gimp_channel_select_channel (gimp_image_get_mask (display->image),
Q_("command|Foreground Select"), C_("command", "Foreground Select"),
fg_select->mask, 0, 0, fg_select->mask, 0, 0,
options->operation, options->operation,
options->feather, options->feather,

2
app/tools/gimpfreeselecttool.c
View File

@ -1248,7 +1248,7 @@ gimp_free_select_tool_real_select (GimpFreeSelectTool *fst,
Private *priv = GET_PRIVATE (fst); Private *priv = GET_PRIVATE (fst);
gimp_channel_select_polygon (gimp_image_get_mask (display->image), gimp_channel_select_polygon (gimp_image_get_mask (display->image),
Q_("command|Free Select"), C_("command", "Free Select"),
priv->n_points, priv->n_points,
priv->points, priv->points,
priv->operation_at_start, priv->operation_at_start,

4
app/tools/gimpfuzzyselecttool.c
View File

@ -20,6 +20,8 @@
#include "config.h" #include "config.h"
#include <string.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "libgimpwidgets/gimpwidgets.h" #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 = 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; region_class->get_mask = gimp_fuzzy_select_tool_get_mask;
} }

4
app/tools/gimpmovetool.c
View File

@ -18,6 +18,8 @@
#include "config.h" #include "config.h"
#include <string.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h> #include <gdk/gdkkeysyms.h>
@ -122,7 +124,7 @@ gimp_move_tool_register (GimpToolRegisterCallback callback,
gimp_move_options_gui, gimp_move_options_gui,
0, 0,
"gimp-move-tool", "gimp-move-tool",
Q_("tool|Move"), C_("tool", "Move"),
_("Move Tool: Move layers, selections, and other objects"), _("Move Tool: Move layers, selections, and other objects"),
N_("_Move"), "M", N_("_Move"), "M",
NULL, GIMP_HELP_TOOL_MOVE, NULL, GIMP_HELP_TOOL_MOVE,

4
app/tools/gimpperspectivetool.c
View File

@ -18,6 +18,8 @@
#include "config.h" #include "config.h"
#include <string.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "libgimpwidgets/gimpwidgets.h" #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_control_set_tool_cursor (tool->control,
GIMP_TOOL_CURSOR_PERSPECTIVE); 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->progress_text = _("Perspective transformation");
tr_tool->use_grid = TRUE; tr_tool->use_grid = TRUE;

4
app/tools/gimppolygonselecttool.c
View File

@ -23,6 +23,8 @@
#include "config.h" #include "config.h"
#include <string.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h> #include <gdk/gdkkeysyms.h>
@ -571,7 +573,7 @@ gimp_polygon_select_tool_real_select (GimpPolygonSelectTool *poly_sel_tool,
options = GIMP_SELECTION_TOOL_GET_OPTIONS (poly_sel_tool); options = GIMP_SELECTION_TOOL_GET_OPTIONS (poly_sel_tool);
gimp_channel_select_polygon (gimp_image_get_mask (display->image), 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->n_points,
poly_sel_tool->points, poly_sel_tool->points,
options->operation, options->operation,

4
app/tools/gimprotatetool.c
View File

@ -18,6 +18,8 @@
#include "config.h" #include "config.h"
#include <string.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "libgimpmath/gimpmath.h" #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); 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->progress_text = _("Rotating");
tr_tool->use_grid = TRUE; tr_tool->use_grid = TRUE;

2
app/tools/gimpscaletool.c
View File

@ -103,7 +103,7 @@ gimp_scale_tool_init (GimpScaleTool *scale_tool)
gimp_tool_control_set_tool_cursor (tool->control, GIMP_TOOL_CURSOR_RESIZE); 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->progress_text = _("Scaling");
tr_tool->use_grid = TRUE; tr_tool->use_grid = TRUE;

3
app/tools/gimpsheartool.c
View File

@ -19,6 +19,7 @@
#include "config.h" #include "config.h"
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
@ -106,7 +107,7 @@ gimp_shear_tool_init (GimpShearTool *shear_tool)
gimp_tool_control_set_tool_cursor (tool->control, GIMP_TOOL_CURSOR_SHEAR); 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->progress_text = _("Shearing");
tr_tool->use_grid = TRUE; tr_tool->use_grid = TRUE;

2
libgimpwidgets/gimpcolorprofilestore.c
View File

@ -277,7 +277,7 @@ gimp_color_profile_store_add (GimpColorProfileStore *store,
g_return_if_fail (label != NULL || filename == NULL); g_return_if_fail (label != NULL || filename == NULL);
if (! filename && ! label) if (! filename && ! label)
label = Q_("profile|None"); label = C_("profile", "None");
gimp_color_profile_store_get_separator (store, &separator, TRUE); gimp_color_profile_store_get_separator (store, &separator, TRUE);

2
plug-ins/gfig/gfig-dialog.c
View File

@ -490,7 +490,7 @@ gfig_dialog (void)
gtk_widget_show (toggle); gtk_widget_show (toggle);
/* "snap to grid" checkbutton at bottom of style frame */ /* "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); gtk_box_pack_end (GTK_BOX (vbox), toggle, FALSE, FALSE, 0);
g_signal_connect (toggle, "toggled", g_signal_connect (toggle, "toggled",
G_CALLBACK (gimp_toggle_button_update), G_CALLBACK (gimp_toggle_button_update),