# HG changeset patch # User Luke Schierer # Date 1113221471 0 # Node ID 290131d5f626337c82584a024b51231ea2ae84cb # Parent d087e928ffd1e98686b995c52105988f02cdd612 [gaim-migrate @ 12466] " This patch started as an effort to either fix the bug that occurs when two translator's e-mail addresses are listed or to fill out the Debugging Information section with lines for all the #defines configure can set. Anyway, it fixes both of those issues and makes things in the about box a lot more consistent. " --rlaager committer: Tailor Script diff -r d087e928ffd1 -r 290131d5f626 src/gtkdialogs.c --- a/src/gtkdialogs.c Mon Apr 11 04:32:26 2005 +0000 +++ b/src/gtkdialogs.c Mon Apr 11 12:11:11 2005 +0000 @@ -91,24 +91,25 @@ static struct developer retired_developers[] = { {"Rob Flynn", N_("maintainer"), "gaim@robflynn.com"}, - {"Adam Fritzler", N_("former libfaim maintainer"), NULL}, - {"Eric Warmenhoven", N_("former lead developer"), "warmenhoven@yahoo.com"}, - {"Jim Duchek", N_("former maintainer"), NULL}, - {"Jim Seymour", N_("former Jabber developer"), NULL}, + {"Adam Fritzler", N_("libfaim maintainer"), NULL}, + {"Eric Warmenhoven", N_("lead developer"), "warmenhoven@yahoo.com"}, + {"Jim Duchek", N_("maintainer"), NULL}, + {"Jim Seymour", N_("Jabber developer"), NULL}, {"Mark Spencer", N_("original author"), "markster@marko.net"}, {"Syd Logan", N_("hacker and designated driver [lazy bum]"), NULL}, {NULL, NULL, NULL} }; static struct translator current_translators[] = { - {N_("Bulgarian"), "bg", "Alexander Shopov", "al_shopov@users.sf.net"}, + {N_("Bulgarian"), "bg", "Vladimira Girginova", "missing@here.is"}, + {N_("Bulgarian"), "bg", "Vladimir (Kaladan) Petkov", "vpetkov@i-space.org"}, {N_("Catalan"), "ca", "Josep Puigdemont", "tradgnome@softcatala.org"}, {N_("Czech"), "cs", "Miloslav Trmac", "mitr@volny.cz"}, {N_("Danish"), "da", "Morten Brix Pedersen", "morten@wtf.dk"}, + {N_("German"), "de", "Björn Voigt", "bjoern@cs.tu-berlin.de"}, {N_("Australian English"), "en_AU", "Peter Lawler", "trans@six-by-nine.com.au"}, {N_("British English"), "en_GB", "Luke Ross", "lukeross@sys3175.co.uk"}, {N_("Canadian English"), "en_CA", "Adam Weinberger", "adamw@gnome.org"}, - {N_("German"), "de", "Björn Voigt", "bjoern@cs.tu-berlin.de"}, {N_("Spanish"), "es", "Javier Fernández-Sanguino Peña", "jfs@debian.org"}, {N_("Finnish"), "fi", "Arto Alakulju", "arto@alakulju.net"}, {N_("French"), "fr", "Éric Boumaour", "zongo_fr@users.sourceforge.net"}, @@ -119,10 +120,11 @@ {N_("Japanese"), "ja", "Takashi Aihana", "aihana@gnome.gr.jp"}, {N_("Lithuanian"), "lt", "Gediminas Čičinskas", "gediminas@parok.lt"}, {N_("Korean"), "ko", "Kyung-uk Son", "vvs740@chol.com"}, - {N_("Dutch; Flemish"), "nl", "Vincent van Adrighem", "V.vanAdrighem@dirck.mine.nu"}, + {N_("Dutch, Flemish"), "nl", "Vincent van Adrighem", "V.vanAdrighem@dirck.mine.nu"}, {N_("Macedonian"), "mk", "Tomislav Markovski", "herrera@users.sf.net"}, {N_("Norwegian"), "no", "Petter Johan Olsen", "petter.olsen@cc.uit.no"}, - {N_("Polish"), "pl", "Krzysztof Foltman, Emil Nowak", "krzysztof@foltman.com;emil5@go2.pl"}, + {N_("Polish"), "pl", "Emil Nowak", "emil5@go2.pl"}, + {N_("Polish"), "pl", "Krzysztof Foltman", "krzysztof@foltman.com"}, {N_("Portuguese"), "pt", "Duarte Henriques", "duarte_henriques@myrealbox.com"}, {N_("Portuguese-Brazil"), "pt_BR", "Maurício de Lemos Rodrigues Collares Neto", "mauricioc@gmail.com"}, {N_("Romanian"), "ro", "Mişu Moldovan", "dumol@go.ro"}, @@ -132,7 +134,8 @@ {N_("Swedish"), "sv", "Tore Lundqvist", "tlt@mima.x.se"}, {N_("Vietnamese"), "vi", N_("T.M.Thanh and the Gnome-Vi Team"), "gnomevi-list@lists.sf.net"}, {N_("Simplified Chinese"), "zh_CN", "Funda Wang", "fundawang@linux.net.cn"}, - {N_("Traditional Chinese"), "zh_TW", "Ambrose C. Li, Paladin R. Liu", "acli@ada.dhs.org;paladin@ms1.hinet.net"}, + {N_("Traditional Chinese"), "zh_TW", "Ambrose C. Li", "acli@ada.dhs.org"}, + {N_("Traditional Chinese"), "zh_TW", "Paladin R. Liu", "paladin@ms1.hinet.net"}, {NULL, NULL, NULL, NULL} }; @@ -155,7 +158,8 @@ {N_("Russian"), "ru", "Alexandre Prokoudine", NULL}, {N_("Slovak"), "sk", "Daniel Režný", NULL}, {N_("Swedish"), "sv", "Christian Rose", NULL}, - {N_("Chinese"), "zh_CN, zh_TW", "Hashao, Rocky S. Lee", NULL}, + {N_("Simplified Chinese"), "zh_CN", "Hashao, Rocky S. Lee", NULL}, + {N_("Traditional Chinese"), "zh_TW", "Hashao, Rocky S. Lee", NULL}, {NULL, NULL, NULL, NULL} }; @@ -224,7 +228,7 @@ "AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, " "Novell GroupWise, Napster, Zephyr, and Gadu-Gadu " "all at once. It is written using " - "Gtk+ and is licensed under the GPL.

