SF.net SVN: geany: [436] trunk
eht16 at users.sourceforge.net
eht16 at xxxxx
Mon Jun 12 13:17:25 UTC 2006
Revision: 436
Author: eht16
Date: 2006-06-12 06:17:11 -0700 (Mon, 12 Jun 2006)
ViewCVS: http://svn.sourceforge.net/geany/?rev=436&view=rev
Log Message:
-----------
Added translator credits. Defined N_() again, so command line args are really translatable.
Modified Paths:
--------------
trunk/ChangeLog
trunk/THANKS
trunk/src/about.c
trunk/src/main.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2006-06-12 12:10:22 UTC (rev 435)
+++ trunk/ChangeLog 2006-06-12 13:17:11 UTC (rev 436)
@@ -1,3 +1,10 @@
+2006-06-12 Enrico Troeger <enrico.troeger at 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 at frank.uvena.de>
* configure.in: Added Belarusian and Russian language support.
@@ -3,4 +10,5 @@
More Information at po/ChangeLog
+
2006-06-11 Enrico Troeger <enrico.troeger at uvena.de>
Modified: trunk/THANKS
===================================================================
--- trunk/THANKS 2006-06-12 12:10:22 UTC (rev 435)
+++ trunk/THANKS 2006-06-12 13:17:11 UTC (rev 436)
@@ -22,6 +22,8 @@
Translators:
----------------------------------
These people have translated Geany to foreign languages.
+Yura Semashko <yurand2 at gmail.com> - be_BY
Topi <topi at phreaker.net> - ca_ES
Frank Lanitz <frank at frank.uvena.de> - de_DE
Jacek Wolszczak <shutdownrunner at o2.pl> - pl_PL
+brahmann_ <brahmann at mthr.net.ru> - ru_RU
Modified: trunk/src/about.c
===================================================================
--- trunk/src/about.c 2006-06-12 12:10:22 UTC (rev 435)
+++ trunk/src/about.c 2006-06-12 13:17:11 UTC (rev 436)
@@ -43,14 +43,18 @@
Frank Lanitz - %s\n\t\
<frank at 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\
+<yurand2 at gmail.com>\n\n\t\
+Topi - <language> ca_ES\n\t\
<topi at phreaker.net>\n\n\t\
-Frank Lanitz - %s de_DE\n\t\
+Frank Lanitz - <language> de_DE\n\t\
<frank at frank.uvena.de>\n\n\t\
-Jacek Wolszczak - %s pl_PL\n\t\
-<shutdownrunner at o2.pl>"
+Jacek Wolszczak - <language> pl_PL\n\t\
+<shutdownrunner at o2.pl>\n\n\t\
+brahmann_ - <language> ru_RU\n\t\
+<brahmann at mthr.net.ru>"
-
static void header_eventbox_style_set(GtkWidget *widget);
static void header_label_style_set(GtkWidget *widget);
static void homepage_clicked(GtkButton *button, gpointer data);
@@ -81,6 +85,7 @@
GtkTextBuffer* tb;
gchar *license_text = NULL;
gchar buffer[512];
+ gchar *credits;
dialog = gtk_dialog_new();
@@ -197,10 +202,10 @@
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 @@
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);
Modified: trunk/src/main.c
===================================================================
--- trunk/src/main.c 2006-06-12 12:10:22 UTC (rev 435)
+++ trunk/src/main.c 2006-06-12 13:17:11 UTC (rev 436)
@@ -50,6 +50,7 @@
# include "vte.h"
#endif
+#define N_(String) (String)
#ifdef HAVE_FIFO
static gchar fifo_name[512];
@@ -78,7 +79,9 @@
{ "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 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 @@
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);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Commits
mailing list