# HG changeset patch # User Sean Egan # Date 1169898092 0 # Node ID 42961709cb307f6fff130ff3b61f1d26bac60925 # Parent 9c0cf4db1f4dcf55b7453c6887fc3aa3e434b3fa This should be the last of the string changes diff -r 9c0cf4db1f4d -r 42961709cb30 configure.ac --- a/configure.ac Sat Jan 27 11:11:26 2007 +0000 +++ b/configure.ac Sat Jan 27 11:41:32 2007 +0000 @@ -7,6 +7,8 @@ AC_PREREQ([2.50]) +AC_DEFINE(PIDGIN_NAME, "Pidgin", [The user-visible application name]) + AC_PATH_PROG(sedpath, sed) dnl Storing configure arguments @@ -24,6 +26,7 @@ GETTEXT_PACKAGE=gaim AC_SUBST(GETTEXT_PACKAGE) + # before gettexting, in case iconv matters case "$host_os" in darwin*) diff -r 9c0cf4db1f4d -r 42961709cb30 console/plugins/gntgf.c --- a/console/plugins/gntgf.c Sat Jan 27 11:11:26 2007 +0000 +++ b/console/plugins/gntgf.c Sat Jan 27 11:41:32 2007 +0000 @@ -354,8 +354,8 @@ "gntgf", N_("GntGf"), VERSION, - N_("Toaster plugin for Gaim-Text."), - N_("Toaster plugin for Gaim-Text."), + N_("Toaster plugin"), + N_("Toaster plugin"), "Sadrul H Chowdhury ", "http://gaim.sourceforge.net", plugin_load, diff -r 9c0cf4db1f4d -r 42961709cb30 console/plugins/lastlog.c --- a/console/plugins/lastlog.c Sat Jan 27 11:11:26 2007 +0000 +++ b/console/plugins/lastlog.c Sat Jan 27 11:41:32 2007 +0000 @@ -120,8 +120,8 @@ "gntlastlog", N_("GntLastlog"), VERSION, - N_("Lastlog plugin for gaim-text."), - N_("Lastlog plugin for gaim-text."), + N_("Lastlog plugin."), + N_("Lastlog plugin."), "Sadrul H Chowdhury ", "http://gaim.sourceforge.net", plugin_load, diff -r 9c0cf4db1f4d -r 42961709cb30 libpurple/plugins/ciphertest.c --- a/libpurple/plugins/ciphertest.c Sat Jan 27 11:11:26 2007 +0000 +++ b/libpurple/plugins/ciphertest.c Sat Jan 27 11:41:32 2007 +0000 @@ -264,9 +264,9 @@ N_("Cipher Test"), /**< name */ VERSION, /**< version */ /** summary */ - N_("Tests the ciphers that ship with gaim."), + N_("Tests the ciphers that ship with libpurple."), /** description */ - N_("Tests the ciphers that ship with gaim."), + N_("Tests the ciphers that ship with libpurple."), "Gary Kramlich ", /**< author */ GAIM_WEBSITE, /**< homepage */ diff -r 9c0cf4db1f4d -r 42961709cb30 libpurple/protocols/bonjour/bonjour.c --- a/libpurple/protocols/bonjour/bonjour.c Sat Jan 27 11:11:26 2007 +0000 +++ b/libpurple/protocols/bonjour/bonjour.c Sat Jan 27 11:41:32 2007 +0000 @@ -478,7 +478,7 @@ gchar *tmp; tmp = g_locale_to_utf8(fullname, -1, NULL, NULL, NULL); if ((tmp == NULL) || (*tmp == '\0')) - fullname = _("Gaim User"); + fullname = _("Purple Person"); } #else @@ -536,7 +536,7 @@ } if (!fullname) - fullname = g_strdup(_("Gaim User")); + fullname = g_strdup(_("Purple Person")); #endif /* Split the real name into a first and last name */ diff -r 9c0cf4db1f4d -r 42961709cb30 libpurple/protocols/msn/msn.c --- a/libpurple/protocols/msn/msn.c Sat Jan 27 11:11:26 2007 +0000 +++ b/libpurple/protocols/msn/msn.c Sat Jan 27 11:41:32 2007 +0000 @@ -723,9 +723,7 @@ gc->wants_to_die = TRUE; gaim_connection_error(gc, _("SSL support is needed for MSN. Please install a supported " - "SSL library. See http://gaim.sf.net/faq-ssl.php for more " - "information.")); - + "SSL library.")); return; } diff -r 9c0cf4db1f4d -r 42961709cb30 libpurple/protocols/oscar/oscar.c --- a/libpurple/protocols/oscar/oscar.c Sat Jan 27 11:11:26 2007 +0000 +++ b/libpurple/protocols/oscar/oscar.c Sat Jan 27 11:41:32 2007 +0000 @@ -4503,9 +4503,9 @@ gchar *errstr; errstr = g_strdup_printf(ngettext("The maximum away message length of %d byte " - "has been exceeded. Gaim has truncated it for you.", + "has been exceeded. It has been truncated for you.", "The maximum away message length of %d bytes " - "has been exceeded. Gaim has truncated it for you.", + "has been exceeded. It has been truncated for you.", od->rights.maxawaymsglen), od->rights.maxawaymsglen); gaim_notify_warning(gc, NULL, _("Away message too long."), errstr); g_free(errstr); diff -r 9c0cf4db1f4d -r 42961709cb30 libpurple/protocols/qq/buddy_info.c --- a/libpurple/protocols/qq/buddy_info.c Sat Jan 27 11:11:26 2007 +0000 +++ b/libpurple/protocols/qq/buddy_info.c Sat Jan 27 11:41:32 2007 +0000 @@ -562,7 +562,7 @@ gint prefix_len = strlen(QQ_ICON_PREFIX); gint suffix_len = strlen(QQ_ICON_SUFFIX); gint dir_len = strlen(buddy_icon_dir); - gchar *errmsg = g_strconcat(_("You are attempting to set a custom face. Gaim currently only allows the standard faces. Please choose an image from "), buddy_icon_dir, ".", NULL); + gchar *errmsg = g_strconcat(_("Setting custom faces is not currently supported. Please choose an image from "), buddy_icon_dir, ".", NULL); gboolean icon_global = gaim_account_get_bool(gc->account, "use-global-buddyicon", TRUE); if (!icon_path) diff -r 9c0cf4db1f4d -r 42961709cb30 pidgin/gtkaccount.c --- a/pidgin/gtkaccount.c Sat Jan 27 11:11:26 2007 +0000 +++ b/pidgin/gtkaccount.c Sat Jan 27 11:41:32 2007 +0000 @@ -2130,11 +2130,11 @@ label = gtk_label_new(NULL); /* Translators: Please maintain the use of -> or <- to represent the menu heirarchy */ pretty = gaim_gtk_make_pretty_arrows(_( - "Welcome to Gaim!\n\n" + "Welcome to " PIDGIN_NAME "!\n\n" - "You have no IM accounts configured. To start connecting with Gaim " + "You have no IM accounts configured. To start connecting with " PIDGIN_NAME " " "press the Add button below and configure your first " - "account. If you want Gaim to connect to multiple IM accounts, " + "account. If you want " PIDGIN_NAME " to connect to multiple IM accounts, " "press Add again to configure them all.\n\n" "You can come back to this window to add, edit, or remove " diff -r 9c0cf4db1f4d -r 42961709cb30 pidgin/gtkblist.c --- a/pidgin/gtkblist.c Sat Jan 27 11:11:26 2007 +0000 +++ b/pidgin/gtkblist.c Sat Jan 27 11:41:32 2007 +0000 @@ -4077,7 +4077,7 @@ #endif /* Translators: Please maintain the use of -> and <- to refer to menu heirarchy */ - pretty = gaim_gtk_make_pretty_arrows(_("Welcome to Gaim!\n\n" + pretty = gaim_gtk_make_pretty_arrows(_("Welcome to " PIDGIN_NAME "!\n\n" "You have no accounts enabled. Enable your IM accounts from the " "Accounts window at Accounts->Add/Edit. Once you " diff -r 9c0cf4db1f4d -r 42961709cb30 pidgin/gtkdialogs.c --- a/pidgin/gtkdialogs.c Sat Jan 27 11:11:26 2007 +0000 +++ b/pidgin/gtkdialogs.c Sat Jan 27 11:41:32 2007 +0000 @@ -358,10 +358,10 @@ GAIM_WEBSITE "\">" GAIM_WEBSITE "

