# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1209545211 0
# Node ID cc8903c59d6b74703f343e8eaa48333e7767f786
# Parent  2ff3eb79078dfbfed95ccd4b00b9bc98a0a0112a
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.

diff -r 2ff3eb79078d -r cc8903c59d6b finch/gntaccount.c
--- a/finch/gntaccount.c	Wed Apr 30 06:02:26 2008 +0000
+++ b/finch/gntaccount.c	Wed Apr 30 08:46:51 2008 +0000
@@ -122,7 +122,7 @@
 	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 @@
 	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 */
diff -r 2ff3eb79078d -r cc8903c59d6b finch/gntblist.c
--- a/finch/gntblist.c	Wed Apr 30 06:02:26 2008 +0000
+++ b/finch/gntblist.c	Wed Apr 30 08:46:51 2008 +0000
@@ -581,7 +581,7 @@
 	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 @@
 
 	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 @@
 
 	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 @@
 
 	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),
diff -r 2ff3eb79078d -r cc8903c59d6b finch/gntsound.c
--- a/finch/gntsound.c	Wed Apr 30 06:02:26 2008 +0000
+++ b/finch/gntsound.c	Wed Apr 30 08:46:51 2008 +0000
@@ -103,7 +103,7 @@
 	{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 *
diff -r 2ff3eb79078d -r cc8903c59d6b libpurple/plugins/newline.c
--- a/libpurple/plugins/newline.c	Wed Apr 30 06:02:26 2008 +0000
+++ b/libpurple/plugins/newline.c	Wed Apr 30 08:46:51 2008 +0000
@@ -102,11 +102,11 @@
 
 	"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@nosnilmot.com>",			/**< author			*/
 	PURPLE_WEBSITE,									/**< homepage		*/
 
diff -r 2ff3eb79078d -r cc8903c59d6b libpurple/protocols/jabber/buddy.c
--- a/libpurple/protocols/jabber/buddy.c	Wed Apr 30 06:02:26 2008 +0000
+++ b/libpurple/protocols/jabber/buddy.c	Wed Apr 30 08:46:51 2008 +0000
@@ -56,8 +56,7 @@
 {
 	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 @@
 	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 */
diff -r 2ff3eb79078d -r cc8903c59d6b libpurple/protocols/msn/error.c
--- a/libpurple/protocols/msn/error.c	Wed Apr 30 06:02:26 2008 +0000
+++ b/libpurple/protocols/msn/error.c	Wed Apr 30 08:46:51 2008 +0000
@@ -56,7 +56,7 @@
 			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"));
diff -r 2ff3eb79078d -r cc8903c59d6b libpurple/protocols/msn/userlist.c
--- a/libpurple/protocols/msn/userlist.c	Wed Apr 30 06:02:26 2008 +0000
+++ b/libpurple/protocols/msn/userlist.c	Wed Apr 30 08:46:51 2008 +0000
@@ -714,7 +714,7 @@
 		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;
diff -r 2ff3eb79078d -r cc8903c59d6b libpurple/protocols/msnp9/error.c
--- a/libpurple/protocols/msnp9/error.c	Wed Apr 30 06:02:26 2008 +0000
+++ b/libpurple/protocols/msnp9/error.c	Wed Apr 30 08:46:51 2008 +0000
@@ -56,7 +56,7 @@
 			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"));
diff -r 2ff3eb79078d -r cc8903c59d6b libpurple/protocols/msnp9/userlist.c
--- a/libpurple/protocols/msnp9/userlist.c	Wed Apr 30 06:02:26 2008 +0000
+++ b/libpurple/protocols/msnp9/userlist.c	Wed Apr 30 08:46:51 2008 +0000
@@ -652,7 +652,7 @@
 		{
 			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);
 		}
 
diff -r 2ff3eb79078d -r cc8903c59d6b libpurple/protocols/novell/nmuser.c
--- a/libpurple/protocols/novell/nmuser.c	Wed Apr 30 06:02:26 2008 +0000
+++ b/libpurple/protocols/novell/nmuser.c	Wed Apr 30 08:46:51 2008 +0000
@@ -1919,10 +1919,10 @@
 
 		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 @@
 			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");
diff -r 2ff3eb79078d -r cc8903c59d6b libpurple/protocols/simple/simple.c
--- a/libpurple/protocols/simple/simple.c	Wed Apr 30 06:02:26 2008 +0000
+++ b/libpurple/protocols/simple/simple.c	Wed Apr 30 08:46:51 2008 +0000
@@ -1890,7 +1890,7 @@
 	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;
 	}
 
