Added translator credits. Defined N_() again, so command line args are really translatable.

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@436 ea778897-0a13-0410-b9d1-a72fbfd435f5

ChangeLog

+2006-06-12  Enrico Troeger  <enrico.troeger@uvena.de>
+
+ * THANKS, src/about.c: Added translator credits.
+ * src/main.c: Defined N_() again, so command line args are really
+               translatable.
+
+
 2006-06-12  Frank Lanitz  <frank@frank.uvena.de>
 
  * configure.in: Added Belarusian and Russian language support.
 				 More Information at po/ChangeLog
 
+
 2006-06-11  Enrico Troeger  <enrico.troeger@uvena.de>
 
  * geany.glade, src/interface.c: Added some mnemonics in the file menu.

THANKS

@@ -22,6 +22,8 @@ Kevin Ellwood <kellwood@ameritech.net>
 Translators:
 ----------------------------------
 These people have translated Geany to foreign languages.
+Yura Semashko <yurand2@gmail.com> - be_BY
 Topi <topi@phreaker.net> - ca_ES
 Frank Lanitz <frank@frank.uvena.de> - de_DE
 Jacek Wolszczak <shutdownrunner@o2.pl> - pl_PL
+brahmann_ <brahmann@mthr.net.ru> - ru_RU

src/about.c

@@ -43,13 +43,17 @@ Nick Treleaven - %s\n\t\
 Frank Lanitz - %s\n\t\
 <frank@frank.uvena.de>\n\n\t\
 \n<span size=\"larger\" weight=\"bold\">%s</span>\n\t\
-Topi - %s ca_ES\n\t\
+\
+Yura Semashko - <language> be_BY\n\t\
+&lt;yurand2@gmail.com&gt;\n\n\t\
+Topi - <language> ca_ES\n\t\
 &lt;topi@phreaker.net&gt;\n\n\t\
-Frank Lanitz - %s de_DE\n\t\
+Frank Lanitz - <language> de_DE\n\t\
 &lt;frank@frank.uvena.de&gt;\n\n\t\
-Jacek Wolszczak - %s pl_PL\n\t\
-&lt;shutdownrunner@o2.pl&gt;"
-
+Jacek Wolszczak - <language> pl_PL\n\t\
+&lt;shutdownrunner@o2.pl&gt;\n\n\t\
+brahmann_ - <language> ru_RU\n\t\
+&lt;brahmann@mthr.net.ru&gt;"
 
 static void header_eventbox_style_set(GtkWidget *widget);
 static void header_label_style_set(GtkWidget *widget);
@@ -81,6 +85,7 @@ static GtkWidget *create_dialog(void)
 	GtkTextBuffer* tb;
 	gchar *license_text = NULL;
 	gchar buffer[512];
+	gchar *credits;
 
 	dialog = gtk_dialog_new();
 
@@ -197,10 +202,10 @@ static GtkWidget *create_dialog(void)
 	credits_label = gtk_label_new(NULL);
 	gtk_label_set_selectable(GTK_LABEL(credits_label), TRUE);
 	gtk_label_set_use_markup(GTK_LABEL(credits_label), TRUE);
-	g_snprintf(buffer, sizeof(buffer), CREDITS, _("Developers"), _("Maintainer"), _("developer"),
-												_("translation maintainer"), _("Translators"),
-												_("language"), _("language"), _("language"));
-	gtk_label_set_markup(GTK_LABEL(credits_label), buffer);
+	credits = g_strdup_printf(CREDITS, _("Developers"), _("Maintainer"), _("developer"),
+							 _("translation maintainer"), _("Translators"));
+	credits = utils_str_replace(credits, "<language>", _("language"));
+	gtk_label_set_markup(GTK_LABEL(credits_label), credits);
 	gtk_misc_set_alignment(GTK_MISC(credits_label), 0.0, 0.0);
 	gtk_widget_show(credits_label);
 	gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(credits_scrollwin), credits_label);
@@ -229,6 +234,7 @@ static GtkWidget *create_dialog(void)
 	tb = gtk_text_view_get_buffer(GTK_TEXT_VIEW(license_textview));
 	gtk_text_buffer_set_text(tb, license_text, strlen(license_text));
 
+	g_free(credits);
 	g_free(license_text);
 
 	gtk_notebook_append_page(GTK_NOTEBOOK(notebook), license_scrollwin, label);

src/main.c

@@ -50,6 +50,7 @@
 # include "vte.h"
 #endif
 
+#define N_(String) (String)
 
 #ifdef HAVE_FIFO
 static gchar fifo_name[512];
@@ -78,7 +79,9 @@ static GOptionEntry entries[] =
 	{ "vte-lib", 'l', 0, G_OPTION_ARG_FILENAME, &lib_vte, N_("filename of libvte.so"), NULL },
 #endif
 	{ "version", 'v', 0, G_OPTION_ARG_NONE, &show_version, N_("show version and exit"), NULL },
+#ifndef GEANY_DEBUG
 	{ "alt-scroll", 's', 0, G_OPTION_ARG_NONE, &alternative_scrolling, "use alternative scrolling, only for testing purposes", NULL },
+#endif
 	{ NULL, 0, 0, 0, NULL, NULL, NULL }
 };
 
@@ -424,8 +427,15 @@ gint main(gint argc, gchar **argv)
 	gint idx;
 	gchar *config_dir;
 
-	context = g_option_context_new(" - A fast and lightweight IDE");
+#ifdef ENABLE_NLS
+	bindtextdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
+	bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
+	textdomain(GETTEXT_PACKAGE);
+#endif
+
+	context = g_option_context_new(_(" - A fast and lightweight IDE"));
 	g_option_context_add_main_entries(context, entries, GETTEXT_PACKAGE);
+	g_option_group_set_translation_domain(g_option_context_get_main_group(context), GETTEXT_PACKAGE);
 	g_option_context_add_group(context, gtk_get_option_group(TRUE));
 	g_option_context_parse(context, &argc, &argv, &error);
 	g_option_context_free(context);
@@ -441,11 +451,6 @@ gint main(gint argc, gchar **argv)
 		return (0);
 	}
 
-#ifdef ENABLE_NLS
-	bindtextdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
-	bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
-	textdomain(GETTEXT_PACKAGE);
-#endif
 	gtk_set_locale();
 
 	signal(SIGTERM, signal_cb);