Mercurial > pidgin.yaz
changeset 15383:21bc8d84974f
I think this changes every user-visible string that contains 'Gaim.' We probably want the UI to be able
to provide a user-readable client name as well as website, as some of my re-wordings come out somewhat awkward when I force not mentioning Gaim
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Mon, 22 Jan 2007 09:27:02 +0000 |
| parents | a2689835f54a |
| children | 4e3721e790c9 |
| files | libpurple/log.c libpurple/plugin.c libpurple/plugins/filectl.c libpurple/protocols/bonjour/bonjour.c libpurple/protocols/irc/dcc_send.c libpurple/protocols/irc/msgs.c libpurple/protocols/msn/error.c libpurple/protocols/msn/msn.c libpurple/protocols/oscar/oscar.c libpurple/protocols/silc/silc.c libpurple/protocols/toc/toc.c libpurple/protocols/yahoo/yahoo.c |
| diffstat | 12 files changed, 23 insertions(+), 38 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/log.c Mon Jan 22 09:05:30 2007 +0000 +++ b/libpurple/log.c Mon Jan 22 09:27:02 2007 +0000 @@ -581,7 +581,7 @@ txt_logger_list_syslog); gaim_log_logger_add(txt_logger); - old_logger = gaim_log_logger_new("old", _("Old Gaim"), 9, + old_logger = gaim_log_logger_new("old", _("Old flat format"), 9, NULL, NULL, old_logger_finalize,
--- a/libpurple/plugin.c Mon Jan 22 09:05:30 2007 +0000 +++ b/libpurple/plugin.c Mon Jan 22 09:27:02 2007 +0000 @@ -535,7 +535,7 @@ dep_name); gaim_notify_error(NULL, NULL, - _("Gaim encountered errors loading the plugin."), tmp); + _("Unable to load the plugin"), tmp); g_free(tmp); g_list_free(dep_list); @@ -561,7 +561,7 @@ plugin->info->name); gaim_notify_error(NULL, NULL, - _("Gaim was unable to load your plugin."), tmp); + _("Unable to load your plugin."), tmp); g_free(tmp); g_list_free(dep_list); @@ -666,7 +666,7 @@ g_free(translated_name); gaim_notify_error(NULL, NULL, - _("Gaim encountered errors unloading the plugin."), tmp); + _("There were errors unloading the plugin."), tmp); g_free(tmp); } }
--- a/libpurple/plugins/filectl.c Mon Jan 22 09:05:30 2007 +0000 +++ b/libpurple/plugins/filectl.c Mon Jan 22 09:27:02 2007 +0000 @@ -245,12 +245,12 @@ GAIM_PRIORITY_DEFAULT, /**< priority */ FILECTL_PLUGIN_ID, /**< id */ - N_("Gaim File Control"), /**< name */ + N_("File Control"), /**< name */ VERSION, /**< version */ /** summary */ - N_("Allows you to control Gaim by entering commands in a file."), + N_("Allows control by entering commands in a file."), /** description */ - N_("Allows you to control Gaim by entering commands in a file."), + N_("Allows control by entering commands in a file."), "Eric Warmenhoven <eric@warmenhoven.org>", /**< author */ GAIM_WEBSITE, /**< homepage */
--- a/libpurple/protocols/bonjour/bonjour.c Mon Jan 22 09:05:30 2007 +0000 +++ b/libpurple/protocols/bonjour/bonjour.c Mon Jan 22 09:27:02 2007 +0000 @@ -471,8 +471,7 @@ else if (((fullname = getlogin()) != NULL) && (fullname[0] != '\0')) ; else - fullname = _("Gaim User"); - + fullname = _("John Noname"); /* Make sure fullname is valid UTF-8. If not, try to convert it. */ if (!g_utf8_validate(fullname, -1, NULL)) {
--- a/libpurple/protocols/irc/dcc_send.c Mon Jan 22 09:05:30 2007 +0000 +++ b/libpurple/protocols/irc/dcc_send.c Mon Jan 22 09:27:02 2007 +0000 @@ -294,7 +294,7 @@ if (sock < 0) { gaim_notify_error(gc, NULL, _("File Transfer Failed"), - _("Gaim could not open a listening port.")); + _("Could not open a listening port.")); gaim_xfer_cancel_local(xfer); return; } @@ -335,7 +335,7 @@ if (xd->listen_data == NULL) { gaim_xfer_unref(xfer); gaim_notify_error(gc, NULL, _("File Transfer Failed"), - _("Gaim could not open a listening port.")); + _("Could not open a listening port.")); gaim_xfer_cancel_local(xfer); }
--- a/libpurple/protocols/irc/msgs.c Mon Jan 22 09:05:30 2007 +0000 +++ b/libpurple/protocols/irc/msgs.c Mon Jan 22 09:27:02 2007 +0000 @@ -359,7 +359,7 @@ return; buf = g_strdup_printf(_("Unknown message '%s'"), args[1]); - gaim_notify_error(gc, _("Unknown message"), buf, _("Gaim has sent a message the IRC server did not understand.")); + gaim_notify_error(gc, _("Unknown message"), buf, _("The IRC server received a message it did not understand.")); g_free(buf); }
--- a/libpurple/protocols/msn/error.c Mon Jan 22 09:05:30 2007 +0000 +++ b/libpurple/protocols/msn/error.c Mon Jan 22 09:27:02 2007 +0000 @@ -35,7 +35,7 @@ _("Unable to parse message")); case 200: g_snprintf(msg, sizeof(msg), - _("Syntax Error (probably a Gaim bug)")); + _("Syntax Error (probably a client bug)")); break; case 201: g_snprintf(msg, sizeof(msg),
--- a/libpurple/protocols/msn/msn.c Mon Jan 22 09:05:30 2007 +0000 +++ b/libpurple/protocols/msn/msn.c Mon Jan 22 09:27:02 2007 +0000 @@ -1809,7 +1809,7 @@ "This either means that the user does not exist, " "or that the user exists " "but has not created a public profile.") : - _("Gaim could not find " /* This should never happen */ + _("Could not find " /* This should never happen */ "any information in the user's profile. " "The user most likely does not exist.")))); }
--- a/libpurple/protocols/oscar/oscar.c Mon Jan 22 09:05:30 2007 +0000 +++ b/libpurple/protocols/oscar/oscar.c Mon Jan 22 09:27:02 2007 +0000 @@ -1469,7 +1469,7 @@ g_snprintf(buf, sizeof(buf), _("You may be disconnected shortly. You may want to use TOC until " "this is fixed. Check %s for updates."), GAIM_WEBSITE); gaim_notify_warning(pos->gc, NULL, - _("Gaim was unable to get a valid AIM login hash."), + _("Unable to get a valid AIM login hash."), buf); gaim_input_remove(pos->inpa); close(pos->fd); @@ -1512,7 +1512,7 @@ buf = g_strdup_printf(_("You may be disconnected shortly. You may want to use TOC until " "this is fixed. Check %s for updates."), GAIM_WEBSITE); gaim_notify_warning(pos->gc, NULL, - _("Gaim was unable to get a valid AIM login hash."), + _("Unable to get a valid AIM login hash."), buf); g_free(buf); g_free(pos->modname); @@ -1601,7 +1601,7 @@ g_snprintf(buf, sizeof(buf), _("You may be disconnected shortly. " "Check %s for updates."), GAIM_WEBSITE); gaim_notify_warning(pos->gc, NULL, - _("Gaim was unable to get a valid login hash."), + _("Unable to get a valid login hash."), buf); } @@ -4454,9 +4454,9 @@ { gchar *errstr; errstr = g_strdup_printf(ngettext("The maximum profile length of %d byte " - "has been exceeded. Gaim has truncated it for you.", + "has been exceeded. It has been truncated it for you.", "The maximum profile length of %d bytes " - "has been exceeded. Gaim has truncated it for you.", + "has been exceeded. It has been truncated it for you.", od->rights.maxsiglen), od->rights.maxsiglen); gaim_notify_warning(gc, NULL, _("Profile too long."), errstr); g_free(errstr); @@ -4683,7 +4683,7 @@ if (reason == 0x0005) { gaim_notify_error(gc, NULL, _("Unable To Retrieve Buddy List"), - _("Gaim was temporarily unable to retrieve your buddy list from the AIM servers. Your buddy list is not lost, and will probably become available in a few hours.")); + _("The AIM servers were temporarily unable to send your buddy list. Your buddy list is not lost, and will probably become available in a few hours.")); if (od->getblisttimer > 0) gaim_timeout_remove(od->getblisttimer); od->getblisttimer = gaim_timeout_add(30000, gaim_ssi_rerequestdata, od);
--- a/libpurple/protocols/silc/silc.c Mon Jan 22 09:05:30 2007 +0000 +++ b/libpurple/protocols/silc/silc.c Mon Jan 22 09:27:02 2007 +0000 @@ -297,7 +297,7 @@ gaim_account_set_user_info(account, client->realname); } else { free(realname); - client->realname = strdup(_("Gaim User")); + client->realname = strdup(_("John Noname")); } client->hostname = silc_net_localhost(); @@ -1531,7 +1531,7 @@ g_free(silcargs); if (!silc_client_command_call(sg->client, sg->conn, silccmd)) { g_free(silccmd); - *error = g_strdup_printf(_("Unknown command: %s, (may be a Gaim bug)"), cmd); + *error = g_strdup_printf(_("Unknown command: %s, (may be a client bug)"), cmd); return GAIM_CMD_RET_FAILED; } g_free(silccmd);
--- a/libpurple/protocols/toc/toc.c Mon Jan 22 09:05:30 2007 +0000 +++ b/libpurple/protocols/toc/toc.c Mon Jan 22 09:27:02 2007 +0000 @@ -995,13 +995,6 @@ gaim_notify_info(gc, NULL, _("Password Change Successful"), NULL); } else if (!g_ascii_strcasecmp(c, "PAUSE")) { tdt->state = STATE_PAUSE; - gaim_notify_warning(gc, NULL, - _("TOC has sent a PAUSE command."), - _("When this happens, TOC ignores any messages " - "sent to it, and may kick you off if you send a" - " message. Gaim will prevent anything from " - "going through. This is only temporary, please " - "be patient.")); } else if (!g_ascii_strcasecmp(c, "RVOUS_PROPOSE")) { #if 0 char *user, *uuid, *cookie; @@ -2192,7 +2185,7 @@ ft->port = fr->port; ft->files = fr->files; - ft->window = window = gtk_file_selection_new(_("Gaim - Save As...")); + ft->window = window = gtk_file_selection_new(_("Save As...")); g_snprintf(buf, sizeof(buf), "%s/%s", gaim_home_dir(), fr->filename ? fr->filename : ""); gtk_file_selection_set_filename(GTK_FILE_SELECTION(window), buf); g_signal_connect(G_OBJECT(window), "destroy",
--- a/libpurple/protocols/yahoo/yahoo.c Mon Jan 22 09:05:30 2007 +0000 +++ b/libpurple/protocols/yahoo/yahoo.c Mon Jan 22 09:27:02 2007 +0000 @@ -1792,7 +1792,7 @@ break; default: buf = g_strdup_printf(_("The Yahoo server has requested the use of an unrecognized " - "authentication method. This version of Gaim will likely not be able " + "authentication method. You will probably not be able " "to successfully sign on to Yahoo. Check %s for updates."), GAIM_WEBSITE); gaim_notify_error(gc, "", _("Failed Yahoo! Authentication"), buf); @@ -1911,13 +1911,6 @@ "Gaim/" VERSION, FALSE, yahoo_login_page_cb, gc); if (url_data != NULL) yd->url_datas = g_slist_prepend(yd->url_datas, url_data); - gaim_notify_warning(gc, NULL, _("Normal authentication failed!"), - _("The normal authentication method has failed. " - "This means either your password is incorrect, " - "or Yahoo!'s authentication scheme has changed. " - "Gaim will now attempt to log in using Web " - "Messenger authentication, which will result " - "in reduced functionality and features.")); return; } msg = g_strdup(_("Incorrect password."));