diff -r 2ff3eb79078d -r cc8903c59d6b libpurple/protocols/toc/toc.c
--- a/libpurple/protocols/toc/toc.c	Wed Apr 30 06:02:26 2008 +0000
+++ b/libpurple/protocols/toc/toc.c	Wed Apr 30 08:46:51 2008 +0000
@@ -546,7 +546,7 @@
 			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."));
diff -r 2ff3eb79078d -r cc8903c59d6b libpurple/protocols/yahoo/yahoo.c
--- a/libpurple/protocols/yahoo/yahoo.c	Wed Apr 30 06:02:26 2008 +0000
+++ b/libpurple/protocols/yahoo/yahoo.c	Wed Apr 30 08:46:51 2008 +0000
@@ -2124,7 +2124,7 @@
 
 	switch (err) {
 	case 3:
-		msg = g_strdup(_("Invalid screen name."));
+		msg = g_strdup(_("Invalid username."));
 		reason = PURPLE_CONNECTION_ERROR_INVALID_USERNAME;
 		break;
 	case 13:
diff -r 2ff3eb79078d -r cc8903c59d6b pidgin/gtkaccount.c
--- a/pidgin/gtkaccount.c	Wed Apr 30 06:02:26 2008 +0000
+++ b/pidgin/gtkaccount.c	Wed Apr 30 08:46:51 2008 +0000
@@ -408,7 +408,7 @@
 	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 @@
 
 	/* 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);
 
diff -r 2ff3eb79078d -r cc8903c59d6b pidgin/gtkblist.c
--- a/pidgin/gtkblist.c	Wed Apr 30 06:02:26 2008 +0000
+++ b/pidgin/gtkblist.c	Wed Apr 30 08:46:51 2008 +0000
@@ -6467,7 +6467,7 @@
 
 	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);
 
diff -r 2ff3eb79078d -r cc8903c59d6b pidgin/gtkdialogs.c
--- a/pidgin/gtkdialogs.c	Wed Apr 30 06:02:26 2008 +0000
+++ b/pidgin/gtkdialogs.c	Wed Apr 30 08:46:51 2008 +0000
@@ -760,7 +760,7 @@
 
 	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 @@
 
 	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 @@
 
 	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),
diff -r 2ff3eb79078d -r cc8903c59d6b pidgin/gtksavedstatuses.c
--- a/pidgin/gtksavedstatuses.c	Wed Apr 30 06:02:26 2008 +0000
+++ b/pidgin/gtksavedstatuses.c	Wed Apr 30 08:46:51 2008 +0000
@@ -968,7 +968,7 @@
 	/* 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);
 
diff -r 2ff3eb79078d -r cc8903c59d6b pidgin/gtksound.c
--- a/pidgin/gtksound.c	Wed Apr 30 06:02:26 2008 +0000
+++ b/pidgin/gtksound.c	Wed Apr 30 08:46:51 2008 +0000
@@ -70,7 +70,7 @@
 	{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
diff -r 2ff3eb79078d -r cc8903c59d6b pidgin/plugins/gevolution/new_person_dialog.c
--- a/pidgin/plugins/gevolution/new_person_dialog.c	Wed Apr 30 06:02:26 2008 +0000
+++ b/pidgin/plugins/gevolution/new_person_dialog.c	Wed Apr 30 08:46:51 2008 +0000
@@ -267,7 +267,7 @@
 	}
 	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 @@
 
 		/* 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);
diff -r 2ff3eb79078d -r cc8903c59d6b pidgin/plugins/notify.c
--- a/pidgin/plugins/notify.c	Wed Apr 30 06:02:26 2008 +0000
+++ b/pidgin/plugins/notify.c	Wed Apr 30 08:46:51 2008 +0000
@@ -694,7 +694,7 @@
 	                 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"));