Commit bb5d6875 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann

app/text/gimptext.c app/tools/gimpbucketfilloptions.c

2003-02-08  Sven Neumann  <sven@gimp.org>

	* app/text/gimptext.c
	* app/tools/gimpbucketfilloptions.c
	* app/tools/gimpselectionoptions.c
	* app/tools/gimptextoptions.c: use N_() instead of _() with blurbs
	of object properties. GimpConfig wants the untranslated string as
	well.

	* app/widgets/gimpenummenu.c
	* app/widgets/gimppropwidgets.c: added gettext() calls.

	* app/config/gimpconfig-serialize.c: document the fact that
	gimp_config_serialize_comment() only handles ASCII comments.
parent 4bd30b8c
2003-02-08 Sven Neumann <sven@gimp.org>
* app/text/gimptext.c
* app/tools/gimpbucketfilloptions.c
* app/tools/gimpselectionoptions.c
* app/tools/gimptextoptions.c: use N_() instead of _() with blurbs
of object properties. GimpConfig wants the untranslated string as
well.
* app/widgets/gimpenummenu.c
* app/widgets/gimppropwidgets.c: added gettext() calls.
* app/config/gimpconfig-serialize.c: document the fact that
gimp_config_serialize_comment() only handles ASCII comments.
2003-02-09 Michael Natterer <mitch@gimp.org>
* app/tools/tool_options.[ch]: added
......
......@@ -450,10 +450,11 @@ gimp_config_serialize_unknown_tokens (GObject *object,
/**
* gimp_config_serialize_comment:
* @str: a #GString.
* @comment: the comment to serialize
* @comment: the comment to serialize (ASCII only)
*
* Appends the @comment to @str and inserts linebreaks and hash-marks to
* format it as a comment.
* format it as a comment. Note that this function does not handle non-ASCII
* characters.
**/
void
gimp_config_serialize_comment (GString *str,
......
......@@ -152,13 +152,13 @@ gimp_text_class_init (GimpTextClass *klass)
0);
GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_INDENTATION,
"indent",
_("How many pixels the "
"first line should be shorter."),
N_("How many pixels the "
"first line should be shorter"),
-8192.0, 8192.0, 0.0,
0);
GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_LINE_SPACING,
"line-spacing",
_("Additional line spacing (in pixels)."),
N_("Additional line spacing (in pixels)"),
-8192.0, 8192.0, 0.0,
0);
GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_LETTER_SPACING,
......
......@@ -115,18 +115,19 @@ gimp_bucket_fill_options_class_init (GimpBucketFillOptionsClass *klass)
GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_FILL_TRANSPARENT,
"fill-transparent",
_("Allow completely transparent regions "
"to be filled"),
N_("Allow completely transparent regions "
"to be filled"),
TRUE,
0);
GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_SAMPLE_MERGED,
"sample-merged",
_("Base filled area on all visible layers"),
N_("Base filled area on all visible "
"layers"),
FALSE,
0);
GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_THRESHOLD,
"threshold",
_("Maximum color difference"),
N_("Maximum color difference"),
0.0, 255.0, 15.0,
0);
GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_FILL_MODE,
......
......@@ -136,7 +136,7 @@ gimp_selection_options_class_init (GimpSelectionOptionsClass *klass)
0);
GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_ANTIALIAS,
"antialias",
_("Smooth edges"),
N_("Smooth edges"),
TRUE,
0);
GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_FEATHER,
......@@ -150,18 +150,18 @@ gimp_selection_options_class_init (GimpSelectionOptionsClass *klass)
GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_SELECT_TRANSPARENT,
"select-transparent",
_("Allow completely transparent regions "
"to be selected"),
N_("Allow completely transparent regions "
"to be selected"),
TRUE,
0);
GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_SAMPLE_MERGED,
"sample-merged",
_("Base selection on all visible layers"),
N_("Base selection on all visible layers"),
FALSE,
0);
GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_THRESHOLD,
"threshold",
_("Maximum color difference"),
N_("Maximum color difference"),
0.0, 255.0, 15.0,
0);
......@@ -171,8 +171,8 @@ gimp_selection_options_class_init (GimpSelectionOptionsClass *klass)
0);
GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_SHRINK_MERGED,
"shrink-merged",
_("Use all visible layers when shrinking "
"the selection"),
N_("Use all visible layers when shrinking "
"the selection"),
FALSE,
0);
......
......@@ -141,7 +141,7 @@ gimp_text_options_gui (GimpToolOptions *tool_options)
font_selection = gimp_prop_font_selection_new (G_OBJECT (options->text),
"font");
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
_("Font:"), 1.0, 0.5,
_("_Font:"), 1.0, 0.5,
font_selection, 3, FALSE);
digits = gimp_unit_get_digits (options->text->font_size_unit);
......@@ -149,7 +149,7 @@ gimp_text_options_gui (GimpToolOptions *tool_options)
"font-size",
1.0, 10.0, digits);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("Size:"), 1.0, 0.5,
_("_Size:"), 1.0, 0.5,
spinbutton, 2, FALSE);
unit_menu = gimp_prop_unit_menu_new (G_OBJECT (options->text),
......
......@@ -606,7 +606,7 @@ gimp_enum_stock_box_new_with_range (GType enum_type,
}
if (value->value_name)
gimp_help_set_help_data (button, value->value_name, NULL);
gimp_help_set_help_data (button, gettext (value->value_name), NULL);
group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (button));
gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
......
......@@ -627,11 +627,12 @@ gimp_prop_scale_entry_new (GObject *config,
gdouble restricted_lower,
gdouble restricted_upper)
{
GParamSpec *param_spec;
GtkObject *adjustment;
gdouble value;
gdouble lower;
gdouble upper;
GParamSpec *param_spec;
GtkObject *adjustment;
const gchar *tooltip;
gdouble value;
gdouble lower;
gdouble upper;
param_spec = find_param_spec (config, property_name, G_STRLOC);
if (! param_spec)
......@@ -682,6 +683,8 @@ gimp_prop_scale_entry_new (GObject *config,
return NULL;
}
tooltip = gettext (g_param_spec_get_blurb (param_spec));
if (! restrict_scale)
{
adjustment = gimp_scale_entry_new (table, column, row,
......@@ -689,7 +692,7 @@ gimp_prop_scale_entry_new (GObject *config,
value, lower, upper,
step_increment, page_increment, digits,
TRUE, 0.0, 0.0,
g_param_spec_get_blurb (param_spec),
tooltip,
NULL);
}
else
......@@ -701,7 +704,7 @@ gimp_prop_scale_entry_new (GObject *config,
restricted_upper,
step_increment, page_increment, digits,
FALSE, lower, upper,
g_param_spec_get_blurb (param_spec),
tooltip,
NULL);
}
......@@ -2070,7 +2073,7 @@ set_param_spec (GObject *object,
const gchar *blurb = g_param_spec_get_blurb (param_spec);
if (blurb)
gimp_help_set_help_data (widget, blurb, NULL);
gimp_help_set_help_data (widget, gettext (blurb), NULL);
}
}
......
......@@ -450,10 +450,11 @@ gimp_config_serialize_unknown_tokens (GObject *object,
/**
* gimp_config_serialize_comment:
* @str: a #GString.
* @comment: the comment to serialize
* @comment: the comment to serialize (ASCII only)
*
* Appends the @comment to @str and inserts linebreaks and hash-marks to
* format it as a comment.
* format it as a comment. Note that this function does not handle non-ASCII
* characters.
**/
void
gimp_config_serialize_comment (GString *str,
......
......@@ -627,11 +627,12 @@ gimp_prop_scale_entry_new (GObject *config,
gdouble restricted_lower,
gdouble restricted_upper)
{
GParamSpec *param_spec;
GtkObject *adjustment;
gdouble value;
gdouble lower;
gdouble upper;
GParamSpec *param_spec;
GtkObject *adjustment;
const gchar *tooltip;
gdouble value;
gdouble lower;
gdouble upper;
param_spec = find_param_spec (config, property_name, G_STRLOC);
if (! param_spec)
......@@ -682,6 +683,8 @@ gimp_prop_scale_entry_new (GObject *config,
return NULL;
}
tooltip = gettext (g_param_spec_get_blurb (param_spec));
if (! restrict_scale)
{
adjustment = gimp_scale_entry_new (table, column, row,
......@@ -689,7 +692,7 @@ gimp_prop_scale_entry_new (GObject *config,
value, lower, upper,
step_increment, page_increment, digits,
TRUE, 0.0, 0.0,
g_param_spec_get_blurb (param_spec),
tooltip,
NULL);
}
else
......@@ -701,7 +704,7 @@ gimp_prop_scale_entry_new (GObject *config,
restricted_upper,
step_increment, page_increment, digits,
FALSE, lower, upper,
g_param_spec_get_blurb (param_spec),
tooltip,
NULL);
}
......@@ -2070,7 +2073,7 @@ set_param_spec (GObject *object,
const gchar *blurb = g_param_spec_get_blurb (param_spec);
if (blurb)
gimp_help_set_help_data (widget, blurb, NULL);
gimp_help_set_help_data (widget, gettext (blurb), NULL);
}
}
......
2003-02-09 Sven Neumann <sven@gimp.org>
* POTFILES.in
* de.po: updated.
2002-02-07 Daniel Yacob <locales@geez.org>
* am.po: Updated Amharic translation.
......
......@@ -147,31 +147,40 @@ app/text/gimptext.c
app/tools/gimpairbrushtool.c
app/tools/gimpbezierselecttool.c
app/tools/gimpblendoptions.c
app/tools/gimpblendtool.c
app/tools/gimpbrightnesscontrasttool.c
app/tools/gimpbucketfilloptions.c
app/tools/gimpbucketfilltool.c
app/tools/gimpbycolorselecttool.c
app/tools/gimpclonetool.c
app/tools/gimpcolorbalancetool.c
app/tools/gimpcolorpickeroptions.c
app/tools/gimpcolorpickertool.c
app/tools/gimpconvolvetool.c
app/tools/gimpcropoptions.c
app/tools/gimpcroptool.c
app/tools/gimpcurvestool.c
app/tools/gimpdodgeburntool.c
app/tools/gimpeditselectiontool.c
app/tools/gimpellipseselecttool.c
app/tools/gimperasertool.c
app/tools/gimpflipoptions.c
app/tools/gimpfliptool.c
app/tools/gimpfreeselecttool.c
app/tools/gimpfuzzyselecttool.c
app/tools/gimphistogramtool.c
app/tools/gimphuesaturationtool.c
app/tools/gimpimagemaptool.c
app/tools/gimpinkoptions.c
app/tools/gimpinktool.c
app/tools/gimpiscissorstool.c
app/tools/gimplevelstool.c
app/tools/gimpmagnifyoptions.c
app/tools/gimpmagnifytool.c
app/tools/gimpmeasureoptions.c
app/tools/gimpmeasuretool.c
app/tools/gimpmoveoptions.c
app/tools/gimpmovetool.c
app/tools/gimppaintbrushtool.c
app/tools/gimppainttool.c
......@@ -182,18 +191,19 @@ app/tools/gimpposterizetool.c
app/tools/gimprectselecttool.c
app/tools/gimprotatetool.c
app/tools/gimpscaletool.c
app/tools/gimpselectionoptions.c
app/tools/gimpsheartool.c
app/tools/gimpsmudgetool.c
app/tools/gimptextoptions.c
app/tools/gimptexttool.c
app/tools/gimpthresholdtool.c
app/tools/gimptool.c
app/tools/gimptransformoptions.c
app/tools/gimptransformtool.c
app/tools/gimpvectortool.c
app/tools/paint_options.c
app/tools/path_tool.c
app/tools/selection_options.c
app/tools/tool_options.c
app/tools/transform_options.c
app/widgets/widgets-enums.c
app/widgets/gimpbrusheditor.c
......@@ -208,6 +218,7 @@ app/widgets/gimpdataeditor.c
app/widgets/gimpdatafactoryview.c
app/widgets/gimpdocumentview.c
app/widgets/gimpdrawablelistview.c
app/widgets/gimpfontselection.c
app/widgets/gimpfontselection-dialog.c
app/widgets/gimpgradienteditor.c
app/widgets/gimphelp.c
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment