corrected various i18n-related problems and updated the german

translation


--Sven

ChangeLog

+2000-07-30  Sven Neumann  <sven@gimp.org>
+	
+	* plug-ins/gdyntext/gdyntext.c: 
+	* plug-ins/gdyntext/gdyntext_ui.c:
+	* plug-ins/gdyntext/gdyntextcompat.c: corrected various problems 
+	with i18n
+	
 2000-07-30  Michael Natterer  <mitch@gimp.org>
 	* gimp_splash.ppm: while trying to confuse ChangeLog readers

plug-ins/gdyntext/gdyntext.c

@@ -57,31 +57,31 @@ static void gdt_query(void)
 	{
 		static GParamDef gdt_args[] = {
 			/* standard params */
-			{ PARAM_INT32,		_("run_mode"),				_("Interactive, non-interactive")},
-			{ PARAM_IMAGE,		_("image"),						_("Input image") },
-			{ PARAM_DRAWABLE,	_("drawable"),				_("Input drawable")},
+			{ PARAM_INT32,    "run_mode",        "Interactive, non-interactive" },
+			{ PARAM_IMAGE,    "image",           "Input image"                  },
+			{ PARAM_DRAWABLE, "drawable",        "Input drawable"               },
 			/* gdyntext params */
-			{ PARAM_STRING,		_("text"),						_("Text to render")},
-			{ PARAM_INT32,		_("antialias"),				_("Generate antialiased text")},
-			{ PARAM_INT32,		_("alignment"),				_("Text alignment: { LEFT = 0, CENTER = 1, RIGHT = 2 }")},
-			{ PARAM_INT32,		_("rotation"),				_("Text rotation (degrees)")},
-			{ PARAM_INT32,		_("line_spacing"),		_("Line spacing")},
-			{ PARAM_COLOR,		_("color"),						_("Text color")},
-			{ PARAM_INT32,		_("layer_alignment"),	_("Layer alignment { NONE = 0, BOTTOM_LEFT = 1, BOTTOM_CENTER = 2, BOTTOM_RIGHT = 3, MIDDLE_LEFT = 4, CENTER = 5, MIDDLE_RIGHT = 6, TOP_LEFT = 7, TOP_CENTER = 8, TOP_RIGHT = 9 }")},
-			{ PARAM_STRING,		_("fontname"),				_("The fontname (conforming to the X Logical Font Description Conventions)")},
+			{ PARAM_STRING,   "text",            "Text to render"               },
+			{ PARAM_INT32,    "antialias",       "Generate antialiased text"    },
+			{ PARAM_INT32,    "alignment",       "Text alignment: { LEFT = 0, CENTER = 1, RIGHT = 2 }" },
+			{ PARAM_INT32,    "rotation",        "Text rotation (degrees)"      },
+			{ PARAM_INT32,    "line_spacing",    "Line spacing"                 },
+			{ PARAM_COLOR,    "color",           "Text color"                   },
+			{ PARAM_INT32,    "layer_alignment", "Layer alignment { NONE = 0, BOTTOM_LEFT = 1, BOTTOM_CENTER = 2, BOTTOM_RIGHT = 3, MIDDLE_LEFT = 4, CENTER = 5, MIDDLE_RIGHT = 6, TOP_LEFT = 7, TOP_CENTER = 8, TOP_RIGHT = 9 }" },
+			{ PARAM_STRING,   "fontname",        "The fontname (conforming to the X Logical Font Description Conventions)" },
 		};
 		static GParamDef gdt_rets[] = {
-			{ PARAM_LAYER,		"layer",				_("The text layer")},
+			{ PARAM_LAYER,    "layer",           "The text layer"               },
 		};
 		static int ngdt_args = sizeof(gdt_args) / sizeof(gdt_args[0]);
 		static int ngdt_rets = sizeof(gdt_rets) / sizeof(gdt_rets[0]);
 
 		gimp_install_procedure("plug_in_dynamic_text",
-			_("GIMP Dynamic Text"),
-			_(""),
+			"GIMP Dynamic Text",
+			"",
 			"Marco Lamberto <lm@geocities.com>",
 			"Marco Lamberto",
-			_("Jan 1999"),
+			"Jan 1999",
 			_("<Image>/Filters/Render/Dynamic Text..."),
 			"RGB*,GRAY*,INDEXED*",
 			PROC_PLUG_IN,
@@ -319,7 +319,7 @@ void gdt_render_text_p(GdtVals *data, gboolean show_progress)
 	GParamColor old_color, text_color;
 
 	if (show_progress)
-		gimp_progress_init("GIMP Dynamic Text");
+		gimp_progress_init (_("GIMP Dynamic Text"));
 
 	/* undo start */
 	ret_vals = gimp_run_procedure("gimp_undo_push_group_start", &nret_vals,

plug-ins/gdyntext/gdyntext_ui.c

@@ -129,7 +129,7 @@ gdouble				col[3];
 
 GtkWidget *create_message_window(GtkWidget **mw)
 {
-	*mw = message_window_new(_("GDynText "GDYNTEXT_VERSION": Messages Window"));
+	*mw = message_window_new(_("GDynText: Messages Window"));
 	gtk_widget_set_usize(*mw, 430, 170);
 	gtk_window_position(GTK_WINDOW(*mw), GTK_WIN_POS_CENTER);
 	gtk_signal_connect(GTK_OBJECT(*mw), "destroy", GTK_SIGNAL_FUNC(on_window_destroy), mw);
@@ -154,7 +154,7 @@ GtkWidget* create_about_dialog(void)
 
   window = gtk_window_new(GTK_WINDOW_DIALOG);
   gtk_container_border_width(GTK_CONTAINER(window), 0);
-  gtk_window_set_title(GTK_WINDOW(window), _("GDynText "GDYNTEXT_VERSION": About ..."));
+  gtk_window_set_title(GTK_WINDOW(window), _("GDynText: About ..."));
   gtk_window_set_policy(GTK_WINDOW(window), FALSE, FALSE, FALSE);
   gtk_window_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
 	gtk_signal_connect(GTK_OBJECT(window), "destroy",
@@ -185,11 +185,10 @@ GtkWidget* create_about_dialog(void)
   gtk_box_pack_start(GTK_BOX(vbox1), frame, TRUE, TRUE, 4);
 	gtk_widget_show(frame);
 	
-  label = gtk_label_new(_(
-		"GIMP Dynamic Text "GDYNTEXT_VERSION"\n"
-		"Copyright (C) 1998,1999,2000 Marco Lamberto\n"
-		"E-mail: lm@geocities.com\n"
-		"Web page: "GDYNTEXT_WEB_PAGE""));
+  label = gtk_label_new ("GIMP Dynamic Text "GDYNTEXT_VERSION"\n"
+			 "Copyright (C) 1998,1999,2000 Marco Lamberto\n"
+			 "E-mail: lm@geocities.com\n"
+			 "Web page: "GDYNTEXT_WEB_PAGE);
   gtk_widget_show(label);
   gtk_container_add(GTK_CONTAINER(frame), label);
   gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
@@ -200,7 +199,7 @@ GtkWidget* create_about_dialog(void)
 	gtk_button_box_set_layout(GTK_BUTTON_BOX(hbbox1), GTK_BUTTONBOX_END);
   gtk_widget_show(hbbox1);
 
-  button = gtk_button_new_with_label(_("Ok"));
+  button = gtk_button_new_with_label(_("OK"));
   gtk_widget_show(button);
   GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
   gtk_box_pack_end(GTK_BOX(hbbox1), button, FALSE, TRUE, 4);
@@ -218,7 +217,7 @@ GtkWidget* create_color_selection_dialog(void)
   GtkWidget *ok_button1;
   GtkWidget *cancel_button1;
 
-  colseldlg = gtk_color_selection_dialog_new(_("GDynText "GDYNTEXT_VERSION": Select Color"));
+  colseldlg = gtk_color_selection_dialog_new(_("GDynText: Select Color"));
   gtk_container_border_width(GTK_CONTAINER(colseldlg), 4);
 	gtk_signal_connect(GTK_OBJECT(&(GTK_COLOR_SELECTION_DIALOG(colseldlg)->window)), "destroy",
 		GTK_SIGNAL_FUNC(on_color_selection_dialog_cancel_clicked), &color_selection_dialog);
@@ -243,13 +242,13 @@ GtkWidget* create_color_selection_dialog(void)
 
 GdtMainWindow *create_main_window(GdtMainWindow **main_window, GdtVals *data)
 {
-	GdtMainWindow *mw;
+  GdtMainWindow *mw;
   GtkObject *font_size_adj;
   GtkObject *line_spacing_adj;
-	GtkTooltips *tooltips;
+  GtkTooltips *tooltips;
   GtkWidget *handlebox;
   GtkWidget *vbox;
-	GtkWidget *hbox;
+  GtkWidget *hbox;
   GtkWidget *hbox1;
   GtkWidget *hbox2;
   GtkWidget *hbox3;
@@ -262,41 +261,45 @@ GdtMainWindow *create_main_window(GdtMainWindow **main_window, GdtVals *data)
   GtkWidget *button_ok;
   GtkWidget *button_cancel;
   GtkWidget *button_apply;
-	GtkWidget *font_preview_toggle;
-	GtkWidget *vscrollbar;
-	GtkWidget *rbutt;
-	GtkWidget *telem;
-	GtkWidget *gtk_icon;
-	GtkWidget *optmenu;
-	GtkWidget *menu;
-	GtkWidget *item;
-	GdkPixmap *icon;
-	GdkBitmap *mask;
-	GdkColor *transparent = NULL;
-	GSList *group;
-	gint i;
-	gchar *lalign_menu[] = {
-		(gchar *)layer_align_0_xpm,	_("none"),
-		(gchar *)layer_align_1_xpm,	_("bottom-left"),
-		(gchar *)layer_align_2_xpm,	_("bottom-center"),
-		(gchar *)layer_align_3_xpm,	_("bottom-right"),
-		(gchar *)layer_align_4_xpm,	_("middle-left"),
-		(gchar *)layer_align_5_xpm,	_("center"),
-		(gchar *)layer_align_6_xpm,	_("middle-right"),
-		(gchar *)layer_align_7_xpm,	_("top-left"),
-		(gchar *)layer_align_8_xpm,	_("top-center"),
-		(gchar *)layer_align_9_xpm,	_("top-right"),
-		NULL,	NULL,
-	};
-
-	*main_window = mw = g_new0(GdtMainWindow, 1);
-	mw->font_preview_enabled = FALSE;
-	mw->ok_pressed = FALSE;
-	
-	tooltips = gtk_tooltips_new();
+  GtkWidget *font_preview_toggle;
+  GtkWidget *vscrollbar;
+  GtkWidget *rbutt;
+  GtkWidget *telem;
+  GtkWidget *gtk_icon;
+  GtkWidget *optmenu;
+  GtkWidget *menu;
+  GtkWidget *item;
+  GdkPixmap *icon;
+  GdkBitmap *mask;
+  GdkColor *transparent = NULL;
+  GSList *group;
+  gint i;
+  gchar *title;
+  gchar *lalign_menu[] = 
+  {
+    (gchar *)layer_align_0_xpm,	N_("none"),
+    (gchar *)layer_align_1_xpm,	N_("bottom-left"),
+    (gchar *)layer_align_2_xpm,	N_("bottom-center"),
+    (gchar *)layer_align_3_xpm,	N_("bottom-right"),
+    (gchar *)layer_align_4_xpm,	N_("middle-left"),
+    (gchar *)layer_align_5_xpm,	N_("center"),
+    (gchar *)layer_align_6_xpm,	N_("middle-right"),
+    (gchar *)layer_align_7_xpm,	N_("top-left"),
+    (gchar *)layer_align_8_xpm,	N_("top-center"),
+    (gchar *)layer_align_9_xpm,	N_("top-right"),
+    NULL,	NULL,
+  };
+
+  *main_window = mw = g_new0(GdtMainWindow, 1);
+  mw->font_preview_enabled = FALSE;
+  mw->ok_pressed = FALSE;
+  
+  tooltips = gtk_tooltips_new();
 
   mw->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-  gtk_window_set_title(GTK_WINDOW(mw->window), "GDynText "GDYNTEXT_VERSION);
+  title = g_strconcat (_("GDynText"), " ", GDYNTEXT_VERSION, NULL);
+  gtk_window_set_title(GTK_WINDOW(mw->window), title);
+  g_free (title);
   gtk_window_set_policy(GTK_WINDOW(mw->window), TRUE, TRUE, FALSE);
 	gtk_widget_set_usize(mw->window, 550, 400);
   gtk_container_border_width(GTK_CONTAINER(mw->window), 0);
@@ -452,7 +455,7 @@ GdtMainWindow *create_main_window(GdtMainWindow **main_window, GdtVals *data)
 		gtk_widget_show(gtk_icon);
 		gtk_box_pack_start(GTK_BOX(hbox), gtk_icon, FALSE, FALSE, 2);
 
-		label = gtk_label_new(lalign_menu[i + 1]);
+		label = gtk_label_new (gettext (lalign_menu[i + 1]));
 		gtk_widget_show(label);
 		gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 2);
 	}
@@ -574,7 +577,7 @@ GdtMainWindow *create_main_window(GdtMainWindow **main_window, GdtVals *data)
 	gtk_button_box_set_spacing(GTK_BUTTON_BOX(hbbox2), 4);
   gtk_widget_show(hbbox2);
 
-  button_ok = gtk_button_new_with_label(_("Ok"));
+  button_ok = gtk_button_new_with_label(_("OK"));
   GTK_WIDGET_SET_FLAGS(button_ok, GTK_CAN_DEFAULT);
 	gtk_signal_connect(GTK_OBJECT(button_ok), "button_press_event",
 		GTK_SIGNAL_FUNC(on_main_window_ok_press_event), data);
@@ -585,7 +588,7 @@ GdtMainWindow *create_main_window(GdtMainWindow **main_window, GdtVals *data)
 
 	gtk_tooltips_set_tip(tooltips, button_ok,
 		_("Holding the Shift key while pressing this button will force GDynText "
-			"in changing the layer name as done in GIMP 1.0."), NULL);
+		  "in changing the layer name as done in GIMP 1.0."), NULL);
 
   button_apply = gtk_button_new_with_label(_("Apply"));
   GTK_WIDGET_SET_FLAGS(button_apply, GTK_CAN_DEFAULT);
@@ -915,7 +918,7 @@ void on_charmap_button_toggled(GtkWidget *widget, gpointer data)
 {
 	if (GTK_TOGGLE_BUTTON(widget)->active) {
 		if (charmap_window == NULL) {
-			charmap_window = charmap_window_new(_("GDynText "GDYNTEXT_VERSION" : CharMap"));
+			charmap_window = charmap_window_new(_("GDynText: CharMap"));
 			gtk_widget_set_usize(charmap_window, 430, 270);
 			gtk_window_position(GTK_WINDOW(charmap_window), GTK_WIN_POS_CENTER);
 			gtk_signal_connect(GTK_OBJECT(charmap_window), "destroy", GTK_SIGNAL_FUNC(on_window_destroy), &charmap_window);
@@ -967,7 +970,7 @@ void on_charmap_window_insert(GtkWidget *widget, gpointer data)
 void on_load_text_clicked(GtkWidget *widget, gpointer data)
 {
 	if (!load_file_selection) {
-		load_file_selection = gtk_file_selection_new(_("GDynText "GDYNTEXT_VERSION": Load text"));
+		load_file_selection = gtk_file_selection_new(_("GDynText: Load text"));
 		gtk_file_selection_hide_fileop_buttons(GTK_FILE_SELECTION(load_file_selection));
 		gtk_signal_connect(GTK_OBJECT(load_file_selection), "destroy", GTK_SIGNAL_FUNC(on_window_destroy), &load_file_selection);
 		gtk_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(load_file_selection)->cancel_button), "clicked",

plug-ins/gdyntext/gdyntextcompat.c

@@ -108,10 +108,13 @@ gboolean gdt_compat_load(GdtVals *data)
 	{
 		return FALSE;
 	} else if (GDT_MAGIC_REV(gdtparams) > GDT_MAGIC_REV(GDYNTEXT_MAGIC)) {
-		data->messages = g_list_append(data->messages, _(
-			" WARNING: GDynText is too old!"
-			" A newer version is required to handle this layer."
-			" Get it from "GDYNTEXT_WEB_PAGE""));
+	        static gchar *message = NULL;
+		if (!message) 
+		  message = g_strdup_printf (_(" WARNING: GDynText is too old!"
+					       " A newer version is required to handle this layer."
+					       " Get it from %s"), GDYNTEXT_WEB_PAGE);
+		
+	        data->messages = g_list_append (data->messages, message);
 		return TRUE;
 	}
 
@@ -158,8 +161,11 @@ gboolean gdt_compat_load(GdtVals *data)
 		font_metric == FONT_METRIC_PIXELS ? font_size : font_size * 10);
 
 	if (GDT_MAGIC_REV(gdtparams) < GDT_MAGIC_REV(GDYNTEXT_MAGIC)) {
-		data->messages = g_list_append(data->messages,
-			_(" Upgrading old GDynText layer to "GDYNTEXT_MAGIC"."));
+	        static gchar *message = NULL;
+		if (!message) 
+		  message = g_strdup_printf (_(" Upgrading old GDynText layer to %s."), GDYNTEXT_MAGIC);
+		
+	        data->messages = g_list_append (data->messages, message);
 	}
 	
 #ifdef DEBUG

po-plug-ins/ChangeLog

+2000-07-30  Sven Neumann  <sven@gimp.org>
+
+	* POTFILES.in: added plug-ins/gdyntext/gdyntextcompat.c
+
+	* de.po: updated german translation
+	
 2000-07-30  Tor Lillqvist  <tml@iki.fi>
 
 	* ko.po: Remove the space from the end of one message I added on

po-plug-ins/POTFILES.in

@@ -166,6 +166,7 @@ plug-ins/gdyntext/charmap_window.c
 plug-ins/gdyntext/font_selection.c
 plug-ins/gdyntext/gdyntext.c
 plug-ins/gdyntext/gdyntext_ui.c
+plug-ins/gdyntext/gdyntextcompat.c
 plug-ins/gdyntext/message_window.c
 plug-ins/gfig/gfig.c
 plug-ins/gflare/gflare.c

po-plug-ins/de.po

@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GIMP 1.1.24\n"
-"POT-Creation-Date: 2000-07-29 22:24+0200\n"
-"PO-Revision-Date: 2000-07-29 22:49+02:00\n"
+"POT-Creation-Date: 2000-07-30 15:56+0200\n"
+"PO-Revision-Date: 2000-07-30 15:56+02:00\n"
 "Last-Translator: Sven Neumann <sven@gimp.org>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -30,7 +30,7 @@ msgstr "AlienMap"
 
 #: plug-ins/AlienMap/AlienMap.c:615 plug-ins/AlienMap2/AlienMap2.c:607
 #: plug-ins/FractalExplorer/Dialogs.c:282
-#: plug-ins/FractalExplorer/Dialogs.c:1372 plug-ins/gdyntext/gdyntext_ui.c:608
+#: plug-ins/FractalExplorer/Dialogs.c:1372 plug-ins/gdyntext/gdyntext_ui.c:567
 #: plug-ins/gfig/gfig.c:3382 plug-ins/imagemap/imap_about.c:33
 #: plug-ins/webbrowser/webbrowser.c:279
 msgid "About"
@@ -100,7 +100,7 @@ msgstr "
 #: plug-ins/gap/gap_decode_xanim.c:177 plug-ins/gap/gap_lib.c:221
 #: plug-ins/gap/gap_mod_layer.c:145 plug-ins/gap/gap_mov_dialog.c:487
 #: plug-ins/gap/gap_mpege.c:191 plug-ins/gap/gap_resi_dialog.c:149
-#: plug-ins/gdyntext/gdyntext_ui.c:201 plug-ins/gdyntext/gdyntext_ui.c:621
+#: plug-ins/gdyntext/gdyntext_ui.c:202 plug-ins/gdyntext/gdyntext_ui.c:580
 #: plug-ins/gfig/gfig.c:4088 plug-ins/gfig/gfig.c:4433
 #: plug-ins/gfig/gfig.c:4516 plug-ins/gfig/gfig.c:4862
 #: plug-ins/gflare/gflare.c:2465 plug-ins/gflare/gflare.c:3475
@@ -1346,7 +1346,7 @@ msgstr "Z-Koordinate des Objektes im XYZ-Raum"
 
 #. Rotation
 #: plug-ins/MapObject/mapobject_ui.c:1072 plug-ins/common/ps.c:2814
-#: plug-ins/gdyntext/gdyntext_ui.c:500
+#: plug-ins/gdyntext/gdyntext_ui.c:479
 msgid "Rotation"
 msgstr "Rotation"
 
@@ -2212,9 +2212,9 @@ msgstr "Animation abspielen: "
 #: plug-ins/dbbrowser/dbbrowser_utils.c:158
 #: plug-ins/dbbrowser/dbbrowser_utils.c:175 plug-ins/gap/gap_arr_dialog.c:783
 #: plug-ins/gap/gap_navigator_dialog.c:3158
-#: plug-ins/gdyntext/charmap_window.c:143 plug-ins/gdyntext/gdyntext_ui.c:636
+#: plug-ins/gdyntext/charmap_window.c:135 plug-ins/gdyntext/gdyntext_ui.c:600
 #: plug-ins/gfig/gfig.c:1986 plug-ins/gfig/gfig.c:2046
-#: plug-ins/helpbrowser/helpbrowser.c:803
+#: plug-ins/helpbrowser/helpbrowser.c:822
 #: plug-ins/ifscompose/ifscompose.c:1233 plug-ins/imagemap/imap_menu.c:227
 #: plug-ins/print/gimp_color_window.c:81
 msgid "Close"
@@ -5481,7 +5481,7 @@ msgstr "
 #. gtk_container_border_width (GTK_CONTAINER (box2), 5);
 #: plug-ins/common/sample_colorize.c:1367 plug-ins/common/tileit.c:564
 #: plug-ins/dbbrowser/dbbrowser_utils.c:156
-#: plug-ins/gdyntext/gdyntext_ui.c:643 plug-ins/gimpressionist/orientmap.c:633
+#: plug-ins/gdyntext/gdyntext_ui.c:593 plug-ins/gimpressionist/orientmap.c:633
 #: plug-ins/gimpressionist/presets.c:640 plug-ins/gimpressionist/sizemap.c:492
 #: plug-ins/imagemap/imap_default_dialog.c:122
 msgid "Apply"
@@ -9886,32 +9886,25 @@ msgstr "Y-Faktor:"
 msgid "Constrain Ratio"
 msgstr "Seitenverhltnis beibehalten"
 
-#: plug-ins/gdyntext/charmap.c:120
+#: plug-ins/gdyntext/charmap.c:117
 #, c-format
 msgid "Char: %c, %d, 0x%02x"
 msgstr "Zeichen: %c, %d, 0x%02x"
 
-#: plug-ins/gdyntext/charmap_window.c:123
+#: plug-ins/gdyntext/charmap_window.c:115
 msgid "Selected char:"
 msgstr "Ausgewhltes Zeichen:"
 
-#: plug-ins/gdyntext/charmap_window.c:137 plug-ins/imagemap/imap_polygon.c:452
+#: plug-ins/gdyntext/charmap_window.c:129 plug-ins/imagemap/imap_polygon.c:452
 msgid "Insert"
 msgstr "Einfgen"
 
-#: plug-ins/gdyntext/charmap_window.c:140
+#: plug-ins/gdyntext/charmap_window.c:132
 msgid "Insert the selected char at the cursor position"
 msgstr "Ausgewhltes Zeichen an der Cursorposition einfgen"
 
-#: plug-ins/gdyntext/font_selection.c:142
-msgid "MAX_FONTS exceeded. Some fonts may be missing."
-msgstr "MAX_FONTS berlaufen. Es kann sein, dass Schriftarten fehlen."
-
-#. "-*-(fn)-(wg)-(sl)-(sp)-*-(px)-(po * 10)-*-*-*-*-*-*"
-#: plug-ins/gdyntext/font_selection.c:214
-#: plug-ins/gdyntext/font_selection.c:268
-#: plug-ins/gdyntext/font_selection.c:355
-#: plug-ins/gdyntext/font_selection.c:379 plug-ins/imagemap/imap_circle.c:265
+#: plug-ins/gdyntext/font_selection.c:165
+#: plug-ins/gdyntext/font_selection.c:308 plug-ins/imagemap/imap_circle.c:265
 #: plug-ins/imagemap/imap_circle.c:271 plug-ins/imagemap/imap_circle.c:277
 #: plug-ins/imagemap/imap_grid.c:202 plug-ins/imagemap/imap_grid.c:208
 #: plug-ins/imagemap/imap_polygon.c:437 plug-ins/imagemap/imap_polygon.c:444
@@ -9922,69 +9915,87 @@ msgstr "MAX_FONTS
 msgid "pixels"
 msgstr "Pixel"
 
-#: plug-ins/gdyntext/font_selection.c:215
-#: plug-ins/gdyntext/font_selection.c:355
+#: plug-ins/gdyntext/font_selection.c:166
 msgid "points"
 msgstr "Punkte"
 
-#: plug-ins/gdyntext/font_selection.c:315
-#, c-format
-msgid "Unknown font family \"%s\".\n"
-msgstr "Unbekannte Schriftfamilie: \"%s\".\n"
-
-#: plug-ins/gdyntext/font_selection.c:339
-#, c-format
-msgid "Unknown font style \"%s\" for family \"%s\".\n"
-msgstr "Unbekannte Schriftstil (\"%s\") fr Familie \"%s\".\n"
-
-#: plug-ins/gdyntext/gdyntext.c:157
+#: plug-ins/gdyntext/gdyntext.c:85
 msgid "<Image>/Filters/Render/Dynamic Text..."
 msgstr "<Image>/Filter/Render/Dynamischer Text..."
 
-#: plug-ins/gdyntext/gdyntext.c:351
-#, c-format
-msgid "Upgrading old GDynText layer to %s\n"
-msgstr "Konvertiere alte GDynText-Ebene zu %s\n"
-
-#: plug-ins/gdyntext/gdyntext.c:355
-#, c-format
+#: plug-ins/gdyntext/gdyntext.c:203
 msgid ""
-"WARNING: GDynText is too old!\n"
-"  You may loose some data by changing this text.\n"
-"  A newer version is required to handle this layer.\n"
-"  Get it from %s\n"
+" Current layer isn't a GDynText layer or it has no alpha channel. Forcing "
+"new layer creation."
 msgstr ""
-"WARNUNG: GDynText ist zu alt!\n"
-"  Sie knnten Daten verlieren, wenn Sie diesen Text ndern.\n"
-"  Eine neuere Version wird bentigt, um diese Ebene zu bearbeiten.\n"
-"  Sie bekommen sie hier: %s\n"
+"Die aktuelle Ebene ist keine GDynText-Ebene oder hat keinen Alpha-Kanel. "
+"Erzwinge Erzeugung einer neuer Ebene."
 
-#. remove old layer name
-#: plug-ins/gdyntext/gdyntext.c:394
+#: plug-ins/gdyntext/gdyntext.c:286 plug-ins/gdyntext/gdyntext.c:413
 msgid "GDynText Layer "
 msgstr "GDynText-Ebene "
 
-#: plug-ins/gdyntext/gdyntext.c:431
+#: plug-ins/gdyntext/gdyntext.c:322
 msgid "GIMP Dynamic Text"
 msgstr "GIMP Dynamischer Text"
 
-#: plug-ins/gdyntext/gdyntext.c:533
-msgid "GDynText Layer"
-msgstr "GDynText Ebene"
-
-#: plug-ins/gdyntext/gdyntext_ui.c:127
-msgid "GDynText Message Window"
+#: plug-ins/gdyntext/gdyntext_ui.c:132
+msgid "GDynText: Messages Window"
 msgstr "GDynText Nachrichtenfenster"
 
 #: plug-ins/gdyntext/gdyntext_ui.c:157
-msgid "About GDynText"
-msgstr "ber GDynText"
+msgid "GDynText: About ..."
+msgstr "ber GDynText ..."
 
-#: plug-ins/gdyntext/gdyntext_ui.c:221
+#: plug-ins/gdyntext/gdyntext_ui.c:220
 msgid "GDynText: Select Color"
 msgstr "GDynText: Farbe auswhlen"
 
-#: plug-ins/gdyntext/gdyntext_ui.c:321
+#: plug-ins/gdyntext/gdyntext_ui.c:280 plug-ins/gflare/gflare.c:4734
+msgid "none"
+msgstr "Kein"
+
+#: plug-ins/gdyntext/gdyntext_ui.c:281
+msgid "bottom-left"
+msgstr "Unten Links"
+
+#: plug-ins/gdyntext/gdyntext_ui.c:282
+msgid "bottom-center"
+msgstr "Unten Mitte"
+
+#: plug-ins/gdyntext/gdyntext_ui.c:283
+msgid "bottom-right"
+msgstr "Unten Rechts"
+
+#: plug-ins/gdyntext/gdyntext_ui.c:284
+msgid "middle-left"
+msgstr "Mitte links"
+
+#: plug-ins/gdyntext/gdyntext_ui.c:285
+msgid "center"
+msgstr "Mitte"
+
+#: plug-ins/gdyntext/gdyntext_ui.c:286
+msgid "middle-right"
+msgstr "Mitte rechts"
+
+#: plug-ins/gdyntext/gdyntext_ui.c:287
+msgid "top-left"
+msgstr "Oben Links"
+
+#: plug-ins/gdyntext/gdyntext_ui.c:288
+msgid "top-center"
+msgstr "Oben Mitte"
+
+#: plug-ins/gdyntext/gdyntext_ui.c:289
+msgid "top-right"
+msgstr "Oben Rechts"
+
+#: plug-ins/gdyntext/gdyntext_ui.c:300
+msgid "GDynText"
+msgstr "GDynText"
+
+#: plug-ins/gdyntext/gdyntext_ui.c:333
 msgid "Toggle creation of a new layer"
 msgstr "Erstellung einer neuen Ebene"
 
@@ -9992,59 +10003,76 @@ msgstr "Erstellung einer neuen Ebene"
 msgid "Load text from file"
 msgstr "Text aus Datei laden"
 
-#: plug-ins/gdyntext/gdyntext_ui.c:367
+#: plug-ins/gdyntext/gdyntext_ui.c:358
 msgid "Text color"
 msgstr "Textfarbe"
 
-#: plug-ins/gdyntext/gdyntext_ui.c:385
+#: plug-ins/gdyntext/gdyntext_ui.c:367
 msgid "Toggle anti-aliased text"
 msgstr "Kantenglttung einschalten"
 
-#: plug-ins/gdyntext/gdyntext_ui.c:408
+#: plug-ins/gdyntext/gdyntext_ui.c:378
 msgid "Left aligned text"
 msgstr "Linksbndiger Text"
 
-#: plug-ins/gdyntext/gdyntext_ui.c:427
+#: plug-ins/gdyntext/gdyntext_ui.c:387
 msgid "Centered text"
 msgstr "Zentrierter Text"
 
-#: plug-ins/gdyntext/gdyntext_ui.c:446
+#: plug-ins/gdyntext/gdyntext_ui.c:396
 msgid "Right aligned text"
 msgstr "Rechtsbndiger Text"
 
-#: plug-ins/gdyntext/gdyntext_ui.c:465
+#: plug-ins/gdyntext/gdyntext_ui.c:405
 msgid "Toggle text font preview"
 msgstr "Text Font Vorschau"
 
-#: plug-ins/gdyntext/gdyntext_ui.c:486
+#: plug-ins/gdyntext/gdyntext_ui.c:415
 msgid "Toggle CharMap window"
 msgstr "CharMap Fenster"
 
-#: plug-ins/gdyntext/gdyntext_ui.c:496
-msgid "Set text rotation (degrees)"
-msgstr "Text Rotation einstellen (Grad)"
+#. Layer Alignment
+#: plug-ins/gdyntext/gdyntext_ui.c:428
+msgid ""
+"Layer\n"
+"Alignment"
+msgstr ""
+"Ebenen-\n"
+"ausrichtung"
+
+#: plug-ins/gdyntext/gdyntext_ui.c:436
+msgid "Set layer alignment"
+msgstr "Ebenenausrichtung bestimmen"
+
+#: plug-ins/gdyntext/gdyntext_ui.c:465
+msgid ""
+"Line\n"
+"Spacing"
+msgstr ""
+"Zeilen-\n"
+"abstand"
 
-#: plug-ins/gdyntext/gdyntext_ui.c:510
+#: plug-ins/gdyntext/gdyntext_ui.c:475
 msgid "Set line spacing"
 msgstr "Setze Zeilenabstand"
 
-#: plug-ins/gdyntext/gdyntext_ui.c:514
-msgid "Line Spacing"
-msgstr "Zeilenabstand"
+#: plug-ins/gdyntext/gdyntext_ui.c:488
+msgid "Set text rotation (degrees)"
+msgstr "Text Rotation einstellen (Grad)"
 
-#: plug-ins/gdyntext/gdyntext_ui.c:543
+#: plug-ins/gdyntext/gdyntext_ui.c:520
 msgid "Editable text sample"
 msgstr "Editierbares Text Beispiel"
 
-#: plug-ins/gdyntext/gdyntext_ui.c:561
+#: plug-ins/gdyntext/gdyntext_ui.c:533
 msgid "Clear preview"
 msgstr "Vorschau lschen"
 
-#: plug-ins/gdyntext/gdyntext_ui.c:570
+#: plug-ins/gdyntext/gdyntext_ui.c:539
 msgid "Preview default text sample"
 msgstr "Standard Text Beispiel Vorschau"
 
-#: plug-ins/gdyntext/gdyntext_ui.c:632
+#: plug-ins/gdyntext/gdyntext_ui.c:590
 msgid ""
 "Holding the Shift key while pressing this button will force GDynText in "
 "changing the layer name as done in GIMP 1.0."
@@ -10052,26 +10080,41 @@ msgstr ""
 "Wenn Sie die Shift-Taste gedrckt halten und diesen Button drcken, wird\n"
 "GDynText den Ebenennamen ndern, so wie es in GIMP 1.0 der Fall war."
 
-#: plug-ins/gdyntext/gdyntext_ui.c:1015
+#: plug-ins/gdyntext/gdyntext_ui.c:921