pidgin: 018afa66: Change the string "screen name" to "user...
markdoliner at pidgin.im
markdoliner at pidgin.im
Wed Apr 30 04:50:43 EDT 2008
-----------------------------------------------------------------
Revision: 018afa661b9c72b48f2277e33e2fe55cc8b19235
Ancestor: c8c1655d608702ebf3095b7f69864eb677ab27fb
Author: markdoliner at pidgin.im
Date: 2008-04-30T08:46:51
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/018afa661b9c72b48f2277e33e2fe55cc8b19235
Modified files:
finch/gntaccount.c finch/gntblist.c finch/gntsound.c
libpurple/plugins/newline.c
libpurple/protocols/jabber/buddy.c
libpurple/protocols/msn/error.c
libpurple/protocols/msn/userlist.c
libpurple/protocols/msnp9/error.c
libpurple/protocols/msnp9/userlist.c
libpurple/protocols/novell/nmuser.c
libpurple/protocols/simple/simple.c
libpurple/protocols/toc/toc.c
libpurple/protocols/yahoo/yahoo.c pidgin/gtkaccount.c
pidgin/gtkblist.c pidgin/gtkdialogs.c
pidgin/gtksavedstatuses.c pidgin/gtksound.c
pidgin/plugins/gevolution/new_person_dialog.c
pidgin/plugins/notify.c
ChangeLog:
Change the string "screen name" to "username" everywhere. I think most
of us agree that "username" is a better term.
Also changing the accelerator key for "Username" in the add account
dialog from 'n' to 'u', which I think makes more sense.
-------------- next part --------------
============================================================
--- finch/gntaccount.c a4357d714dd198a01019ee07c80d34ccf4632a4e
+++ finch/gntaccount.c 33a066d8b8ee2b25225c3fc18f8a5e017c34f066
@@ -122,7 +122,7 @@ save_account_cb(AccountEditDialog *dialo
if (value == NULL || *value == '\0')
{
purple_notify_error(NULL, _("Error"), _("Account was not added"),
- _("Screenname of an account must be non-empty."));
+ _("Username of an account must be non-empty."));
return;
}
@@ -526,7 +526,7 @@ edit_account(PurpleAccount *account)
gnt_box_add_widget(GNT_BOX(window), hbox);
dialog->screenname = entry = gnt_entry_new(NULL);
- gnt_box_add_widget(GNT_BOX(hbox), gnt_label_new(_("Screen name:")));
+ gnt_box_add_widget(GNT_BOX(hbox), gnt_label_new(_("Username:")));
gnt_box_add_widget(GNT_BOX(hbox), entry);
/* User splits */
============================================================
--- finch/gntblist.c 3212db36a1fab4898eb40269ab13e7ec35d811ed
+++ finch/gntblist.c 6f236cb6e500498f9156031ee07303bccdcb9dc6
@@ -581,7 +581,7 @@ add_buddy_cb(void *data, PurpleRequestFi
PurpleBuddy *buddy;
if (!username)
- error = _("You must provide a screename for the buddy.");
+ error = _("You must provide a username for the buddy.");
else if (!group)
error = _("You must provide a group.");
else if (!account)
@@ -619,7 +619,7 @@ finch_request_add_buddy(PurpleAccount *a
purple_request_fields_add_group(fields, group);
- field = purple_request_field_string_new("screenname", _("Screen Name"), username, FALSE);
+ field = purple_request_field_string_new("screenname", _("Username"), username, FALSE);
purple_request_field_group_add_field(group, field);
field = purple_request_field_string_new("alias", _("Alias (optional)"), alias, FALSE);
@@ -2627,7 +2627,7 @@ block_select(GntMenuItem *item, gpointer
purple_request_fields(purple_get_blist(), _("Block/Unblock"),
NULL,
- _("Please enter the screen name or alias of the person "
+ _("Please enter the username or alias of the person "
"you would like to Block/Unblock."),
fields,
_("OK"), G_CALLBACK(block_select_cb),
@@ -2678,7 +2678,7 @@ send_im_select(GntMenuItem *item, gpoint
purple_request_fields(purple_get_blist(), _("New Instant Message"),
NULL,
- _("Please enter the screen name or alias of the person "
+ _("Please enter the username or alias of the person "
"you would like to IM."),
fields,
_("OK"), G_CALLBACK(send_im_select_cb),
============================================================
--- finch/gntsound.c 3dfc44a69e217e5ecd09a844c0bc7fdef2316277
+++ finch/gntsound.c e3d4ec224d2f49072793d4509de612d4218790a2
@@ -103,7 +103,7 @@ static FinchSoundEvent sounds[PURPLE_NUM
{PURPLE_SOUND_CHAT_YOU_SAY, N_("You talk in chat"), "send_chat_msg", "send.wav", NULL},
{PURPLE_SOUND_CHAT_SAY, N_("Others talk in chat"), "chat_msg_recv", "receive.wav", NULL},
{PURPLE_SOUND_POUNCE_DEFAULT, NULL, "pounce_default", "alert.wav", NULL},
- {PURPLE_SOUND_CHAT_NICK, N_("Someone says your screen name in chat"), "nick_said", "alert.wav", NULL}
+ {PURPLE_SOUND_CHAT_NICK, N_("Someone says your username in chat"), "nick_said", "alert.wav", NULL}
};
const char *
============================================================
--- libpurple/plugins/newline.c ba291c6c584a00d63449cf62116b2a6895205c90
+++ libpurple/plugins/newline.c f46f7047c6c79af18e1cde16b962ac6b5512582f
@@ -102,11 +102,11 @@ static PurplePluginInfo info =
"core-plugin_pack-newline", /**< id */
N_("New Line"), /**< name */
- DISPLAY_VERSION, /**< version */
+ DISPLAY_VERSION, /**< version */
N_("Prepends a newline to displayed message."), /**< summary */
N_("Prepends a newline to messages so that the "
"rest of the message appears below the "
- "screen name in the conversation window."), /**< description */
+ "username in the conversation window."), /**< description */
"Stu Tomlinson <stu at nosnilmot.com>", /**< author */
PURPLE_WEBSITE, /**< homepage */
============================================================
--- libpurple/protocols/jabber/buddy.c b461400d7415f5d853117bc4a40b52fb18138611
+++ libpurple/protocols/jabber/buddy.c 6738099084e5e2868f73c4ddb6e60cec29fcfb2f
@@ -56,8 +56,7 @@ void jabber_buddy_free(JabberBuddy *jb)
{
g_return_if_fail(jb != NULL);
- if(jb->error_msg)
- g_free(jb->error_msg);
+ g_free(jb->error_msg);
while(jb->resources)
jabber_buddy_resource_free(jb->resources->data);
@@ -498,6 +497,11 @@ void jabber_set_buddy_icon(PurpleConnect
if(((JabberStream*)gc->proto_data)->pep) {
/* XEP-0084: User Avatars */
if(img) {
+ /*
+ * TODO: This is pretty gross. The Jabber PRPL really shouldn't
+ * do voodoo to try to determine the image type, height
+ * and width.
+ */
/* A PNG header, including the IHDR, but nothing else */
const struct {
guchar signature[8]; /* must be hex 89 50 4E 47 0D 0A 1A 0A */
============================================================
--- libpurple/protocols/msn/error.c 8aea775766e6ab7bb9f6f45a75da2af996b13712
+++ libpurple/protocols/msn/error.c d9e68bb8458e306fa3ef96b05e897888084b2b99
@@ -56,7 +56,7 @@ msn_error_get_text(unsigned int type, gb
g_snprintf(msg, sizeof(msg), _("Already logged in"));
break;
case 208:
- g_snprintf(msg, sizeof(msg), _("Invalid screen name"));
+ g_snprintf(msg, sizeof(msg), _("Invalid username"));
break;
case 209:
g_snprintf(msg, sizeof(msg), _("Invalid friendly name"));
============================================================
--- libpurple/protocols/msn/userlist.c 153118bd43bb45f9980ce522075b857b4687cbd4
+++ libpurple/protocols/msn/userlist.c d9266dc3b23115952608fcda8d7d17b565209816
@@ -714,7 +714,7 @@ msn_userlist_add_buddy(MsnUserList *user
char *str = g_strdup_printf(_("Unable to add \"%s\"."), who);
purple_notify_error(NULL, NULL, str,
- _("The screen name specified is invalid."));
+ _("The username specified is invalid."));
g_free(str);
return;
============================================================
--- libpurple/protocols/msnp9/error.c 8aea775766e6ab7bb9f6f45a75da2af996b13712
+++ libpurple/protocols/msnp9/error.c d9e68bb8458e306fa3ef96b05e897888084b2b99
@@ -56,7 +56,7 @@ msn_error_get_text(unsigned int type, gb
g_snprintf(msg, sizeof(msg), _("Already logged in"));
break;
case 208:
- g_snprintf(msg, sizeof(msg), _("Invalid screen name"));
+ g_snprintf(msg, sizeof(msg), _("Invalid username"));
break;
case 209:
g_snprintf(msg, sizeof(msg), _("Invalid friendly name"));
============================================================
--- libpurple/protocols/msnp9/userlist.c b3a49019423820f1eaff69e03e2a494be8a9f62c
+++ libpurple/protocols/msnp9/userlist.c 22ed1fe84a34cf36ec8cf0f93a1d9f148d305981
@@ -652,7 +652,7 @@ msn_userlist_add_buddy(MsnUserList *user
{
char *str = g_strdup_printf(_("Unable to add \"%s\"."), who);
purple_notify_error(NULL, NULL, str,
- _("The screen name specified is invalid."));
+ _("The username specified is invalid."));
g_free(str);
}
============================================================
--- libpurple/protocols/novell/nmuser.c f292bb4b7532ff02229f965a8c33d72f41c90da7
+++ libpurple/protocols/novell/nmuser.c f4154af170b040585796d7b61320b72ef8f19394
@@ -1919,10 +1919,10 @@ nm_error_to_string(NMERR_T err)
case NMERR_AUTHENTICATION_FAILED:
case NMERR_CREDENTIALS_MISSING:
- return _("Incorrect screen name or password");
+ return _("Incorrect username or password");
case NMERR_HOST_NOT_FOUND:
- return _("Could not recognize the host of the screen name you entered");
+ return _("Could not recognize the host of the username you entered");
case NMERR_ACCESS_DENIED:
return _("Your account has been disabled because too many incorrect passwords were entered");
@@ -1935,7 +1935,7 @@ nm_error_to_string(NMERR_T err)
return _("You have reached your limit for the number of contacts allowed");
case NMERR_OBJECT_NOT_FOUND:
- return _("You have entered an incorrect screen name");
+ return _("You have entered an incorrect username");
case NMERR_DIRECTORY_UPDATE:
return _("An error occurred while updating the directory");
============================================================
--- libpurple/protocols/simple/simple.c 6f560bba5995648dab064514f7360bdd4b90af32
+++ libpurple/protocols/simple/simple.c e07f04cd366dd21c21f226f1e1d72b9dc7f81f09
@@ -1890,7 +1890,7 @@ static void simple_login(PurpleAccount *
if (strpbrk(username, " \t\v\r\n") != NULL) {
purple_connection_error_reason(gc,
PURPLE_CONNECTION_ERROR_INVALID_SETTINGS,
- _("SIP screen names may not contain whitespaces or @ symbols"));
+ _("SIP usernames may not contain whitespaces or @ symbols"));
return;
}
============================================================
--- libpurple/protocols/toc/toc.c 5578a9b909c434bd19db59996d7858513adfaba8
+++ libpurple/protocols/toc/toc.c e9f6b1632d6f1225856dc43310f1720b5f18720e
@@ -546,7 +546,7 @@ static char *show_error_message()
g_snprintf(buf, sizeof(buf), _("Failure unknown: %s."), w);
break;
case 980:
- g_snprintf(buf, sizeof(buf), _("Incorrect screen name or password."));
+ g_snprintf(buf, sizeof(buf), _("Incorrect username or password."));
break;
case 981:
g_snprintf(buf, sizeof(buf), _("The service is temporarily unavailable."));
============================================================
--- libpurple/protocols/yahoo/yahoo.c f03d8a1b21d1fd393c586bde1769d7b3012af212
+++ libpurple/protocols/yahoo/yahoo.c fbe9dedb1b8e662339c47ad83de8b2df9d4bdb4b
@@ -2124,7 +2124,7 @@ static void yahoo_process_authresp(Purpl
switch (err) {
case 3:
- msg = g_strdup(_("Invalid screen name."));
+ msg = g_strdup(_("Invalid username."));
reason = PURPLE_CONNECTION_ERROR_INVALID_USERNAME;
break;
case 13:
============================================================
--- pidgin/gtkaccount.c 99b7d01a52ebebd72e3269d5396bc17ebc08856f
+++ pidgin/gtkaccount.c 43cbebebe76dddfb4e19f9dda674dfbda4e8aec3
@@ -408,7 +408,7 @@ add_login_options(AccountPrefsDialog *di
g_object_set(G_OBJECT(dialog->screenname_entry), "truncate-multiline", TRUE, NULL);
#endif
- add_pref_box(dialog, vbox, _("User_name:"), dialog->screenname_entry);
+ add_pref_box(dialog, vbox, _("_Username:"), dialog->screenname_entry);
g_signal_connect(G_OBJECT(dialog->screenname_entry), "changed",
G_CALLBACK(screenname_changed_cb), dialog);
@@ -1913,7 +1913,7 @@ add_columns(GtkWidget *treeview, Account
/* Screen Name column */
column = gtk_tree_view_column_new();
- gtk_tree_view_column_set_title(column, _("Screen Name"));
+ gtk_tree_view_column_set_title(column, _("Username"));
gtk_tree_view_insert_column(GTK_TREE_VIEW(treeview), column, -1);
gtk_tree_view_column_set_resizable(column, TRUE);
============================================================
--- pidgin/gtkblist.c c785343d3a4ac3cc5bca399b9f6b7f7af1496a1c
+++ pidgin/gtkblist.c b07b5de22a6c592c2e2dec6fab936077000434a0
@@ -6467,7 +6467,7 @@ pidgin_blist_request_add_buddy(PurpleAcc
gtk_table_attach_defaults(GTK_TABLE(table), data->account_box, 0, 2, 0, 1);
- label = gtk_label_new_with_mnemonic(_("Buddy's _screen name:"));
+ label = gtk_label_new_with_mnemonic(_("Buddy's _username:"));
gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 1, 2);
============================================================
--- pidgin/gtkdialogs.c d86ff0659ca88059cd867d5c557d49d6083ff52d
+++ pidgin/gtkdialogs.c 0f6724c189b9802299a51957f426d926048ec704
@@ -760,7 +760,7 @@ pidgin_dialogs_im(void)
purple_request_fields(purple_get_blist(), _("New Instant Message"),
NULL,
- _("Please enter the screen name or alias of the person "
+ _("Please enter the username or alias of the person "
"you would like to IM."),
fields,
_("OK"), G_CALLBACK(pidgin_dialogs_im_cb),
@@ -899,7 +899,7 @@ pidgin_dialogs_info(void)
purple_request_fields(purple_get_blist(), _("Get User Info"),
NULL,
- _("Please enter the screen name or alias of the person "
+ _("Please enter the username or alias of the person "
"whose info you would like to view."),
fields,
_("OK"), G_CALLBACK(pidgin_dialogs_info_cb),
@@ -991,7 +991,7 @@ pidgin_dialogs_log(void)
purple_request_fields(purple_get_blist(), _("View User Log"),
NULL,
- _("Please enter the screen name or alias of the person "
+ _("Please enter the username or alias of the person "
"whose log you would like to view."),
fields,
_("OK"), G_CALLBACK(pidgin_dialogs_log_cb),
============================================================
--- pidgin/gtksavedstatuses.c 479f7d00757a8fdc6119dadd184fbf8accdd6332
+++ pidgin/gtksavedstatuses.c 915bad92c54f3c0f5dadaa965f0d21b6e1601ba0
@@ -968,7 +968,7 @@ status_editor_add_columns(StatusEditor *
/* Screen Name column */
column = gtk_tree_view_column_new();
gtk_tree_view_column_set_resizable(column, TRUE);
- gtk_tree_view_column_set_title(column, _("Screen Name"));
+ gtk_tree_view_column_set_title(column, _("Username"));
gtk_tree_view_insert_column(GTK_TREE_VIEW(dialog->treeview), column, -1);
gtk_tree_view_column_set_resizable(column, TRUE);
============================================================
--- pidgin/gtksound.c 0ad48b90c65f4e50724d8b888ee65cd03189451c
+++ pidgin/gtksound.c 7bed20643adecfafefe031b0f510f82389aa17e6
@@ -70,7 +70,7 @@ static const struct pidgin_sound_event s
{N_("Others talk in chat"), "chat_msg_recv", "receive.wav"},
/* this isn't a terminator, it's the buddy pounce default sound event ;-) */
{NULL, "pounce_default", "alert.wav"},
- {N_("Someone says your screen name in chat"), "nick_said", "alert.wav"}
+ {N_("Someone says your username in chat"), "nick_said", "alert.wav"}
};
static gboolean
============================================================
--- pidgin/plugins/gevolution/new_person_dialog.c 0c0d2ea85c02ce423f12f46dc794c7b4bee1c1a9
+++ pidgin/plugins/gevolution/new_person_dialog.c b9c1687386256cc6aca62e040360e7e63c5e03a4
@@ -267,7 +267,7 @@ gevo_new_person_dialog_show(EBook *book,
}
else
{
- label = gtk_label_new(_("Please enter the buddy's screen name and "
+ label = gtk_label_new(_("Please enter the buddy's username and "
"account type below."));
}
@@ -291,7 +291,7 @@ gevo_new_person_dialog_show(EBook *book,
/* Screen Name */
dialog->screenname = gtk_entry_new();
- add_pref_box(sg, vbox, _("Screen name:"), dialog->screenname);
+ add_pref_box(sg, vbox, _("Username:"), dialog->screenname);
if (username != NULL)
gtk_entry_set_text(GTK_ENTRY(dialog->screenname), username);
============================================================
--- pidgin/plugins/notify.c 5475a462cbd14a4f47f8129516cc4587a5d8814c
+++ pidgin/plugins/notify.c c7cb0754a4b2238397c52f3de049aadb03d9cd05
@@ -694,7 +694,7 @@ get_config_frame(PurplePlugin *plugin)
G_CALLBACK(type_toggle_cb), "type_chat");
ref = toggle;
- toggle = gtk_check_button_new_with_mnemonic(_("\t_Only when someone says your screen name"));
+ toggle = gtk_check_button_new_with_mnemonic(_("\t_Only when someone says your username"));
gtk_box_pack_start(GTK_BOX(vbox), toggle, FALSE, FALSE, 0);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle),
purple_prefs_get_bool("/plugins/gtk/X11/notify/type_chat_nick"));
More information about the Commits
mailing list