")); + "GTK+ and is licensed under the GNU GPL.

")); g_string_append(str, "URL: " GAIM_WEBSITE "

"); @@ -321,81 +325,118 @@ } g_string_append(str, "
"); + g_string_append_printf(str, "%s
", _("Debugging Information")); + /* The following primarly intented for user/developer interaction and thus ought not be translated */ - g_string_append(str, "Gaim was compiled with the following:
"); + #ifdef CONFIG_ARGS /* win32 build doesn't use configure */ - g_string_append(str, "Arguments to ./configure: " CONFIG_ARGS "
"); + g_string_append(str, " Arguments to ./configure: " CONFIG_ARGS "
"); #endif + #ifdef DEBUG - g_string_append(str, "Print debugging messages: Yes
"); + g_string_append(str, " Print debugging messages: Yes
"); #else - g_string_append(str, "Print debugging messages: No
"); -#endif /* DEBUG */ + g_string_append(str, " Print debugging messages: No
"); +#endif + #ifdef ENABLE_BINRELOC - g_string_append(str, "Binary relocation: Enabled
"); + g_string_append(str, " Binary relocation: Enabled
"); #else - g_string_append(str, "Binary relocation: Disabled
"); -#endif /* ENABLE_BINRELOC */ + g_string_append(str, " Binary relocation: Disabled
"); +#endif + #ifdef GAIM_PLUGINS - g_string_append(str, "Plugins: Enabled
"); + g_string_append(str, " Plugins: Enabled
"); +#else + g_string_append(str, " Plugins: Disabled
"); +#endif + +#ifdef HAVE_SSL + g_string_append(str, " SSL: Gaim was compiled with SSL support.
"); #else - g_string_append(str, "Plugins: Disabled
"); -#endif /* GAIM_PLUGINS */ -#ifdef HAVE_SSL - g_string_append(str, "SSL: Gaim was compiled with SSL support
"); -#else - g_string_append(str, "SSL: Gaim was NOT compiled with any SSL support!
"); + g_string_append(str, " SSL: Gaim was NOT compiled with any SSL support!
"); #endif -#ifdef HAVE_GNUTLS - g_string_append(str, "GNUTLS: Enabled
"); + + +g_string_append(str, "
Library Support
"); + +#if defined(LIBEBOOK_MAJOR_VER) && defined(LIBEBOOK_MINOR_VER) && defined(LIBEBOOK_MICRO_VER) + g_string_append_printf(str, " Evolution: Enabled (Version %i.%i.%i)
", LIBEBOOK_MAJOR_VER, LIBEBOOK_MINOR_VER, LIBEBOOK_MICRO_VER); #else - g_string_append(str, "GNUTLS: Disabled
"); + g_string_append_printf(str, " Evolution: Disabled
"); #endif -#ifdef HAVE_NSS - g_string_append(str, "NSS: Enabled
"); + +#ifdef USE_GTKSPELL + g_string_append(str, " GtkSpell: Enabled
"); #else - g_string_append(str, "NSS: Disabled
"); + g_string_append(str, " GtkSpell: Disabled
"); #endif -#ifdef HAVE_TK - g_string_append(str, "TK: Yes
"); + +#ifdef HAVE_GNUTLS + g_string_append(str, " GnuTLS: Enabled
"); +#else + g_string_append(str, " GnuTLS: Disabled
"); +#endif + +#ifdef USE_AO + g_string_append(str, " libao: Enabled
"); #else - g_string_append(str, "TK: No
"); -#endif -#ifdef LIBZEPHYR_EXT - g_string_append(str, "External libzephyr: Yes
"); -#else - g_string_append(str, "External libzephyr: No
"); + g_string_append(str, " libao: Disabled
"); #endif -#ifdef ZEPHYR_USES_KERBEROS - g_string_append(str, "Zephyr uses Kerberos: Yes
"); -#else - g_string_append(str, "Zephyr uses Kerberos: No
"); -#endif -#ifdef USE_AO - g_string_append(str, "AO: Yes
"); -#else - g_string_append(str, "AO: No
"); -#endif + #ifdef USE_NAS_AUDIO - g_string_append(str, "NAS Audio: Yes
"); + g_string_append(str, " Network Audio System (NAS): Enabled
"); #else - g_string_append(str, "NAS Audio: No
"); + g_string_append(str, " Network Audio System (NAS): Disabled
"); +#endif + +#ifdef HAVE_NSS + g_string_append(str, " Network Security Services (NSS): Enabled
"); +#else + g_string_append(str, " Network Security Services (NSS): Disabled
"); #endif -#ifdef USE_GTKSPELL - g_string_append(str, "GtkSpell: Enabled
"); + +#ifdef HAVE_STARTUP_NOTIFICATION + g_string_append(str, " Startup Notification: Enabled
"); #else - g_string_append(str, "GtkSpell: Disabled
"); + g_string_append(str, " Startup Notification: Disabled
"); +#endif + +#ifdef HAVE_TCL + g_string_append(str, " Tcl: Enabled
"); +#else + g_string_append(str, " Tcl: Disabled
"); #endif -#ifdef USE_SCREENSAVER - g_string_append(str, "XScreenSaver support: Yes
"); + +#ifdef HAVE_TK + g_string_append(str, " Tk: Enabled
"); #else - g_string_append(str, "XScreenSaver support: No
"); + g_string_append(str, " Tk: Disabled
"); +#endif + +#ifdef USE_SM + g_string_append(str, " X Session Management: Enabled
"); +#else + g_string_append(str, " X Session Management: Disabled
"); #endif -#ifdef USE_SM - g_string_append(str, "X SM support: Yes
"); + +#ifdef USE_SCREENSAVER + g_string_append(str, " XScreenSaver: Enabled
"); #else - g_string_append(str, "X SM support: No
"); + g_string_append(str, " XScreenSaver: Disabled
"); +#endif + +#ifdef LIBZEPHYR_EXT + g_string_append(str, " Zephyr library (libzephyr): External
"); +#else + g_string_append(str, " Zephyr library (libzephyr): Not External
"); +#endif + +#ifdef ZEPHYR_USES_KERBEROS + g_string_append(str, " Zephyr uses Kerberos: Yes
"); +#else + g_string_append(str, " Zephyr uses Kerberos: No
"); #endif /* End of not to be translated section */