"); #ifdef _WIN32 g_string_append_printf(str, _("IRC: " - "#wingaim on irc.freenode.net

")); + "#pidgwin on irc.freenode.net

")); #else g_string_append_printf(str, _("IRC: " - "#gaim on irc.freenode.net

")); + "#pidgin on irc.freenode.net

")); #endif /* Current Developers */ diff -r 9c0cf4db1f4d -r 42961709cb30 pidgin/gtkgaim.h --- a/pidgin/gtkgaim.h Sat Jan 27 11:11:26 2007 +0000 +++ b/pidgin/gtkgaim.h Sat Jan 27 11:41:32 2007 +0000 @@ -37,11 +37,6 @@ #endif /** - * Our user-readable name - */ -#define PIDGIN_NAME "Pidgin" - -/** * Our UI's identifier. */ #define GAIM_GTK_UI "gtk-gaim" diff -r 9c0cf4db1f4d -r 42961709cb30 pidgin/gtkmain.c --- a/pidgin/gtkmain.c Sat Jan 27 11:11:26 2007 +0000 +++ b/pidgin/gtkmain.c Sat Jan 27 11:41:32 2007 +0000 @@ -528,7 +528,7 @@ PIDGIN_NAME " has segfaulted and attempted to dump a core file.\n" "This is a bug in the software and has happened through\n" "no fault of your own.\n\n" - "If you can reproduce the crash, please notify the gaim\n" + "If you can reproduce the crash, please notify the Pidgin\n" "developers by reporting a bug at\n" "%sbug.php\n\n" "Please make sure to specify what you were doing at the time\n" diff -r 9c0cf4db1f4d -r 42961709cb30 pidgin/plugins/relnot.c --- a/pidgin/plugins/relnot.c Sat Jan 27 11:11:26 2007 +0000 +++ b/pidgin/plugins/relnot.c Sat Jan 27 11:41:32 2007 +0000 @@ -80,8 +80,8 @@ } g_string_append_printf(message, _("You can get version %s from:
" - "" - "http://gaim.sourceforge.net."), cur_ver); + "" + "http://pidgin.im."), cur_ver); gaim_notify_formatted(NULL, _("New Version Available"), _("New Version Available"), NULL, message->str, diff -r 9c0cf4db1f4d -r 42961709cb30 pidgin/plugins/win32/winprefs/winprefs.c --- a/pidgin/plugins/win32/winprefs/winprefs.c Sat Jan 27 11:11:26 2007 +0000 +++ b/pidgin/plugins/win32/winprefs/winprefs.c Sat Jan 27 11:41:32 2007 +0000 @@ -312,7 +312,7 @@ /* Autostart */ vbox = gaim_gtk_make_frame(ret, _("Startup")); - button = gtk_check_button_new_with_mnemonic(_("_Start Gaim on Windows startup")); + button = gtk_check_button_new_with_mnemonic(_("_Start " PIDGIN_NAME " on Windows startup")); gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0); if ((run_key_val = wgaim_read_reg_string(HKEY_CURRENT_USER, RUNKEY, "Gaim")) @@ -363,10 +363,10 @@ NULL, GAIM_PRIORITY_DEFAULT, WINPREFS_PLUGIN_ID, - N_("WinGaim Options"), + N_("Pidgwin Options"), VERSION, - N_("Options specific to Windows Gaim."), - N_("Provides options specific to Windows Gaim, such as buddy list docking."), + N_("Options specific to Windows " PIDGIN_NAME "."), + N_("Provides options specific to Windows " PIDGIN_NAME ", such as buddy list docking."), "Herman Bloggs ", GAIM_WEBSITE, plugin_load,