Commit fdffb13e authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann
Browse files

app/gui/gradient-editor-commands.c don't split translatable sentences into

2003-01-06  Sven Neumann  <sven@gimp.org>

        * app/gui/gradient-editor-commands.c
        * libgimp/gimpexport.c: don't split translatable sentences into
        multiple messages (bug #85828).
parent 82c16db5
2003-01-06 Sven Neumann <sven@gimp.org>
* app/gui/gradient-editor-commands.c
* libgimp/gimpexport.c: don't split translatable sentences into
multiple messages (bug #85828).
2003-01-05 Manish Singh <yosh@gimp.org>
 
* app/core/gimpobject.c: cast memsize to a guint instead of format
......
......@@ -580,13 +580,13 @@ gradient_editor_replicate_cmd_callback (GtkWidget *widget,
gtk_widget_show (vbox);
/* Instructions */
label = gtk_label_new (_("Select the number of times"));
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
if (editor->control_sel_l == editor->control_sel_r)
label = gtk_label_new (_("Select the number of times\n"
"to replicate the selected segment."));
else
label = gtk_label_new (_("Select the number of times\n"
"to replicate the selection."));
label = gtk_label_new ((editor->control_sel_l == editor->control_sel_r) ?
_("to replicate the selected segment") :
_("to replicate the selection"));
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
......@@ -696,14 +696,13 @@ gradient_editor_split_uniformly_cmd_callback (GtkWidget *widget,
gtk_widget_show (vbox);
/* Instructions */
label = gtk_label_new (_("Please select the number of uniform parts"));
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
if (editor->control_sel_l == editor->control_sel_r)
label = gtk_label_new (_("Select the number of uniform parts\n"
"in which to split the selected segment."));
else
label = gtk_label_new (_("Select the number of uniform parts\n"
"in which to split the segments in the selection."));
label =
gtk_label_new ((editor->control_sel_l == editor->control_sel_r) ?
_("in which to split the selected segment") :
_("in which to split the segments in the selection"));
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
......
......@@ -580,13 +580,13 @@ gradient_editor_replicate_cmd_callback (GtkWidget *widget,
gtk_widget_show (vbox);
/* Instructions */
label = gtk_label_new (_("Select the number of times"));
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
if (editor->control_sel_l == editor->control_sel_r)
label = gtk_label_new (_("Select the number of times\n"
"to replicate the selected segment."));
else
label = gtk_label_new (_("Select the number of times\n"
"to replicate the selection."));
label = gtk_label_new ((editor->control_sel_l == editor->control_sel_r) ?
_("to replicate the selected segment") :
_("to replicate the selection"));
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
......@@ -696,14 +696,13 @@ gradient_editor_split_uniformly_cmd_callback (GtkWidget *widget,
gtk_widget_show (vbox);
/* Instructions */
label = gtk_label_new (_("Please select the number of uniform parts"));
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
if (editor->control_sel_l == editor->control_sel_r)
label = gtk_label_new (_("Select the number of uniform parts\n"
"in which to split the selected segment."));
else
label = gtk_label_new (_("Select the number of uniform parts\n"
"in which to split the segments in the selection."));
label =
gtk_label_new ((editor->control_sel_l == editor->control_sel_r) ?
_("in which to split the selected segment") :
_("in which to split the segments in the selection"));
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
......
......@@ -167,7 +167,7 @@ static ExportAction export_action_merge =
{
export_merge,
NULL,
N_("can't handle layers"),
N_("%s can't handle layers"),
{ N_("Merge Visible Layers"), NULL },
0
};
......@@ -176,7 +176,7 @@ static ExportAction export_action_merge_single =
{
export_merge,
NULL,
N_("can't handle layer offsets, size or opacity"),
N_("%s can't handle layer offsets, size or opacity"),
{ N_("Merge Visible Layers"), NULL },
0
};
......@@ -185,7 +185,7 @@ static ExportAction export_action_animate_or_merge =
{
export_merge,
NULL,
N_("can only handle layers as animation frames"),
N_("%s can only handle layers as animation frames"),
{ N_("Merge Visible Layers"), N_("Save as Animation")},
0
};
......@@ -194,7 +194,7 @@ static ExportAction export_action_animate_or_flatten =
{
export_flatten,
NULL,
N_("can only handle layers as animation frames"),
N_("%s can only handle layers as animation frames"),
{ N_("Flatten Image"), N_("Save as Animation") },
0
};
......@@ -203,7 +203,7 @@ static ExportAction export_action_merge_flat =
{
export_flatten,
NULL,
N_("can't handle layers"),
N_("%s can't handle layers"),
{ N_("Flatten Image"), NULL },
0
};
......@@ -212,7 +212,7 @@ static ExportAction export_action_flatten =
{
export_flatten,
NULL,
N_("can't handle transparency"),
N_("%s can't handle transparency"),
{ N_("Flatten Image"), NULL },
0
};
......@@ -221,7 +221,7 @@ static ExportAction export_action_convert_rgb =
{
export_convert_rgb,
NULL,
N_("can only handle RGB images"),
N_("%s can only handle RGB images"),
{ N_("Convert to RGB"), NULL },
0
};
......@@ -230,7 +230,7 @@ static ExportAction export_action_convert_grayscale =
{
export_convert_grayscale,
NULL,
N_("can only handle grayscale images"),
N_("%s can only handle grayscale images"),
{ N_("Convert to Grayscale"), NULL },
0
};
......@@ -239,7 +239,7 @@ static ExportAction export_action_convert_indexed =
{
export_convert_indexed,
NULL,
N_("can only handle indexed images"),
N_("%s can only handle indexed images"),
{ N_("Convert to Indexed using default settings\n"
"(Do it manually to tune the result)"), NULL },
0
......@@ -249,7 +249,7 @@ static ExportAction export_action_convert_rgb_or_grayscale =
{
export_convert_rgb,
export_convert_grayscale,
N_("can only handle RGB or grayscale images"),
N_("%s can only handle RGB or grayscale images"),
{ N_("Convert to RGB"), N_("Convert to Grayscale")},
0
};
......@@ -258,7 +258,7 @@ static ExportAction export_action_convert_rgb_or_indexed =
{
export_convert_rgb,
export_convert_indexed,
N_("can only handle RGB or indexed images"),
N_("%s can only handle RGB or indexed images"),
{ N_("Convert to RGB"), N_("Convert to Indexed using default settings\n"
"(Do it manually to tune the result)")},
0
......@@ -268,7 +268,7 @@ static ExportAction export_action_convert_indexed_or_grayscale =
{
export_convert_indexed,
export_convert_grayscale,
N_("can only handle grayscale or indexed images"),
N_("%s can only handle grayscale or indexed images"),
{ N_("Convert to Indexed using default settings\n"
"(Do it manually to tune the result)"),
N_("Convert to Grayscale") },
......@@ -279,7 +279,7 @@ static ExportAction export_action_add_alpha =
{
export_add_alpha,
NULL,
N_("needs an alpha channel"),
N_("%s needs an alpha channel"),
{ N_("Add Alpha Channel"), NULL},
0
};
......@@ -336,7 +336,7 @@ export_toggle_callback (GtkWidget *widget,
}
static gint
confirm_save_dialog (const gchar *saving_what,
confirm_save_dialog (const gchar *message,
const gchar *format_name)
{
GtkWidget *vbox;
......@@ -344,7 +344,8 @@ confirm_save_dialog (const gchar *saving_what,
gchar *text;
dialog_return = GIMP_EXPORT_CANCEL;
g_return_val_if_fail (saving_what != NULL && format_name != NULL, dialog_return);
g_return_val_if_fail (message != NULL, dialog_return);
g_return_val_if_fail (format_name != NULL, dialog_return);
/*
* Plug-ins must have called gtk_init () before calling gimp_export ().
......@@ -373,11 +374,10 @@ confirm_save_dialog (const gchar *saving_what,
gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
gtk_widget_show (vbox);
text = g_strdup_printf (_("You are about to save %s as %s.\n"
"This will not save the visible layers."),
saving_what, format_name);
text = g_strdup_printf (message, format_name);
label = gtk_label_new (text);
g_free (text);
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_CENTER);
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
......@@ -464,8 +464,7 @@ export_dialog (GSList *actions,
action = (ExportAction *) (list->data);
label = gtk_label_new (NULL);
text = g_strdup_printf ("<b>%s %s</b>",
format_name, gettext (action->reason));
text = g_strdup_printf (gettext (action->reason), format_name);
gtk_label_set_markup (GTK_LABEL (label), text);
g_free (text);
......@@ -592,10 +591,15 @@ gimp_export_image (gint32 *image_ID,
&& !(capabilities & GIMP_EXPORT_CAN_HANDLE_LAYERS))
{
if (gimp_drawable_is_layer_mask (*drawable_ID))
dialog_return = confirm_save_dialog (_("a layer mask"), format_name);
dialog_return =
confirm_save_dialog (_("You are about to save a layer mask as %s.\n"
"This will not save the visible layers."),
format_name);
else if (gimp_drawable_is_channel (*drawable_ID))
dialog_return = confirm_save_dialog (_("a channel (saved selection)"),
format_name);
dialog_return =
confirm_save_dialog (_("You are about to save a channel (saved selection) as %s.\n"
"This will not save the visible layers."),
format_name);
else
; /* this should not happen */
......
2003-01-06 Sven Neumann <sven@gimp.org>
* de.po: updated german translation.
2003-01-05 Sven Neumann <sven@gimp.org>
* POTFILES.in: added libgimpwidgets/gimpmemsizeentry.c.
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GIMP 1.3.10\n"
"POT-Creation-Date: 2003-01-05 14:59+0100\n"
"POT-Creation-Date: 2003-01-06 01:39+0100\n"
"PO-Revision-Date: 2002-12-19 18:47+0100\n"
"Last-Translator: Christian Neumair <christian-neumair@web.de>\n"
"Language-Team: German <gnome-de@gnome.org>\n"
......@@ -16,20 +16,23 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#: libgimp/gimpexport.c:170 libgimp/gimpexport.c:206
msgid "can't handle layers"
msgstr "kennt keine Ebenen"
#, c-format
msgid "%s can't handle layers"
msgstr "%s kennt keine Ebenen"
#: libgimp/gimpexport.c:171 libgimp/gimpexport.c:180 libgimp/gimpexport.c:189
msgid "Merge Visible Layers"
msgstr "Sichtbare Ebenen vereinen"
#: libgimp/gimpexport.c:179
msgid "can't handle layer offsets, size or opacity"
msgstr "kennt keine Ebeneneigenschaften wie Versatz, Grösse und Transparenz"
#, c-format
msgid "%s can't handle layer offsets, size or opacity"
msgstr "%s kennt keine Ebeneneigenschaften wie Versatz, Grösse und Transparenz"
#: libgimp/gimpexport.c:188 libgimp/gimpexport.c:197
msgid "can only handle layers as animation frames"
msgstr "kann Ebenen nur als Animation abspeichern"
#, c-format
msgid "%s can only handle layers as animation frames"
msgstr "%s kann Ebenen nur als Animation abspeichern"
#: libgimp/gimpexport.c:189 libgimp/gimpexport.c:198
msgid "Save as Animation"
......@@ -40,28 +43,32 @@ msgid "Flatten Image"
msgstr "Bild zusammenfügen"
#: libgimp/gimpexport.c:215
msgid "can't handle transparency"
msgstr "kennt keine Transparenz"
#, c-format
msgid "%s can't handle transparency"
msgstr "%s kennt keine Transparenz"
#: libgimp/gimpexport.c:224
msgid "can only handle RGB images"
msgstr "kennt nur RGB"
#, c-format
msgid "%s can only handle RGB images"
msgstr "%s kennt nur RGB"
#: libgimp/gimpexport.c:225 libgimp/gimpexport.c:253 libgimp/gimpexport.c:262
msgid "Convert to RGB"
msgstr "In RGB umwandeln"
#: libgimp/gimpexport.c:233
msgid "can only handle grayscale images"
msgstr "kennt nur Graustufen"
#, c-format
msgid "%s can only handle grayscale images"
msgstr "%s kennt nur Graustufen"
#: libgimp/gimpexport.c:234 libgimp/gimpexport.c:253 libgimp/gimpexport.c:274
msgid "Convert to Grayscale"
msgstr "In Graustufen umwandeln"
#: libgimp/gimpexport.c:242
msgid "can only handle indexed images"
msgstr "kennt nur indizierte Paletten"
#, c-format
msgid "%s can only handle indexed images"
msgstr "%s kennt nur indizierte Paletten"
#: libgimp/gimpexport.c:243 libgimp/gimpexport.c:262 libgimp/gimpexport.c:272
msgid ""
......@@ -72,20 +79,24 @@ msgstr ""
"(Für bessere Resultate, diesen Schritt manuell durchführen)"
#: libgimp/gimpexport.c:252
msgid "can only handle RGB or grayscale images"
msgstr "kennt nur RGB und Graustufen"
#, c-format
msgid "%s can only handle RGB or grayscale images"
msgstr "%s kennt nur RGB und Graustufen"
#: libgimp/gimpexport.c:261
msgid "can only handle RGB or indexed images"
msgstr "kennt nur RGB und indizierte Paletten"
#, c-format
msgid "%s can only handle RGB or indexed images"
msgstr "%s kennt nur RGB und indizierte Paletten"
#: libgimp/gimpexport.c:271
msgid "can only handle grayscale or indexed images"
msgstr "kennt nur Graustufen und indizierte Paletten"
#, c-format
msgid "%s can only handle grayscale or indexed images"
msgstr "%s kennt nur Graustufen und indizierte Paletten"
#: libgimp/gimpexport.c:282
msgid "needs an alpha channel"
msgstr "benötigt einen Alphakanal"
#, c-format
msgid "%s needs an alpha channel"
msgstr "%s benötigt einen Alphakanal"
#: libgimp/gimpexport.c:283
msgid "Add Alpha Channel"
......@@ -96,27 +107,18 @@ msgstr "Alphakanal hinzufügen"
#. * Otherwise bad things will happen now!!
#.
#. the dialog
#: libgimp/gimpexport.c:356
#: libgimp/gimpexport.c:357
msgid "Confirm Save"
msgstr "Sichern bestätigen"
#: libgimp/gimpexport.c:360
#: libgimp/gimpexport.c:361
msgid "Confirm"
msgstr "Bestätigen"
#: libgimp/gimpexport.c:362
#: libgimp/gimpexport.c:363
msgid "Cancel"
msgstr "Abbrechen"
#: libgimp/gimpexport.c:376
#, c-format
msgid ""
"You are about to save %s as %s.\n"
"This will not save the visible layers."
msgstr ""
"Sie sichern %s als %s.\n"
"Die sichtbaren Ebenen werden dabei nicht gesichert."
#.
#. * Plug-ins must have called gtk_init () before calling gimp_export ().
#. * Otherwise bad things will happen now!!
......@@ -141,17 +143,27 @@ msgid ""
msgstr "Das Bild sollte vor dem Abspeichern exportiert werden, denn:"
#. the footline
#: libgimp/gimpexport.c:527
#: libgimp/gimpexport.c:526
msgid "The export conversion won't modify your original image."
msgstr "Dieser Vorgang wird das Originalbild nicht verändern."
#: libgimp/gimpexport.c:595
msgid "a layer mask"
msgstr "eine Ebenenmaske"
#, c-format
msgid ""
"You are about to save a layer mask as %s.\n"
"This will not save the visible layers."
msgstr ""
"Sie sichern eine Ebenenmaske als %s.\n"
"Die sichtbaren Ebenen werden dabei nicht gesichert."
#: libgimp/gimpexport.c:597
msgid "a channel (saved selection)"
msgstr "einen Kanal (gesicherte Selektion)"
#: libgimp/gimpexport.c:600
#, c-format
msgid ""
"You are about to save a channel (saved selection) as %s.\n"
"This will not save the visible layers."
msgstr ""
"Sie sichern einen Kanal (gesicherte Selektion) als %s.\n"
"Die sichtbaren Ebenen werden dabei nicht gesichert."
#: libgimp/gimpmenu.c:163 libgimp/gimpmenu.c:283 libgimp/gimpmenu.c:398
#: libgimp/gimpmenu.c:580
......@@ -379,19 +391,19 @@ msgstr "_Scheren"
msgid "More..."
msgstr "Mehr..."
#: libgimpwidgets/gimpunitmenu.c:526
#: libgimpwidgets/gimpunitmenu.c:525
msgid "Unit Selection"
msgstr "Einheit auswählen"
#: libgimpwidgets/gimpunitmenu.c:571
#: libgimpwidgets/gimpunitmenu.c:570
msgid "Unit"
msgstr "Einheit"
#: libgimpwidgets/gimpunitmenu.c:575
#: libgimpwidgets/gimpunitmenu.c:574
msgid "Factor"
msgstr "Faktor"
#: libgimpwidgets/gimpwidgets.c:960
#: libgimpwidgets/gimpwidgets.c:982
msgid ""
"Use this value for random number generator seed - this allows you to repeat "
"a given \"random\" operation"
......@@ -399,11 +411,11 @@ msgstr ""
"Benutze diesen Wert für den Zufallsgenerator - dies ermgöglicht es "
"\"zufällige\" Funktionen zu wiederholen"
#: libgimpwidgets/gimpwidgets.c:964
#: libgimpwidgets/gimpwidgets.c:986
msgid "_Randomize"
msgstr "_Würfeln"
#: libgimpwidgets/gimpwidgets.c:975
#: libgimpwidgets/gimpwidgets.c:997
msgid "Seed random number generator with a generated random number"
msgstr "Initialisiere den Zufallsgenerator mit einer Zufallszahl"
......@@ -455,11 +467,11 @@ msgstr "Kontrast"
msgid "Contrast Cycles:"
msgstr "Kontrastverstärkung:"
#: modules/colorsel_triangle.c:108
#: modules/colorsel_triangle.c:110
msgid "Painter-style triangle color selector"
msgstr "Dreiecks-Farbauswahl im Stil von Painter"
#: modules/colorsel_triangle.c:180
#: modules/colorsel_triangle.c:182
msgid "_Triangle"
msgstr "_Dreieck"
......
2003-01-06 Sven Neumann <sven@gimp.org>
* POTFILES.in: added app/display/gimpdisplayshell-title.c.
* de.po: updated german translation.
2003-01-04 Ole Laursen <olau@hardworking.dk>
* da.po: Updated Danish translation.
......
......@@ -53,6 +53,7 @@ app/display/gimpdisplayshell.c
app/display/gimpdisplayshell-callbacks.c
app/display/gimpdisplayshell-filter-dialog.c
app/display/gimpdisplayshell-layer-select.c
app/display/gimpdisplayshell-title.c
app/display/gimpnavigationview.c
app/display/gimpprogress.c
app/display/gimpstatusbar.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