changeset 21575:75f942a600db

merge of '08cb9f1663b00e65e42b571d63bfda3137430524' and '1401c4659f561b6820f3ef098c4f743797c0531a'
author Evan Schoenberg <evan.s@dreskin.net>
date Sat, 17 Nov 2007 19:41:05 +0000
parents 3ddb47c53a1b (current diff) 54b992168888 (diff)
children 8fd977cd39dc
files libpurple/protocols/silc10/pk.c
diffstat 120 files changed, 23672 insertions(+), 25364 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sat Nov 17 18:26:03 2007 +0000
+++ b/ChangeLog	Sat Nov 17 19:41:05 2007 +0000
@@ -2,14 +2,18 @@
 
 version 2.3.0:
 	http://developer.pidgin.im/query?status=closed&milestone=2.3.0
+		NOTE: Some bugs marked fixed in 2.2.1, 2.2.2 or 2.2.3 may not
+		      have been fixed until this release (2.3.0).
 
 	libpurple:
+	* Real usernames are now shown in the system log.
 	* We now honor a PURPLE_DISABLE_DEPRECATED define to allow plugins to
 	  catch deprecated functions earlier rather than later.
 	* Thanks to a patch from Intel, the Bonjour prpl now supports file
 	  transfers using XEP-0096 and XEP-0065.  This should enable file
-	  transfers between libpurple clients, but will not work with iChat
-	  or Adium as they use a different file transfer implementation.
+	  transfers between libpurple clients and Gajim clients, but will not
+	  work with iChat or Adium as they use a different file transfer
+	  implementation.
 
 	Pidgin:
 	* If a plugin says it can't be unloaded, we now display an error and
@@ -22,27 +26,6 @@
 	  list, rather than as buttons in the buddy list and with dialog
 	  boxes.  If several accounts are disabled when you sign on elsewhere,
 	  you can now re-enable them all with a single click.
-
-	Finch:
-	* If a plugin says it can't be unloaded, we now display an error and
-	  remove the plugin from the list of saved plugins so it won't load
-	  at the next startup.  Previously, we were ignoring this case, which
-	  could lead to crashes.
-	* It's possible to bind key-strokes to specific menuitems in the windows.
-	  Read the 'Menus' section in the man-page for details.
-	* 'transpose-chars' operation for the entry boxes. The default key-binding
-	  is ctrl+t.
-	* 'yank' operation for the entry boxes. The default binding is ctrl+y.
-
-version 2.2.3:
-	http://developer.pidgin.im/query?status=closed&milestone=2.2.3
-		NOTE: Some bugs marked fixed in 2.2.1 may not have been fixed
-		      until this release (2.2.3).
-
-	libpurple:
-	* Real usernames are now shown in the system log.
-
-	Pidgin:
 	* If you alias a buddy to an alias that is already present within
 	  a particular group, we now offer to merge the buddies into the
 	  same contact.
@@ -69,6 +52,17 @@
 	* The manual page has been heavily rewritten to bring it in line
 	  with current functionality.
 
+	Finch:
+	* If a plugin says it can't be unloaded, we now display an error and
+	  remove the plugin from the list of saved plugins so it won't load
+	  at the next startup.  Previously, we were ignoring this case, which
+	  could lead to crashes.
+	* It's possible to bind key-strokes to specific menuitems in the windows.
+	  Read the 'Menus' section in the man-page for details.
+	* 'transpose-chars' operation for the entry boxes. The default key-binding
+	  is ctrl+t.
+	* 'yank' operation for the entry boxes. The default binding is ctrl+y.
+
 version 2.2.2 (10/23/2007):
 	http://developer.pidgin.im/query?status=closed&milestone=2.2.2
 		NOTE: Due to the way this release was made, it is possible that
--- a/ChangeLog.API	Sat Nov 17 18:26:03 2007 +0000
+++ b/ChangeLog.API	Sat Nov 17 19:41:05 2007 +0000
@@ -3,7 +3,6 @@
 version 2.3.0 (??/??/????):
 	libpurple:
 		Added:
-		* purple_request_field_blist_nodes_new and its accessory functions.
 		* a PurpleConversation field and an alias field in PurpleConvMessage
 		* account-authorization signals (see account-signals.dox for
 		  details) (Stefan Ott)
@@ -15,7 +14,6 @@
 		  to unload a plugin--fails.  This then prevents the plugin
 		  from being saved in the saved plugins list, so it'll won't
 		  be loaded at the next startup.
-
 		* PurpleDisconnectReason enumeration of machine-readable
 		  types of connection error.
 		* purple_connection_error_reason(), to be used by prpls
@@ -53,42 +51,6 @@
 		* purple_network_listen_map_external() to temporarily disable
 		  mapping ports externally via NAT-PMP or UPnP.
 
-		* pidgin_dialogs_about_with_parent()
-		* pidgin_log_show_contact_with_parent()
-		* pidgin_log_show_with_parent()
-		* pidgin_plugin_dialog_show_with_parent()
-		* pidgin_pounce_editor_show_with_parent()
-		* pidgin_pounces_manager_show_with_parent()
-		* pidgin_syslog_show_with_parent()
-
-		* purple_request_accept_cancel_with_hint()
-		* purple_request_action_varg_with_hint()
-		* purple_request_action_with_hint()
-		* purple_request_choice_varg_with_hint()
-		* purple_request_choice_with_hint()
-		* purple_request_fields_with_hint()
-		* purple_request_file_with_hint()
-		* purple_request_folder_with_hint()
-		* purple_request_input_with_hint()
-		* purple_request_ok_cancel_with_hint()
-		* purple_request_yes_no_with_hint()
-
-		  UI hints set by libpurple:
-		* PURPLE_REQUEST_UI_HINT_ACCOUNT
-		* PURPLE_REQUEST_UI_HINT_BLIST
-		* PURPLE_REQUEST_UI_HINT_BUDDY
-		* PURPLE_REQUEST_UI_HINT_CONV
-		* PURPLE_REQUEST_UI_HINT_REGISTER
-		* PURPLE_REQUEST_UI_HINT_XFER
-
-		  Common UI hints set by UIs:
-		* PURPLE_REQUEST_UI_HINT_ACCOUNTMGR
-		* PURPLE_REQUEST_UI_HINT_CERTMGR
-		* PURPLE_REQUEST_UI_HINT_PLUGINMGR
-		* PURPLE_REQUEST_UI_HINT_POUNCEMGR
-		* PURPLE_REQUEST_UI_HINT_PREFSMGR
-		* PURPLE_REQUEST_UI_HINT_STATUSMGR
-
 		Changed:
 		* purple_plugin_unload() now honors the return value of a
 		  plugin's unload function and can actually return FALSE now.
@@ -110,18 +72,6 @@
 		* pidgin_pounces_manager_show()
 		* pidgin_syslog_show()
 
-		* purple_request_accept_cancel()
-		* purple_request_action_varg()
-		* purple_request_action()
-		* purple_request_choice_varg()
-		* purple_request_choice()
-		* purple_request_fields()
-		* purple_request_file()
-		* purple_request_folder()
-		* purple_request_input()
-		* purple_request_ok_cancel()
-		* purple_request_yes_no()
-
 		* purple_connection_error()
 		* pidgin_blist_update_account_error_state()
 		* PidginBuddyList.connection_errors
--- a/ChangeLog.win32	Sat Nov 17 18:26:03 2007 +0000
+++ b/ChangeLog.win32	Sat Nov 17 19:41:05 2007 +0000
@@ -1,4 +1,4 @@
-version 2.2.3:
+version 2.3.0:
 	* Updated GTK+ to 2.12.1 (This was actually included in 2.2.2, but 
 	  didn't get into the Changelog.)
 	* Upgrade SILC to use the 1.1.5 toolkit
--- a/finch/gntaccount.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/finch/gntaccount.c	Sat Nov 17 19:41:05 2007 +0000
@@ -632,8 +632,8 @@
 	prompt = g_strdup_printf(_("Are you sure you want to delete %s?"),
 			purple_account_get_username(account));
 
-	purple_request_action_with_hint(account, _("Delete Account"), prompt, NULL, 0,
-						  account, NULL, NULL, PURPLE_REQUEST_UI_HINT_ACCOUNTMGR, account, 2,
+	purple_request_action(account, _("Delete Account"), prompt, NULL, 0,
+						  account, NULL, NULL, account, 2,
 						  _("Delete"), really_delete_account,
 						  _("Cancel"), NULL);
 	g_free(prompt);
@@ -881,10 +881,10 @@
 	data->alias    = (alias != NULL ? g_strdup(alias) : NULL);
 
 	buffer = make_info(account, gc, remote_user, id, alias, msg);
-	purple_request_action_with_hint(NULL, NULL, _("Add buddy to your list?"),
+	purple_request_action(NULL, NULL, _("Add buddy to your list?"),
 	                    buffer, PURPLE_DEFAULT_ACTION_NONE,
 						account, remote_user, NULL,
-						PURPLE_REQUEST_UI_HINT_BLIST, data, 2,
+						data, 2,
 	                    _("Add"),    G_CALLBACK(add_user_cb),
 	                    _("Cancel"), G_CALLBACK(free_add_user_data));
 	g_free(buffer);
@@ -969,10 +969,10 @@
 		gnt_box_set_title(GNT_BOX(uihandle), _("Authorize buddy?"));
 		gnt_box_set_pad(GNT_BOX(uihandle), 0);
 
-		widget = purple_request_action_with_hint(NULL, _("Authorize buddy?"), buffer, NULL,
+		widget = purple_request_action(NULL, _("Authorize buddy?"), buffer, NULL,
 			PURPLE_DEFAULT_ACTION_NONE,
 			account, remote_user, NULL,
-			PURPLE_REQUEST_UI_HINT_BLIST, aa, 2,
+			aa, 2,
 			_("Authorize"), authorize_and_add_cb,
 			_("Deny"), deny_no_add_cb);
 		gnt_screen_release(widget);
@@ -996,10 +996,10 @@
 
 		g_signal_connect_swapped(G_OBJECT(uihandle), "destroy", G_CALLBACK(free_auth_and_add), aa);
 	} else {
-		uihandle = purple_request_action_with_hint(NULL, _("Authorize buddy?"), buffer, NULL,
+		uihandle = purple_request_action(NULL, _("Authorize buddy?"), buffer, NULL,
 			PURPLE_DEFAULT_ACTION_NONE,
 			account, remote_user, NULL,
-			PURPLE_REQUEST_UI_HINT_BLIST, user_data, 2,
+			user_data, 2,
 			_("Authorize"), auth_cb,
 			_("Deny"), deny_cb);
 	}
--- a/finch/gntblist.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/finch/gntblist.c	Sat Nov 17 19:41:05 2007 +0000
@@ -338,12 +338,12 @@
 		purple_request_field_account_set_value(field, account);
 	purple_request_field_group_add_field(group, field);
 
-	purple_request_fields_with_hint(NULL, _("Add Buddy"), NULL, _("Please enter buddy information."),
+	purple_request_fields(NULL, _("Add Buddy"), NULL, _("Please enter buddy information."),
 			fields,
 			_("Add"), G_CALLBACK(add_buddy_cb),
 			_("Cancel"), NULL,
 			account, NULL, NULL,
-			PURPLE_REQUEST_UI_HINT_BLIST, NULL);
+			NULL);
 }
 
 static void
@@ -416,11 +416,11 @@
 	field = purple_request_field_bool_new("autojoin", _("Auto-join"), FALSE);
 	purple_request_field_group_add_field(group, field);
 
-	purple_request_fields_with_hint(NULL, _("Add Chat"), NULL,
+	purple_request_fields(NULL, _("Add Chat"), NULL,
 			_("You can edit more information from the context menu later."),
 			fields, _("Add"), G_CALLBACK(add_chat_cb), _("Cancel"), NULL,
 			NULL, NULL, NULL,
-			PURPLE_REQUEST_UI_HINT_BLIST, NULL);
+			NULL);
 }
 
 static void
@@ -451,11 +451,11 @@
 static void
 finch_request_add_group()
 {
-	purple_request_input_with_hint(NULL, _("Add Group"), NULL, _("Enter the name of the group"),
+	purple_request_input(NULL, _("Add Group"), NULL, _("Enter the name of the group"),
 			NULL, FALSE, FALSE, NULL,
 			_("Add"), G_CALLBACK(add_group_cb), _("Cancel"), NULL,
 			NULL, NULL, NULL,
-			PURPLE_REQUEST_UI_HINT_BLIST, NULL);
+			NULL);
 }
 
 static PurpleBlistUiOps blist_ui_ops =
@@ -799,10 +799,10 @@
 
 	g_list_free(parts);
 
-	purple_request_fields_with_hint(NULL, _("Edit Chat"), NULL, _("Please Update the necessary fields."),
+	purple_request_fields(NULL, _("Edit Chat"), NULL, _("Please Update the necessary fields."),
 			fields, _("Edit"), G_CALLBACK(chat_components_edit_ok), _("Cancel"), NULL,
 			NULL, NULL, NULL,
-			PURPLE_REQUEST_UI_HINT_BLIST, chat);
+			chat);
 }
 
 static void
@@ -1000,11 +1000,11 @@
 	prompt = g_strdup_printf(_("Please enter the new name for %s"), name);
 
 	text = PURPLE_BLIST_NODE_IS_GROUP(node) ? _("Rename") : _("Set Alias");
-	purple_request_input_with_hint(node, text, prompt, _("Enter empty string to reset the name."),
+	purple_request_input(node, text, prompt, _("Enter empty string to reset the name."),
 			name, FALSE, FALSE, NULL, text, G_CALLBACK(rename_blist_node),
 			_("Cancel"), NULL,
 			NULL, NULL, NULL,
-			PURPLE_REQUEST_UI_HINT_BLIST, node);
+			node);
 
 	g_free(prompt);
 }
@@ -1092,11 +1092,11 @@
 	primary = g_strdup_printf(_("Are you sure you want to remove %s?"), name);
 
 	/* XXX: anything to do with the returned ui-handle? */
-	purple_request_action_with_hint(node, _("Confirm Remove"),
+	purple_request_action(node, _("Confirm Remove"),
 			primary, sec,
 			1,
 			account, name, NULL,
-			PURPLE_REQUEST_UI_HINT_BLIST, node, 2,
+			node, 2,
 			_("Remove"), finch_blist_remove_node,
 			_("Cancel"), NULL);
 	g_free(primary);
@@ -2217,7 +2217,7 @@
 	purple_request_field_set_required(field, TRUE);
 	purple_request_field_group_add_field(group, field);
 
-	purple_request_fields_with_hint(purple_get_blist(), _("New Instant Message"),
+	purple_request_fields(purple_get_blist(), _("New Instant Message"),
 						NULL,
 						_("Please enter the screen name or alias of the person "
 						  "you would like to IM."),
@@ -2225,7 +2225,7 @@
 						_("OK"), G_CALLBACK(send_im_select_cb),
 						_("Cancel"), NULL,
 						NULL, NULL, NULL,
-						PURPLE_REQUEST_UI_HINT_BLIST, NULL);
+						NULL);
 }
 
 static void
@@ -2281,14 +2281,14 @@
 	purple_request_field_set_required(field, TRUE);
 	purple_request_field_group_add_field(group, field);
 
-	purple_request_fields_with_hint(purple_get_blist(), _("Join a Chat"),
+	purple_request_fields(purple_get_blist(), _("Join a Chat"),
 						NULL,
 						_("Please enter the name of the chat you want to join."),
 						fields,
 						_("Join"), G_CALLBACK(join_chat_select_cb),
 						_("Cancel"), NULL,
 						NULL, NULL, NULL,
-						PURPLE_REQUEST_UI_HINT_BLIST, NULL);
+						NULL);
 }
 
 static void
--- a/finch/gntcertmgr.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/finch/gntcertmgr.c	Sat Nov 17 19:41:05 2007 +0000
@@ -82,7 +82,7 @@
 	if (crt != NULL) {
 		gchar *default_hostname;
 		default_hostname = purple_certificate_get_subject_name(crt);
-		purple_request_input_with_hint(NULL,
+		purple_request_input(NULL,
 				_("Certificate Import"),
 				_("Specify a hostname"),
 				_("Type the host name this certificate is for."),
@@ -90,7 +90,7 @@
 				_("OK"), G_CALLBACK(tls_peers_mgmt_import_ok2_cb),
 				_("Cancel"), G_CALLBACK(tls_peers_mgmt_import_cancel2_cb),
 				NULL, NULL, NULL,
-				PURPLE_REQUEST_UI_HINT_CERTMGR, crt);
+				crt);
 		g_free(default_hostname);
 	} else {
 		gchar * secondary;
@@ -106,13 +106,13 @@
 static void
 add_cert_cb(GntWidget *button, gpointer null)
 {
-	purple_request_file_with_hint(NULL,
+	purple_request_file(NULL,
 			_("Select a PEM certificate"),
 			"certificate.pem",
 			FALSE,
 			G_CALLBACK(tls_peers_mgmt_import_ok_cb),
 			NULL,
-			NULL, NULL, NULL, PURPLE_REQUEST_UI_HINT_CERTMGR, NULL );
+			NULL, NULL, NULL, NULL );
 }
 
 /* Save certs in some file */
@@ -155,13 +155,13 @@
 		return;
 	}
 
-	purple_request_file_with_hint((void*)key,
+	purple_request_file((void*)key,
 			_("PEM X.509 Certificate Export"),
 			"certificate.pem", TRUE,
 			G_CALLBACK(tls_peers_mgmt_export_ok_cb),
 			G_CALLBACK(purple_certificate_destroy),
 			NULL, NULL, NULL,
-			PURPLE_REQUEST_UI_HINT_CERTMGR, crt);
+			crt);
 }
 
 /* Show information about a cert */
@@ -233,10 +233,10 @@
 	primary = g_strdup_printf(_("Really delete certificate for %s?"), key);
 
 	purple_request_close_with_handle((void *)key);
-	purple_request_yes_no_with_hint((void *)key, _("Confirm certificate delete"),
+	purple_request_yes_no((void *)key, _("Confirm certificate delete"),
 			primary, NULL,
 			2,
-			NULL, NULL, NULL, PURPLE_REQUEST_UI_HINT_CERTMGR,
+			NULL, NULL, NULL,
 			g_strdup(key),
 			tls_peers_mgmt_delete_confirm_cb,
 			g_free);
--- a/finch/gntconn.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/finch/gntconn.c	Sat Nov 17 19:41:05 2007 +0000
@@ -130,9 +130,9 @@
 				"Finch will not attempt to reconnect the account until you "
 				"correct the error and re-enable the account."), text);
 
-		purple_request_action_with_hint(account, NULL, primary, secondary, 2,
+		purple_request_action(account, NULL, primary, secondary, 2,
 							account, NULL, NULL,
-							PURPLE_REQUEST_UI_HINT_BLIST, account, 3,
+							account, 3,
 							_("OK"), NULL,
 							_("Modify Account"), PURPLE_CALLBACK(ce_modify_account_cb),
 							_("Re-enable Account"), PURPLE_CALLBACK(ce_enable_account_cb));
--- a/finch/gntplugin.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/finch/gntplugin.c	Sat Nov 17 19:41:05 2007 +0000
@@ -471,9 +471,9 @@
 		}
 	}
 
-	return purple_request_fields_with_hint(NULL, _("Preferences"), NULL, NULL, fields,
+	return purple_request_fields(NULL, _("Preferences"), NULL, NULL, fields,
 			_("Save"), G_CALLBACK(finch_request_save_in_prefs), _("Cancel"), NULL,
 			NULL, NULL, NULL,
-			PURPLE_REQUEST_UI_HINT_PLUGINMGR, NULL);
+			NULL);
 }
 
--- a/finch/gntpounce.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/finch/gntpounce.c	Sat Nov 17 19:41:05 2007 +0000
@@ -673,9 +673,9 @@
 	pouncer = purple_account_get_username(account);
 	pouncee = purple_pounce_get_pouncee(pounce);
 	buf = g_strdup_printf(_("Are you sure you want to delete the pounce on %s for %s?"), pouncee, pouncer);
-	purple_request_action_with_hint(pounce, NULL, buf, NULL, 0,
+	purple_request_action(pounce, NULL, buf, NULL, 0,
 						account, pouncee, NULL,
-						PURPLE_REQUEST_UI_HINT_POUNCEMGR, pounce, 2,
+						pounce, 2,
 						_("Delete"), pounces_manager_delete_confirm_cb,
 						_("Cancel"), NULL);
 	g_free(buf);
--- a/finch/gntprefs.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/finch/gntprefs.c	Sat Nov 17 19:41:05 2007 +0000
@@ -261,9 +261,9 @@
 	add_pref_group(fields, _("Idle"), idle);
 
 	pref_request.showing = TRUE;
-	pref_request.window = purple_request_fields_with_hint(NULL, _("Preferences"), NULL, NULL, fields,
+	pref_request.window = purple_request_fields(NULL, _("Preferences"), NULL, NULL, fields,
 			_("Save"), G_CALLBACK(save_cb), _("Cancel"), free_strings,
 			NULL, NULL, NULL,
-			PURPLE_REQUEST_UI_HINT_PREFSMGR, NULL);
+			NULL);
 }
 
--- a/finch/gntrequest.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/finch/gntrequest.c	Sat Nov 17 19:41:05 2007 +0000
@@ -148,7 +148,7 @@
 		const char *ok_text, GCallback ok_cb,
 		const char *cancel_text, GCallback cancel_cb,
 		PurpleAccount *account, const char *who, PurpleConversation *conv,
-		const char *ui_hint, void *user_data)
+		void *user_data)
 {
 	GntWidget *window, *box, *entry;
 
@@ -205,7 +205,7 @@
 		const char *ok_text, GCallback ok_cb,
 		const char *cancel_text, GCallback cancel_cb,
 		PurpleAccount *account, const char *who, PurpleConversation *conv,
-		const char *ui_hint, void *user_data, va_list choices)
+		void *user_data, va_list choices)
 {
 	GntWidget *window, *combo, *box;
 	const char *text;
@@ -249,7 +249,7 @@
 finch_request_action(const char *title, const char *primary,
 		const char *secondary, int default_value,
 		PurpleAccount *account, const char *who, PurpleConversation *conv,
-		const char *ui_hint, void *user_data, size_t actioncount,
+		void *user_data, size_t actioncount,
 		va_list actions)
 {
 	GntWidget *window, *box, *button;
@@ -393,7 +393,7 @@
 		const char *ok, GCallback ok_cb,
 		const char *cancel, GCallback cancel_cb,
 		PurpleAccount *account, const char *who, PurpleConversation *conv,
-		const char *ui_hint, void *userdata)
+		void *userdata)
 {
 	GntWidget *window, *box;
 	GList *grlist;
@@ -645,7 +645,7 @@
 				gboolean savedialog,
 				GCallback ok_cb, GCallback cancel_cb,
 				PurpleAccount *account, const char *who, PurpleConversation *conv,
-				const char *ui_hint, void *user_data)
+				void *user_data)
 {
 	GntWidget *window = gnt_file_sel_new();
 	GntFileSel *sel = GNT_FILE_SEL(window);
--- a/finch/gntstatus.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/finch/gntstatus.c	Sat Nov 17 19:41:05 2007 +0000
@@ -138,9 +138,9 @@
 	ask = g_strdup_printf(_("Are you sure you want to delete \"%s\""),
 			purple_savedstatus_get_title(saved));
 
-	purple_request_action_with_hint(saved, _("Delete Status"), ask, NULL, 0,
+	purple_request_action(saved, _("Delete Status"), ask, NULL, 0,
 			NULL, NULL, NULL,
-			PURPLE_REQUEST_UI_HINT_STATUSMGR, saved, 2,
+			saved, 2,
 			_("Delete"), really_delete_status,
 			_("Cancel"), NULL);
 	g_free(ask);
--- a/finch/plugins/gnthistory.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/finch/plugins/gnthistory.c	Sat Nov 17 19:41:05 2007 +0000
@@ -172,15 +172,14 @@
 
 		purple_request_fields_add_group(fields, group);
 
-		purple_request_fields_with_hint(plugin, NULL, _("History Plugin Requires Logging"),
-							_("Logging can be enabled from Tools -> Preferences -> Logging.\n\n"
-							  "Enabling logs for instant messages and/or chats will activate "
-							  "history for the same conversation type(s)."),
-							fields,
-							_("OK"), G_CALLBACK(finch_request_save_in_prefs),
-							_("Cancel"), NULL,
-							NULL, NULL, NULL,
-							"42. That's your hint. Take it, or leave it.", plugin);
+		purple_request_fields(plugin, NULL, _("History Plugin Requires Logging"),
+				      _("Logging can be enabled from Tools -> Preferences -> Logging.\n\n"
+				      "Enabling logs for instant messages and/or chats will activate "
+				      "history for the same conversation type(s)."),
+				      fields,
+				      _("OK"), G_CALLBACK(finch_request_save_in_prefs),
+				      _("Cancel"), NULL,
+				      NULL, NULL, NULL, plugin);
 	}
 }
 
--- a/libpurple/Makefile.am	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/Makefile.am	Sat Nov 17 19:41:05 2007 +0000
@@ -237,6 +237,8 @@
 	$(LIBXML_LIBS) \
 	$(LIBNM_LIBS) \
 	$(INTLLIBS) \
+	$(SASL_LIBS) \
+	$(MEANWHILE_LIBS) \
 	-lm
 
 AM_CPPFLAGS = \
--- a/libpurple/Makefile.mingw	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/Makefile.mingw	Sat Nov 17 19:41:05 2007 +0000
@@ -119,7 +119,7 @@
 	sed -e 's/@PURPLE_VERSION@/$(PURPLE_VERSION)/g' \
 	    $@.in > $@
 
-$(OBJECTS): $(PURPLE_CONFIG_H) $(PURPLE_VERSION_H)
+$(OBJECTS): $(PURPLE_CONFIG_H) $(PURPLE_VERSION_H) $(PURPLE_PURPLE_H)
 
 $(TARGET).dll $(TARGET).dll.a: $(OBJECTS)
 	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -Wl,--output-def,$(TARGET).def,--out-implib,$(TARGET).dll.a -o $(TARGET).dll
--- a/libpurple/account.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/account.c	Sat Nov 17 19:41:05 2007 +0000
@@ -1096,7 +1096,7 @@
 	field = purple_request_field_bool_new("remember", _("Save password"), FALSE);
 	purple_request_field_group_add_field(group, field);
 
-	purple_request_fields_with_hint(account,
+	purple_request_fields(account,
                         NULL,
                         primary,
                         NULL,
@@ -1104,7 +1104,7 @@
                         _("OK"), ok_cb,
                         _("Cancel"), cancel_cb,
 						account, NULL, NULL,
-                        PURPLE_REQUEST_UI_HINT_ACCOUNT, user_data);
+                        user_data);
 	g_free(primary);
 }
 
@@ -1384,7 +1384,7 @@
 
 	/* I'm sticking this somewhere in the code: bologna */
 
-	purple_request_fields_with_hint(purple_account_get_connection(account),
+	purple_request_fields(purple_account_get_connection(account),
 						NULL,
 						primary,
 						_("Please enter your current password and your "
@@ -1393,7 +1393,7 @@
 						_("OK"), G_CALLBACK(change_password_cb),
 						_("Cancel"), NULL,
 						account, NULL, NULL,
-						PURPLE_REQUEST_UI_HINT_ACCOUNT, account);
+						account);
 }
 
 static void
@@ -1421,14 +1421,14 @@
 			   _("Change user information for %s"),
 			   purple_account_get_username(account));
 
-	purple_request_input_with_hint(gc, _("Set User Info"), primary, NULL,
+	purple_request_input(gc, _("Set User Info"), primary, NULL,
 					   purple_account_get_user_info(account),
 					   TRUE, FALSE, ((gc != NULL) &&
 					   (gc->flags & PURPLE_CONNECTION_HTML) ? "html" : NULL),
 					   _("Save"), G_CALLBACK(set_user_info_cb),
 					   _("Cancel"), NULL,
 					   account, NULL, NULL,
-					   PURPLE_REQUEST_UI_HINT_ACCOUNT, account);
+					   account);
 }
 
 void
--- a/libpurple/blist.h	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/blist.h	Sat Nov 17 19:41:05 2007 +0000
@@ -40,8 +40,6 @@
 typedef struct _PurpleContact PurpleContact;
 typedef struct _PurpleBuddy PurpleBuddy;
 
-typedef gboolean (*PurpleFilterBlistFunc)(PurpleBlistNode *node);
-
 /**************************************************************************/
 /* Enumerations                                                           */
 /**************************************************************************/
@@ -67,12 +65,9 @@
 typedef enum
 {
 	PURPLE_BLIST_NODE_FLAG_NO_SAVE      = 1 << 0, /**< node should not be saved with the buddy list */
-	PURPLE_BLIST_NODE_HAS_CONVERSATION  = 1 << 1, /**< node (buddy or chat) has an open conversation */
 
 } PurpleBlistNodeFlags;
 
-#define PURPLE_BLIST_NODE_SET_FLAG(node, f)    (((PurpleBlistNode *)node)->flags |= (f))
-#define PURPLE_BLIST_NODE_UNSET_FLAG(node, f)  (((PurpleBlistNode *)node)->flags &= ~(f))
 #define PURPLE_BLIST_NODE_HAS_FLAG(b, f) (((PurpleBlistNode*)(b))->flags & (f))
 #define PURPLE_BLIST_NODE_SHOULD_SAVE(b) (! PURPLE_BLIST_NODE_HAS_FLAG(b, PURPLE_BLIST_NODE_FLAG_NO_SAVE))
 
@@ -524,8 +519,11 @@
  * @param contact  The contact
  */
 void purple_contact_invalidate_priority_buddy(PurpleContact *contact);
+
 /**
  * Removes a buddy from the buddy list and frees the memory allocated to it.
+ * This doesn't actually try to remove the buddy from the server list, nor does
+ * it clean up the prpl_data.
  *
  * @param buddy   The buddy to be removed
  */
--- a/libpurple/certificate.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/certificate.c	Sat Nov 17 19:41:05 2007 +0000
@@ -563,7 +563,7 @@
 	secondary = g_strdup_printf(_("Common name: %s %s\nFingerprint (SHA1): %s"), cn, cn_match, sha_asc);
 	
 	/* Make a semi-pretty display */
-	purple_request_accept_cancel_with_hint(
+	purple_request_accept_cancel(
 		vrq->cb_data, /* TODO: Find what the handle ought to be */
 		_("Single-use Certificate Verification"),
 		primary,
@@ -572,7 +572,6 @@
 		NULL,         /* No account */
 		NULL,         /* No other user */
 		NULL,         /* No associated conversation */
-		PURPLE_REQUEST_UI_HINT_BLIST,
 		vrq,
 		x509_singleuse_verify_cb,
 		x509_singleuse_verify_cb );
@@ -1186,7 +1185,7 @@
 				  vrq->subject_name);
 		
 	/* Make a semi-pretty display */
-	purple_request_action_with_hint(
+	purple_request_action(
 		vrq->cb_data, /* TODO: Find what the handle ought to be */
 		_("SSL Certificate Verification"),
 		primary,
@@ -1195,7 +1194,6 @@
 		NULL,         /* No account */
 		NULL,         /* No other user */
 		NULL,         /* No associated conversation */
-		PURPLE_REQUEST_UI_HINT_BLIST,
 		x509_tls_cached_ua_ctx_new(vrq, reason),
 		3,            /* Number of actions */
 		_("Accept"), x509_tls_cached_user_auth_accept_cb,
@@ -1359,6 +1357,7 @@
 		/* Okay, we're done here */
 		purple_certificate_verify_complete(vrq,
 						   PURPLE_CERTIFICATE_INVALID);
+		return;
 	} /* if (signature chain not good) */
 
 	/* Next, attempt to verify the last certificate against a CA */
--- a/libpurple/conversation.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/conversation.c	Sat Nov 17 19:41:05 2007 +0000
@@ -1208,9 +1208,9 @@
 	data[0] = conv;
 	data[1] = (gpointer)message;
 
-	purple_request_action_with_hint(conv, NULL, _("Send Message"), text, 0,
+	purple_request_action(conv, NULL, _("Send Message"), text, 0,
 						  purple_conversation_get_account(conv), NULL, conv,
-						  PURPLE_REQUEST_UI_HINT_CONV, data, 2,
+						  data, 2,
 						  _("_Send Message"), G_CALLBACK(purple_conv_send_confirm_cb),
 						  _("Cancel"), NULL);
 }
--- a/libpurple/ft.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/ft.c	Sat Nov 17 19:41:05 2007 +0000
@@ -309,12 +309,12 @@
 static int
 purple_xfer_choose_file(PurpleXfer *xfer)
 {
-	purple_request_file_with_hint(xfer, NULL, purple_xfer_get_filename(xfer),
+	purple_request_file(xfer, NULL, purple_xfer_get_filename(xfer),
 					  (purple_xfer_get_type(xfer) == PURPLE_XFER_RECEIVE),
 					  G_CALLBACK(purple_xfer_choose_file_ok_cb),
 					  G_CALLBACK(purple_xfer_choose_file_cancel_cb),
 					  purple_xfer_get_account(xfer), xfer->who, NULL,
-					  PURPLE_REQUEST_UI_HINT_XFER, xfer);
+					  xfer);
 
 	return 0;
 }
@@ -359,10 +359,10 @@
 			serv_got_im(purple_account_get_connection(xfer->account),
 								 xfer->who, xfer->message, 0, time(NULL));
 
-		purple_request_accept_cancel_with_hint(xfer, NULL, buf, NULL,
+		purple_request_accept_cancel(xfer, NULL, buf, NULL,
 								  PURPLE_DEFAULT_ACTION_NONE,
 								  xfer->account, xfer->who, NULL,
-								  PURPLE_REQUEST_UI_HINT_XFER, xfer,
+								  xfer,
 								  G_CALLBACK(purple_xfer_choose_file),
 								  G_CALLBACK(cancel_recv_cb));
 
@@ -402,10 +402,10 @@
 					 "Remote host: %s\nRemote port: %d"),
 					   purple_xfer_get_remote_ip(xfer),
 					   purple_xfer_get_remote_port(xfer));
-	purple_request_accept_cancel_with_hint(xfer, NULL, buf, buf2,
+	purple_request_accept_cancel(xfer, NULL, buf, buf2,
 							   PURPLE_DEFAULT_ACTION_NONE,
 							   xfer->account, xfer->who, NULL,
-							   PURPLE_REQUEST_UI_HINT_XFER, xfer,
+							   xfer,
 							   G_CALLBACK(ask_accept_ok),
 							   G_CALLBACK(ask_accept_cancel));
 	g_free(buf);
--- a/libpurple/plugins/autoaccept.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/plugins/autoaccept.c	Sat Nov 17 19:41:05 2007 +0000
@@ -159,12 +159,12 @@
 
 	message = g_strdup_printf(_("When a file-transfer request arrives from %s"), 
 					purple_contact_get_alias((PurpleContact *)node));
-	purple_request_choice_with_hint(plugin, _("Set Autoaccept Setting"), message,
+	purple_request_choice(plugin, _("Set Autoaccept Setting"), message,
 						NULL, purple_blist_node_get_int(node, "autoaccept"),
 						_("_Save"), G_CALLBACK(save_cb),
 						_("_Cancel"), NULL,
 						NULL, NULL, NULL,
-						PURPLE_REQUEST_UI_HINT_XFER, node,
+						node,
 						_("Ask"), FT_ASK,
 						_("Auto Accept"), FT_ACCEPT,
 						_("Auto Reject"), FT_REJECT,
--- a/libpurple/plugins/buddynote.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/plugins/buddynote.c	Sat Nov 17 19:41:05 2007 +0000
@@ -43,14 +43,14 @@
 
 	note = purple_blist_node_get_string(node, "notes");
 
-	purple_request_input_with_hint(node, _("Notes"),
+	purple_request_input(node, _("Notes"),
 					   _("Enter your notes below..."),
 					   NULL,
 					   note, TRUE, FALSE, "html",
 					   _("Save"), G_CALLBACK(do_it_cb),
 					   _("Cancel"), G_CALLBACK(dont_do_it_cb),
 					   NULL, NULL, NULL,
-					   PURPLE_REQUEST_UI_HINT_BUDDY, node);
+					   node);
 }
 
 static void
--- a/libpurple/plugins/idle.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/plugins/idle.c	Sat Nov 17 19:41:05 2007 +0000
@@ -161,7 +161,7 @@
 	request = purple_request_fields_new();
 	purple_request_fields_add_group(request, group);
 
-	purple_request_fields_with_hint(action->plugin,
+	purple_request_fields(action->plugin,
 			N_("I'dle Mak'er"),
 			_("Set Account Idle Time"),
 			NULL,
@@ -169,7 +169,7 @@
 			_("_Set"), G_CALLBACK(idle_action_ok),
 			_("_Cancel"), NULL,
 			NULL, NULL, NULL,
-			PURPLE_REQUEST_UI_HINT_ACCOUNT, NULL);
+			NULL);
 }
 
 static void
@@ -195,7 +195,7 @@
 	request = purple_request_fields_new();
 	purple_request_fields_add_group(request, group);
 
-	purple_request_fields_with_hint(action->plugin,
+	purple_request_fields(action->plugin,
 			N_("I'dle Mak'er"),
 			_("Unset Account Idle Time"),
 			NULL,
@@ -203,7 +203,7 @@
 			_("_Unset"), G_CALLBACK(unidle_action_ok),
 			_("_Cancel"), NULL,
 			NULL, NULL, NULL,
-			PURPLE_REQUEST_UI_HINT_ACCOUNT, NULL);
+			NULL);
 }
 
 static void
@@ -221,7 +221,7 @@
 	request = purple_request_fields_new();
 	purple_request_fields_add_group(request, group);
 
-	purple_request_fields_with_hint(action->plugin,
+	purple_request_fields(action->plugin,
 			N_("I'dle Mak'er"),
 			_("Set Idle Time for All Accounts"),
 			NULL,
@@ -229,7 +229,7 @@
 			_("_Set"), G_CALLBACK(idle_all_action_ok),
 			_("_Cancel"), NULL,
 			NULL, NULL, NULL,
-			PURPLE_REQUEST_UI_HINT_ACCOUNT, NULL);
+			NULL);
 }
 
 static void
--- a/libpurple/plugins/offlinemsg.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/plugins/offlinemsg.c	Sat Nov 17 19:41:05 2007 +0000
@@ -157,11 +157,11 @@
 						"rest of the messages in a pounce and automatically send them "
 						"when \"%s\" logs back in?"), who, who);
 	
-		purple_request_action_with_hint(handle, _("Offline Message"), ask,
+		purple_request_action(handle, _("Offline Message"), ask,
 					_("You can edit/delete the pounce from the `Buddy Pounces' dialog"),
 					1,
 					offline->account, offline->who, offline->conv,
-					PURPLE_REQUEST_UI_HINT_BUDDY, offline, 2,
+					offline, 2,
 					_("Yes"), record_pounce,
 					_("No"), cancel_poune);
 		g_free(ask);
--- a/libpurple/plugins/perl/common/PluginPref.xs	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/plugins/perl/common/PluginPref.xs	Sat Nov 17 19:41:05 2007 +0000
@@ -93,6 +93,10 @@
 purple_plugin_pref_get_masked(pref)
 	Purple::PluginPref pref
 
+Purple::String::Format::Type
+purple_plugin_pref_get_format_type(pref)
+	Purple::PluginPref pref
+
 unsigned int
 purple_plugin_pref_get_max_length(pref)
 	Purple::PluginPref pref
@@ -145,6 +149,11 @@
 	gboolean mask
 
 void
+purple_plugin_pref_set_format_type(pref, format)
+	Purple::PluginPref pref
+	Purple::String::Format::Type format
+
+void
 purple_plugin_pref_set_max_length(pref, max_length)
 	Purple::PluginPref pref
 	unsigned int max_length
--- a/libpurple/plugins/perl/common/Request.xs	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/plugins/perl/common/Request.xs	Sat Nov 17 19:41:05 2007 +0000
@@ -141,38 +141,7 @@
 	gpr->cancel_cb = g_strdup_printf("Purple::Script::%s::%s", basename, SvPV(cancel_cb, len));
 	g_free(basename);
 
-	RETVAL = purple_request_input_with_hint(handle, title, primary, secondary, default_value, multiline, masked, hint, ok_text, G_CALLBACK(purple_perl_request_ok_cb), cancel_text, G_CALLBACK(purple_perl_request_cancel_cb), NULL, NULL, NULL, PURPLE_REQUEST_UI_HINT_BLIST, gpr);
-OUTPUT:
-	RETVAL
-
-void *
-purple_request_input_with_hint(handle, title, primary, secondary, default_value, multiline, masked, hint, ok_text, ok_cb, cancel_text, cancel_cb, ui_hint)
-	Purple::Plugin handle
-	const char * title
-	const char * primary
-	const char * secondary
-	const char * default_value
-	gboolean multiline
-	gboolean masked
-	gchar * hint
-	const char * ok_text
-	SV * ok_cb
-	const char * cancel_text
-	SV * cancel_cb
-	const char * ui_hint
-CODE:
-	PurplePerlRequestData *gpr;
-	STRLEN len;
-	char *basename;
-
-	basename = g_path_get_basename(handle->path);
-	purple_perl_normalize_script_name(basename);
-	gpr = g_new(PurplePerlRequestData, 1);
-	gpr->ok_cb = g_strdup_printf("Purple::Script::%s::%s", basename, SvPV(ok_cb, len));
-	gpr->cancel_cb = g_strdup_printf("Purple::Script::%s::%s", basename, SvPV(cancel_cb, len));
-	g_free(basename);
-
-	RETVAL = purple_request_input_with_hint(handle, title, primary, secondary, default_value, multiline, masked, hint, ok_text, G_CALLBACK(purple_perl_request_ok_cb), cancel_text, G_CALLBACK(purple_perl_request_cancel_cb), NULL, NULL, NULL, ui_hint, gpr);
+	RETVAL = purple_request_input(handle, title, primary, secondary, default_value, multiline, masked, hint, ok_text, G_CALLBACK(purple_perl_request_ok_cb), cancel_text, G_CALLBACK(purple_perl_request_cancel_cb), NULL, NULL, NULL, gpr);
 OUTPUT:
 	RETVAL
 
@@ -196,32 +165,7 @@
 	gpr->cancel_cb = g_strdup_printf("Purple::Script::%s::%s", basename, SvPV(cancel_cb, len));
 	g_free(basename);
 
-	RETVAL = purple_request_file_with_hint(handle, title, filename, savedialog, G_CALLBACK(purple_perl_request_ok_cb), G_CALLBACK(purple_perl_request_cancel_cb), NULL, NULL, NULL, PURPLE_REQUEST_UI_HINT_BLIST, gpr);
-OUTPUT:
-	RETVAL
-
-void *
-purple_request_file_with_hint(handle, title, filename, savedialog, ok_cb, cancel_cb, ui_hint)
-	Purple::Plugin handle
-	const char * title
-	const char * filename
-	gboolean savedialog
-	SV * ok_cb
-	SV * cancel_cb
-	const char * ui_hint
-CODE:
-	PurplePerlRequestData *gpr;
-	STRLEN len;
-	char *basename;
-
-	basename = g_path_get_basename(handle->path);
-	purple_perl_normalize_script_name(basename);
-	gpr = g_new(PurplePerlRequestData, 1);
-	gpr->ok_cb = g_strdup_printf("Purple::Script::%s::%s", basename, SvPV(ok_cb, len));
-	gpr->cancel_cb = g_strdup_printf("Purple::Script::%s::%s", basename, SvPV(cancel_cb, len));
-	g_free(basename);
-
-	RETVAL = purple_request_file_with_hint(handle, title, filename, savedialog, G_CALLBACK(purple_perl_request_ok_cb), G_CALLBACK(purple_perl_request_cancel_cb), NULL, NULL, NULL, ui_hint, gpr);
+	RETVAL = purple_request_file(handle, title, filename, savedialog, G_CALLBACK(purple_perl_request_ok_cb), G_CALLBACK(purple_perl_request_cancel_cb), NULL, NULL, NULL, gpr);
 OUTPUT:
 	RETVAL
 
@@ -248,35 +192,7 @@
 	gpr->cancel_cb = g_strdup_printf("Purple::Script::%s::%s", basename, SvPV(cancel_cb, len));
 	g_free(basename);
 
-	RETVAL = purple_request_fields_with_hint(handle, title, primary, secondary, fields, ok_text, G_CALLBACK(purple_perl_request_ok_cb), cancel_text, G_CALLBACK(purple_perl_request_cancel_cb), NULL, NULL, NULL, PURPLE_REQUEST_UI_HINT_BLIST, gpr);
-OUTPUT:
-	RETVAL
-
-void *
-purple_request_fields_with_hint(handle, title, primary, secondary, fields, ok_text, ok_cb, cancel_text, cancel_cb, ui_hint)
-	Purple::Plugin handle
-	const char * title
-	const char * primary
-	const char * secondary
-	Purple::Request::Fields fields
-	const char * ok_text
-	SV * ok_cb
-	const char * cancel_text
-	SV * cancel_cb
-	const char *ui_hint
-CODE:
-	PurplePerlRequestData *gpr;
-	STRLEN len;
-	char *basename;
-
-	basename = g_path_get_basename(handle->path);
-	purple_perl_normalize_script_name(basename);
-	gpr = g_new(PurplePerlRequestData, 1);
-	gpr->ok_cb = g_strdup_printf("Purple::Script::%s::%s", basename, SvPV(ok_cb, len));
-	gpr->cancel_cb = g_strdup_printf("Purple::Script::%s::%s", basename, SvPV(cancel_cb, len));
-	g_free(basename);
-
-	RETVAL = purple_request_fields_with_hint(handle, title, primary, secondary, fields, ok_text, G_CALLBACK(purple_perl_request_ok_cb), cancel_text, G_CALLBACK(purple_perl_request_cancel_cb), NULL, NULL, NULL, ui_hint, gpr);
+	RETVAL = purple_request_fields(handle, title, primary, secondary, fields, ok_text, G_CALLBACK(purple_perl_request_ok_cb), cancel_text, G_CALLBACK(purple_perl_request_cancel_cb), NULL, NULL, NULL, gpr);
 OUTPUT:
 	RETVAL
 
--- a/libpurple/plugins/perl/common/module.h	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/plugins/perl/common/module.h	Sat Nov 17 19:41:05 2007 +0000
@@ -197,6 +197,7 @@
 typedef PurplePluginPref *		Purple__PluginPref;
 typedef PurplePluginPrefFrame *		Purple__PluginPref__Frame;
 typedef PurplePluginPrefType		Purple__PluginPrefType;
+typedef PurpleStringFormatType		Purple__String__Format__Type;
 
 /* pounce.h */
 typedef PurplePounce *			Purple__Pounce;
--- a/libpurple/plugins/perl/common/typemap	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/plugins/perl/common/typemap	Sat Nov 17 19:41:05 2007 +0000
@@ -158,6 +158,7 @@
 const Purple::StatusType			T_PurpleObj
 
 Purple::StoredImage			T_PurpleObj
+Purple::String::Format::Type		T_IV
 Purple::Stringref				T_PurpleObj
 Purple::Util::FetchUrlData	T_PTR
 Purple::Util::InfoFieldFormatCallback	T_PTR
--- a/libpurple/protocols/Makefile.mingw	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/protocols/Makefile.mingw	Sat Nov 17 19:41:05 2007 +0000
@@ -8,7 +8,7 @@
 PIDGIN_TREE_TOP := ../..
 include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
-SUBDIRS = gg irc jabber msn novell null oscar qq sametime silc simple yahoo bonjour myspace
+SUBDIRS = gg irc jabber msnp9 novell null oscar qq sametime silc simple yahoo bonjour myspace
 
 .PHONY: all install clean
 
--- a/libpurple/protocols/bonjour/bonjour.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/protocols/bonjour/bonjour.c	Sat Nov 17 19:41:05 2007 +0000
@@ -86,6 +86,7 @@
 				if (buddy->account != account)
 					continue;
 				purple_prpl_got_user_status(account, buddy->name, "offline", NULL);
+				purple_account_remove_buddy(account, buddy, NULL);
 				purple_blist_remove_buddy(buddy);
 			}
 		}
@@ -171,6 +172,9 @@
 	PurpleGroup *bonjour_group;
 	BonjourData *bd = connection->proto_data;
 
+	/* Remove all the bonjour buddies */
+	bonjour_removeallfromlocal(connection);
+
 	/* Stop looking for buddies in the LAN */
 	if (bd != NULL && bd->dns_sd_data != NULL)
 	{
@@ -185,9 +189,6 @@
 		g_free(bd->jabber_data);
 	}
 
-	/* Remove all the bonjour buddies */
-	bonjour_removeallfromlocal(connection);
-
 	/* Delete the bonjour group */
 	bonjour_group = purple_find_group(BONJOUR_GROUP_NAME);
 	if (bonjour_group != NULL)
--- a/libpurple/protocols/bonjour/bonjour_ft.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/protocols/bonjour/bonjour_ft.c	Sat Nov 17 19:41:05 2007 +0000
@@ -33,11 +33,11 @@
 static void
 bonjour_bytestreams_init(PurpleXfer *xfer);
 static void
-bonjour_bytestreams_connect(PurpleXfer *xfer);
+bonjour_bytestreams_connect(PurpleXfer *xfer, PurpleBuddy *pb);
 static void
 bonjour_xfer_init(PurpleXfer *xfer);
 static void
-bonjour_xfer_receive(PurpleConnection *pc, const char *id, const char *from,
+bonjour_xfer_receive(PurpleConnection *pc, const char *id, const char *sid, const char *from,
 		     const int filesize, const char *filename, int option);
 static void bonjour_free_xfer(PurpleXfer *xfer);
 
@@ -202,23 +202,23 @@
 	purple_debug_info("bonjour", "xep file transfer stream initialization offer-id=%d.\n", next_id);
 
 	/* Assign stream id. */
-	memset(buf, 0, 32);
-	g_snprintf(buf, sizeof(buf), "%u", next_id++);
-	iq = xep_iq_new(xf->data, XEP_IQ_SET, to, purple_account_get_username(bd->jabber_data->account), buf);
+	g_free(xf->iq_id);
+	xf->iq_id = g_strdup_printf("%u", next_id++);
+	iq = xep_iq_new(xf->data, XEP_IQ_SET, to, purple_account_get_username(bd->jabber_data->account), xf->iq_id);
 	if(iq == NULL)
 		return;
 
-	g_free(xf->sid);
-	xf->sid = g_strdup(buf);
 	/*Construct Stream initialization offer message.*/
 	si_node = xmlnode_new_child(iq->node, "si");
 	xmlnode_set_namespace(si_node, "http://jabber.org/protocol/si");
 	xmlnode_set_attrib(si_node, "profile", "http://jabber.org/protocol/si/profile/file-transfer");
+	g_free(xf->sid);
+	xf->sid = g_strdup(xf->iq_id);
+	xmlnode_set_attrib(si_node, "id", xf->sid);
 
 	file = xmlnode_new_child(si_node, "file");
 	xmlnode_set_namespace(file, "http://jabber.org/protocol/si/profile/file-transfer");
 	xmlnode_set_attrib(file, "name", xfer->filename);
-	memset(buf, 0, 32);
 	g_snprintf(buf, sizeof(buf), "%" G_GSIZE_FORMAT, xfer->size);
 	xmlnode_set_attrib(file, "size", buf);
 
@@ -268,7 +268,7 @@
 	bd = xf->data;
 
 	purple_debug_info("bonjour", "xep file transfer stream initialization result.\n");
-	iq = xep_iq_new(bd, XEP_IQ_RESULT, to, purple_account_get_username(bd->jabber_data->account), xf->sid);
+	iq = xep_iq_new(bd, XEP_IQ_RESULT, to, purple_account_get_username(bd->jabber_data->account), xf->iq_id);
 	if(iq == NULL)
 		return;
 
@@ -446,6 +446,8 @@
 				int filesize = 0;
 				xmlnode *file;
 
+				const char *sid = xmlnode_get_attrib(si, "id");
+
 				if ((file = xmlnode_get_child(si, "file"))) {
 					filename = xmlnode_get_attrib(file, "name");
 					if((filesize_str = xmlnode_get_attrib(file, "size")))
@@ -454,7 +456,7 @@
 
 				/* TODO: Make sure that it is advertising a bytestreams transfer */
 
-				bonjour_xfer_receive(pc, id, pb->name, filesize, filename, XEP_BYTESTREAMS);
+				bonjour_xfer_receive(pc, id, sid, pb->name, filesize, filename, XEP_BYTESTREAMS);
 
 				parsed_receive = TRUE;
 			}
@@ -544,7 +546,7 @@
 							xf->proxy_port = portnum;
 							purple_debug_info("bonjour", "bytestream offer parse"
 									  "jid=%s host=%s port=%d.\n", jid, host, portnum);
-							bonjour_bytestreams_connect(xfer);
+							bonjour_bytestreams_connect(xfer, pb);
 							found = TRUE;
 							break;
 						}
@@ -559,7 +561,7 @@
 			if (!found) {
 				purple_debug_error("bonjour", "Didn't find an acceptable streamhost.\n");
 
-				if (iq_id)
+				if (iq_id && xfer != NULL)
 					xep_ft_si_reject(bd, iq_id, xfer->who, "404", "cancel");
 			}
 
@@ -570,7 +572,7 @@
 }
 
 static void
-bonjour_xfer_receive(PurpleConnection *pc, const char *id, const char *from,
+bonjour_xfer_receive(PurpleConnection *pc, const char *id, const char *sid, const char *from,
 		     const int filesize, const char *filename, int option)
 {
 	PurpleXfer *xfer = NULL;
@@ -591,7 +593,8 @@
 	xfer->data = xf = g_new0(XepXfer, 1);
 	xf->data = bd;
 	purple_xfer_set_filename(xfer, filename);
-	xf->sid = g_strdup(id);
+	xf->iq_id = g_strdup(id);
+	xf->sid = g_strdup(sid);
 
 	if(filesize > 0)
 		purple_xfer_set_size(xfer, filesize);
@@ -625,7 +628,14 @@
 		if(acceptfd == -1 && (errno == EAGAIN || errno == EWOULDBLOCK)) {
 
 		} else if(acceptfd == -1) {
-			/* TODO: This should cancel the ft */
+			/* This should cancel the ft */
+			purple_debug_error("bonjour", "Error accepting incoming SOCKS5 connection. (%d)\n", errno);
+
+			purple_input_remove(xfer->watcher);
+			xfer->watcher = 0;
+			close(source);
+			purple_xfer_cancel_remote(xfer);
+			return;
 		} else {
 			int flags;
 
@@ -805,13 +815,17 @@
 	xmlnode *q_node, *tmp_node;
 	BonjourData *bd;
 
-	if(data == NULL || source < 0) {
+	if(source < 0) {
+		purple_debug_error("bonjour", "Error connecting via SOCKS5 - %s\n",
+			error_message ? error_message : "(null)");
 		xep_ft_si_reject(xf->data, xf->iq_id, xfer->who, "404", "cancel");
 		/* Cancel the connection */
 		purple_xfer_cancel_local(xfer);
 		return;
 	}
 
+	purple_debug_info("bonjour", "Connected successfully via SOCKS5, starting transfer.\n");
+
 	bd = xf->data;
 
 	purple_proxy_info_destroy(xf->proxy_info);
@@ -831,7 +845,7 @@
 }
 
 static void
-bonjour_bytestreams_connect(PurpleXfer *xfer)
+bonjour_bytestreams_connect(PurpleXfer *xfer, PurpleBuddy *pb)
 {
 	XepXfer *xf = NULL;
 	char dstaddr[41];
@@ -848,7 +862,7 @@
 	if(!xf)
 		return;
 
-	p = g_strdup_printf("%s@%s", xf->sid, xfer->who);
+	p = g_strdup_printf("%s%s%s", xf->sid, pb->name, purple_account_get_username(pb->account));
 	purple_cipher_digest_region("sha1", (guchar *)p, strlen(p),
 				    sizeof(hashval), hashval, NULL);
 	g_free(p);
--- a/libpurple/protocols/bonjour/jabber.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/protocols/bonjour/jabber.c	Sat Nov 17 19:41:05 2007 +0000
@@ -327,13 +327,15 @@
 }
 
 void bonjour_jabber_process_packet(PurpleBuddy *pb, xmlnode *packet) {
+
+	g_return_if_fail(packet != NULL);
+
 	if (!strcmp(packet->name, "message"))
 		_jabber_parse_and_write_message_to_ui(packet, pb);
 	else if(!strcmp(packet->name, "iq"))
 		xep_iq_parse(packet, NULL, pb);
 	else
-		purple_debug_warning("bonjour", "Unknown packet: %s\n",
-				packet->name);
+		purple_debug_warning("bonjour", "Unknown packet: %s\n", packet->name ? packet->name : "(null)");
 }
 
 
@@ -351,8 +353,9 @@
 		/* There have been an error reading from the socket */
 		if (errno != EAGAIN) {
 			BonjourBuddy *bb = pb->proto_data;
+			const char *err = g_strerror(errno);
 
-			purple_debug_warning("bonjour", "receive error: %s\n", g_strerror(errno));
+			purple_debug_warning("bonjour", "receive error: %s\n", err ? err : "(null)");
 
 			bonjour_jabber_close_conversation(bb->conversation);
 			bb->conversation = NULL;
@@ -362,7 +365,7 @@
 		}
 		return;
 	} else if (len == 0) { /* The other end has closed the socket */
-		purple_debug_warning("bonjour", "Connection closed (without stream end) by %s.\n", pb->name);
+		purple_debug_warning("bonjour", "Connection closed (without stream end) by %s.\n", pb->name ? pb->name : "(null)");
 		bonjour_jabber_stream_ended(pb);
 		return;
 	} else {
@@ -1046,7 +1049,7 @@
 					((add >> 16) & 255),
 					((add >> 8) & 255),
 					add & 255);
-				tip = (char*) ((int) tip + len);
+				tip = &tip[len];
 				count++;
 				continue;
 			}
--- a/libpurple/protocols/bonjour/mdns_avahi.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/protocols/bonjour/mdns_avahi.c	Sat Nov 17 19:41:05 2007 +0000
@@ -81,6 +81,7 @@
 				/* We've already freed the resolver */
 				if (r == ((AvahiBuddyImplData *)bb->mdns_impl_data)->resolver)
 					((AvahiBuddyImplData *)bb->mdns_impl_data)->resolver = NULL;
+				purple_account_remove_buddy(account, pb, NULL);
 				purple_blist_remove_buddy(pb);
 			}
 			break;
@@ -117,9 +118,10 @@
 			}
 
 			if (!bonjour_buddy_check(bb)) {
-				if (pb != NULL)
+				if (pb != NULL) {
+					purple_account_remove_buddy(account, pb, NULL);
 					purple_blist_remove_buddy(pb);
-				else
+				} else
 					bonjour_buddy_delete(bb);
 			} else
 				/* Add or update the buddy in our buddy list */
@@ -163,8 +165,10 @@
 		case AVAHI_BROWSER_REMOVE:
 			purple_debug_info("bonjour", "_browser_callback - Remove service\n");
 			pb = purple_find_buddy(account, name);
-			if (pb != NULL)
+			if (pb != NULL) {
+				purple_account_remove_buddy(account, pb, NULL);
 				purple_blist_remove_buddy(pb);
+			}
 			break;
 		case AVAHI_BROWSER_ALL_FOR_NOW:
 		case AVAHI_BROWSER_CACHE_EXHAUSTED:
--- a/libpurple/protocols/bonjour/mdns_howl.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/protocols/bonjour/mdns_howl.c	Sat Nov 17 19:41:05 2007 +0000
@@ -115,7 +115,7 @@
 {
 	sw_discovery_resolve_id rid;
 	PurpleAccount *account = (PurpleAccount*)extra;
-	PurpleBuddy *gb = NULL;
+	PurpleBuddy *pb = NULL;
 
 	switch (status)
 	{
@@ -148,9 +148,11 @@
 			break;
 		case SW_DISCOVERY_BROWSE_REMOVE_SERVICE:
 			purple_debug_info("bonjour", "_browser_reply --> Remove service\n");
-			gb = purple_find_buddy(account, name);
-			if (gb != NULL)
-				purple_blist_remove_buddy(gb);
+			pb = purple_find_buddy(account, name);
+			if (pb != NULL) {
+				purple_account_remove_buddy(account, pb, NULL);
+				purple_blist_remove_buddy(pb);
+			}
 			break;
 		case SW_DISCOVERY_BROWSE_RESOLVED:
 			purple_debug_info("bonjour", "_browse_reply --> Resolved\n");
--- a/libpurple/protocols/bonjour/mdns_win32.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/protocols/bonjour/mdns_win32.c	Sat Nov 17 19:41:05 2007 +0000
@@ -238,8 +238,11 @@
 		/* A peer has sent a goodbye packet, remove them from the buddy list */
 		purple_debug_info("bonjour", "service browser - remove notification\n");
 		pb = purple_find_buddy(account, serviceName);
-		if (pb != NULL)
+		if (pb != NULL) {
+			purple_account_remove_buddy(account, pb, NULL);
 			purple_blist_remove_buddy(pb);
+		} else
+			purple_debug_warning("bonjour", "Unable to find buddy (%s) to remove\n", serviceName ? serviceName : "(null)");
 	}
 }
 
--- a/libpurple/protocols/bonjour/parser.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/protocols/bonjour/parser.c	Sat Nov 17 19:41:05 2007 +0000
@@ -188,6 +188,9 @@
 {
 	BonjourBuddy *bb = pb->proto_data;
 
+	g_return_if_fail(bb != NULL);
+	g_return_if_fail(bb->conversation != NULL);
+
 	if (bb->conversation->context ==  NULL) {
 		/* libxml inconsistently starts parsing on creating the
 		 * parser, so do a ParseChunk right afterwards to force it. */
--- a/libpurple/protocols/gg/gg.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/protocols/gg/gg.c	Sat Nov 17 19:41:05 2007 +0000
@@ -329,10 +329,10 @@
 {
 	PurpleConnection *gc = (PurpleConnection *)action->context;
 
-	purple_request_file_with_hint(action, _("Save buddylist..."), NULL, TRUE,
+	purple_request_file(action, _("Save buddylist..."), NULL, TRUE,
 			G_CALLBACK(ggp_callback_buddylist_save_ok), NULL,
 			purple_connection_get_account(gc), NULL, NULL,
-			PURPLE_REQUEST_UI_HINT_BLIST, gc);
+			gc);
 }
 /* }}} */
 
@@ -343,10 +343,10 @@
 {
 	PurpleConnection *gc = (PurpleConnection *)action->context;
 
-	purple_request_file_with_hint(action, "Load buddylist from file...", NULL, FALSE,
+	purple_request_file(action, "Load buddylist from file...", NULL, FALSE,
 			G_CALLBACK(ggp_callback_buddylist_load_ok), NULL,
 			purple_connection_get_account(gc), NULL, NULL,
-			PURPLE_REQUEST_UI_HINT_BLIST, gc);
+			gc);
 }
 /* }}} */
 
@@ -499,7 +499,7 @@
 			_("Current token"), token->data, token->size);
 	purple_request_field_group_add_field(group, field);
 
-	purple_request_fields_with_hint(account,
+	purple_request_fields(account,
 		_("Register New Gadu-Gadu Account"),
 		_("Register New Gadu-Gadu Account"),
 		_("Please, fill in the following fields"),
@@ -507,7 +507,7 @@
 		_("OK"), G_CALLBACK(ggp_callback_register_account_ok),
 		_("Cancel"), G_CALLBACK(ggp_callback_register_account_cancel),
 		purple_connection_get_account(gc), NULL, NULL,
-		PURPLE_REQUEST_UI_HINT_REGISTER, gc);
+		gc);
 }
 /* }}} */
 
@@ -658,7 +658,7 @@
 			_("Only online"), FALSE);
 	purple_request_field_group_add_field(group, field);
 
-	purple_request_fields_with_hint(gc,
+	purple_request_fields(gc,
 		_("Find buddies"),
 		_("Find buddies"),
 		_("Please, enter your search criteria below"),
@@ -666,7 +666,7 @@
 		_("OK"), G_CALLBACK(ggp_callback_find_buddies),
 		_("Cancel"), NULL,
 		purple_connection_get_account(gc), NULL, NULL,
-		PURPLE_REQUEST_UI_HINT_BLIST, gc);
+		gc);
 }
 /* }}} */
 
@@ -796,14 +796,14 @@
 		_("Please, enter your current password and your new password for UIN: "),
 		ggp_get_uin(purple_connection_get_account(gc)));
 
-	purple_request_fields_with_hint(gc,
+	purple_request_fields(gc,
 		_("Change Gadu-Gadu Password"),
 		_("Change Gadu-Gadu Password"),
 		msg,
 		fields, _("OK"), G_CALLBACK(ggp_callback_change_passwd_ok),
 		_("Cancel"), NULL,
 		purple_connection_get_account(gc), NULL, NULL,
-		PURPLE_REQUEST_UI_HINT_ACCOUNT, gc);
+		gc);
 
 	g_free(msg);
 }
@@ -877,7 +877,7 @@
 
 	msg = g_strdup_printf(_("Select a chat for buddy: %s"),
 			      purple_buddy_get_alias(buddy));
-	purple_request_fields_with_hint(gc,
+	purple_request_fields(gc,
 			_("Add to chat..."),
 			_("Add to chat..."),
 			msg,
@@ -885,7 +885,7 @@
 			_("Add"), G_CALLBACK(ggp_callback_add_to_chat_ok),
 			_("Cancel"), NULL,
 			purple_connection_get_account(gc), NULL, NULL,			  
-			PURPLE_REQUEST_UI_HINT_BUDDY, gc);
+			gc);
 	g_free(msg);
 }
 /* }}} */
--- a/libpurple/protocols/jabber/auth.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/protocols/jabber/auth.c	Sat Nov 17 19:41:05 2007 +0000
@@ -322,10 +322,10 @@
 				} else if (!plaintext) {
 					char *msg = g_strdup_printf(_("%s requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"),
 							js->gc->account->username);
-					purple_request_yes_no_with_hint(js->gc, _("Plaintext Authentication"),
+					purple_request_yes_no(js->gc, _("Plaintext Authentication"),
 							_("Plaintext Authentication"),
 							msg,
-							2, js->gc->account, NULL, NULL, PURPLE_REQUEST_UI_HINT_ACCOUNT, js->gc->account,
+							2, js->gc->account, NULL, NULL, js->gc->account,
 							allow_cyrus_plaintext_auth,
 							disallow_plaintext_auth);
 					g_free(msg);
@@ -517,13 +517,13 @@
 		if(js->gsc == NULL && !purple_account_get_bool(js->gc->account, "auth_plain_in_clear", FALSE)) {
 			char *msg = g_strdup_printf(_("%s requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"),
 					js->gc->account->username);
-			purple_request_yes_no_with_hint(js->gc, _("Plaintext Authentication"),
+			purple_request_yes_no(js->gc, _("Plaintext Authentication"),
 					_("Plaintext Authentication"),
 					msg,
 					2,
 					purple_connection_get_account(js->gc), NULL, NULL,
-					PURPLE_REQUEST_UI_HINT_ACCOUNT, purple_connection_get_account(js->gc),
-					allow_plaintext_auth, disallow_plaintext_auth);
+					purple_connection_get_account(js->gc), allow_plaintext_auth,
+					disallow_plaintext_auth);
 			g_free(msg);
 			return;
 		}
@@ -611,13 +611,13 @@
 		} else if(xmlnode_get_child(query, "password")) {
 			if(js->gsc == NULL && !purple_account_get_bool(js->gc->account,
 						"auth_plain_in_clear", FALSE)) {
-				purple_request_yes_no_with_hint(js->gc, _("Plaintext Authentication"),
+				purple_request_yes_no(js->gc, _("Plaintext Authentication"),
 						_("Plaintext Authentication"),
 						_("This server requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"),
 						2,
 						purple_connection_get_account(js->gc), NULL, NULL,
-						PURPLE_REQUEST_UI_HINT_ACCOUNT, purple_connection_get_account(js->gc),
-						allow_plaintext_auth, disallow_plaintext_auth);
+						purple_connection_get_account(js->gc), allow_plaintext_auth,
+						disallow_plaintext_auth);
 				return;
 			}
 			finish_plaintext_authentication(js);
--- a/libpurple/protocols/jabber/buddy.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/protocols/jabber/buddy.c	Sat Nov 17 19:41:05 2007 +0000
@@ -719,7 +719,7 @@
 	if(x_vc_data != NULL)
 		xmlnode_free(x_vc_data);
 
-	purple_request_fields_with_hint(gc, _("Edit XMPP vCard"),
+	purple_request_fields(gc, _("Edit XMPP vCard"),
 						_("Edit XMPP vCard"),
 						_("All items below are optional. Enter only the "
 						  "information with which you feel comfortable."),
@@ -727,7 +727,7 @@
 						_("Save"), G_CALLBACK(jabber_format_info),
 						_("Cancel"), NULL,
 						purple_connection_get_account(gc), NULL, NULL,
-						PURPLE_REQUEST_UI_HINT_ACCOUNT, gc);
+						gc);
 }
 
 /*---------------------------------------*/
@@ -2420,12 +2420,12 @@
 		usi->js = js;
 		usi->directory_server = g_strdup(from);
 
-		purple_request_fields_with_hint(js->gc, _("Search for XMPP users"),
+		purple_request_fields(js->gc, _("Search for XMPP users"),
 				_("Search for XMPP users"), instructions, fields,
 				_("Search"), G_CALLBACK(user_search_cb),
 				_("Cancel"), G_CALLBACK(user_search_cancel_cb),
 				purple_connection_get_account(js->gc), NULL, NULL,
-				PURPLE_REQUEST_UI_HINT_ACCOUNT, usi);
+				usi);
 
 		g_free(instructions);
 	}
@@ -2454,14 +2454,14 @@
 	PurpleConnection *gc = (PurpleConnection *) action->context;
 	JabberStream *js = gc->proto_data;
 
-	purple_request_input_with_hint(gc, _("Enter a User Directory"), _("Enter a User Directory"),
+	purple_request_input(gc, _("Enter a User Directory"), _("Enter a User Directory"),
 			_("Select a user directory to search"),
 			js->user_directories ? js->user_directories->data : NULL,
 			FALSE, FALSE, NULL,
 			_("Search Directory"), PURPLE_CALLBACK(jabber_user_search),
 			_("Cancel"), NULL,
 			NULL, NULL, NULL,
-			PURPLE_REQUEST_UI_HINT_ACCOUNT, js);
+			js);
 }
 
 
--- a/libpurple/protocols/jabber/caps.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/protocols/jabber/caps.c	Sat Nov 17 19:41:05 2007 +0000
@@ -232,7 +232,8 @@
 		xmlnode *identity = xmlnode_new_child(client, "identity");
 		xmlnode_set_attrib(identity, "category", id->category);
 		xmlnode_set_attrib(identity, "type", id->type);
-		xmlnode_set_attrib(identity, "name", id->name);
+		if (id->name)
+			xmlnode_set_attrib(identity, "name", id->name);
 	}
 
 	for(iter = props->features; iter; iter = g_list_next(iter)) {
--- a/libpurple/protocols/jabber/chat.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/protocols/jabber/chat.c	Sat Nov 17 19:41:05 2007 +0000
@@ -778,14 +778,14 @@
 	purple_roomlist_set_fields(js->roomlist, fields);
 
 
-	purple_request_input_with_hint(gc, _("Enter a Conference Server"), _("Enter a Conference Server"),
+	purple_request_input(gc, _("Enter a Conference Server"), _("Enter a Conference Server"),
 			_("Select a conference server to query"),
 			js->chat_servers ? js->chat_servers->data : NULL,
 			FALSE, FALSE, NULL,
 			_("Find Rooms"), PURPLE_CALLBACK(roomlist_ok_cb),
 			_("Cancel"), PURPLE_CALLBACK(roomlist_cancel_cb),
 			purple_connection_get_account(gc), NULL, NULL,			 
-			PURPLE_REQUEST_UI_HINT_CONV, js);
+			js);
 
 	return js->roomlist;
 }
--- a/libpurple/protocols/jabber/jabber.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/protocols/jabber/jabber.c	Sat Nov 17 19:41:05 2007 +0000
@@ -60,7 +60,7 @@
 #define JABBER_CONNECT_STEPS (js->gsc ? 9 : 5)
 
 static PurplePlugin *my_protocol = NULL;
-GList *jabber_features;
+GList *jabber_features = NULL;
 
 static void jabber_unregister_account_cb(JabberStream *js);
 
@@ -209,11 +209,11 @@
 		jabber_message_parse(js, *packet);
 	} else if(!strcmp((*packet)->name, "stream:features")) {
 		jabber_stream_features_parse(js, *packet);
-	} else if (!strcmp((*packet)->name, "features") &&
+	} else if (!strcmp((*packet)->name, "features") && xmlns &&
 		   !strcmp(xmlns, "http://etherx.jabber.org/streams")) {
 		jabber_stream_features_parse(js, *packet);
 	} else if(!strcmp((*packet)->name, "stream:error") ||
-			 (!strcmp((*packet)->name, "error") &&
+			 (!strcmp((*packet)->name, "error") && xmlns &&
 				!strcmp(xmlns, "http://etherx.jabber.org/streams")))
 	{
 		jabber_stream_handle_error(js, *packet);
@@ -1029,21 +1029,21 @@
 	cbdata->who = g_strdup(from);
 
 	if(js->registration)
-		purple_request_fields_with_hint(js->gc, _("Register New XMPP Account"),
+		purple_request_fields(js->gc, _("Register New XMPP Account"),
 				_("Register New XMPP Account"), instructions, fields,
 				_("Register"), G_CALLBACK(jabber_register_cb),
 				_("Cancel"), G_CALLBACK(jabber_register_cancel_cb),
 				purple_connection_get_account(js->gc), NULL, NULL,
-				PURPLE_REQUEST_UI_HINT_REGISTER, cbdata);
+				cbdata);
 	else {
 		char *title = registered?g_strdup_printf(_("Change Account Registration at %s"), from)
 								:g_strdup_printf(_("Register New Account at %s"), from);
-		purple_request_fields_with_hint(js->gc, title,
+		purple_request_fields(js->gc, title,
 			  title, instructions, fields,
 			  registered?_("Change Registration"):_("Register"), G_CALLBACK(jabber_register_cb),
 			  _("Cancel"), G_CALLBACK(jabber_register_cancel_cb),
 			  purple_connection_get_account(js->gc), NULL, NULL,
-			  PURPLE_REQUEST_UI_HINT_REGISTER, cbdata);
+			  cbdata);
 		g_free(title);
 	}
 
@@ -1384,7 +1384,7 @@
 			g_free(feat->namespace);
 			
 			g_free(feature->data);
-			feature = g_list_delete_link(feature, feature);
+			jabber_features = g_list_delete_link(jabber_features, feature);
 			break;
 		}
 	}
@@ -1740,12 +1740,12 @@
 	purple_request_field_set_required(field, TRUE);
 	purple_request_field_group_add_field(group, field);
 
-	purple_request_fields_with_hint(js->gc, _("Change XMPP Password"),
+	purple_request_fields(js->gc, _("Change XMPP Password"),
 			_("Change XMPP Password"), _("Please enter your new password"),
 			fields, _("OK"), G_CALLBACK(jabber_password_change_cb),
 			_("Cancel"), NULL,
 			purple_connection_get_account(gc), NULL, NULL,
-			PURPLE_REQUEST_UI_HINT_ACCOUNT, js);
+			js);
 }
 
 GList *jabber_actions(PurplePlugin *plugin, gpointer context)
--- a/libpurple/protocols/jabber/presence.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/protocols/jabber/presence.c	Sat Nov 17 19:41:05 2007 +0000
@@ -512,7 +512,7 @@
 						if((chat = jabber_chat_find(js, jid->node, jid->domain))) {
 							chat->config_dialog_type = PURPLE_REQUEST_ACTION;
 							chat->config_dialog_handle =
-								purple_request_action_with_hint(js->gc,
+								purple_request_action(js->gc,
 										_("Create New Room"),
 										_("Create New Room"),
 										_("You are creating a new room.  Would"
@@ -520,7 +520,7 @@
 											" accept the default settings?"),
 										/* Default Action */ 1,
 										purple_connection_get_account(js->gc), NULL, chat->conv,
-										PURPLE_REQUEST_UI_HINT_CONV, chat, 2,
+										chat, 2,
 										_("_Configure Room"), G_CALLBACK(jabber_chat_request_room_configure),
 										_("_Accept Defaults"), G_CALLBACK(jabber_chat_create_instant_room));
 						}
--- a/libpurple/protocols/jabber/si.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/protocols/jabber/si.c	Sat Nov 17 19:41:05 2007 +0000
@@ -824,6 +824,7 @@
 
 			do_transfer_send(xfer, resource);
 			g_free(resource);
+			return;
 		}
 
 		jb = jabber_buddy_find(jsx->js, xfer->who, TRUE);
@@ -870,9 +871,9 @@
 
 			purple_request_fields_add_group(fields, group);
 
-			purple_request_fields_with_hint(jsx->js->gc, _("Select a Resource"), msg, NULL, fields,
+			purple_request_fields(jsx->js->gc, _("Select a Resource"), msg, NULL, fields,
 					_("Send File"), G_CALLBACK(resource_select_ok_cb), _("Cancel"), G_CALLBACK(resource_select_cancel_cb),
-					jsx->js->gc->account, xfer->who, NULL, PURPLE_REQUEST_UI_HINT_XFER, xfer);
+					jsx->js->gc->account, xfer->who, NULL, xfer);
 
 			g_free(msg);
 		}
--- a/libpurple/protocols/jabber/usermood.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/protocols/jabber/usermood.c	Sat Nov 17 19:41:05 2007 +0000
@@ -194,14 +194,14 @@
 											FALSE);
 	purple_request_field_group_add_field(group, field);
 	
-	purple_request_fields_with_hint(gc, _("Edit User Mood"),
+	purple_request_fields(gc, _("Edit User Mood"),
 						  _("Edit User Mood"),
 						  _("Please select your mood from the list."),
 						  fields,
 						  _("Set"), G_CALLBACK(do_mood_set_from_fields),
 						  _("Cancel"), NULL,
 						  purple_connection_get_account(gc), NULL, NULL,
-						  PURPLE_REQUEST_UI_HINT_BLIST, gc);
+						  gc);
 	
 }
 
--- a/libpurple/protocols/jabber/usernick.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/protocols/jabber/usernick.c	Sat Nov 17 19:41:05 2007 +0000
@@ -73,10 +73,10 @@
 			oldnickname = xmlnode_get_data(nick);
 	}
 	
-	purple_request_input_with_hint(js->gc, _("Set User Nickname"), _("Please specify a new nickname for you."),
+	purple_request_input(js->gc, _("Set User Nickname"), _("Please specify a new nickname for you."),
 		_("This information is visible to all contacts on your contact list, so choose something appropriate."),
 		oldnickname, FALSE, FALSE, NULL, _("Set"), PURPLE_CALLBACK(do_nick_set), _("Cancel"), NULL,
-		purple_connection_get_account(js->gc), NULL, NULL, PURPLE_REQUEST_UI_HINT_BLIST, js);
+		purple_connection_get_account(js->gc), NULL, NULL, js);
 	g_free(oldnickname);
 }
 
--- a/libpurple/protocols/jabber/xdata.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/protocols/jabber/xdata.c	Sat Nov 17 19:41:05 2007 +0000
@@ -395,11 +395,11 @@
 	if((x = xmlnode_get_child(packet, "instructions")))
 		instructions = xmlnode_get_data(x);
 
-	handle = purple_request_fields_with_hint(js->gc, title, title, instructions, fields,
+	handle = purple_request_fields(js->gc, title, title, instructions, fields,
 			_("OK"), G_CALLBACK(jabber_x_data_ok_cb),
 			_("Cancel"), G_CALLBACK(jabber_x_data_cancel_cb),
 			purple_connection_get_account(js->gc), /* XXX Do we have a who here? */ NULL, NULL,
-			PURPLE_REQUEST_UI_HINT_ACCOUNT, data);
+			data);
 
 	g_free(title);
 	g_free(instructions);
--- a/libpurple/protocols/msn/dialog.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/protocols/msn/dialog.c	Sat Nov 17 19:41:05 2007 +0000
@@ -135,9 +135,9 @@
 								 passport);
 	}
 
-	purple_request_action_with_hint(gc, NULL, msg, reason, PURPLE_DEFAULT_ACTION_NONE, 
+	purple_request_action(gc, NULL, msg, reason, PURPLE_DEFAULT_ACTION_NONE, 
 						purple_connection_get_account(gc), data->who, NULL,
-						PURPLE_REQUEST_UI_HINT_BLIST, data, 2,
+						data, 2,
 						_("Yes"), G_CALLBACK(msn_add_cb),
 						_("No"), G_CALLBACK(msn_rem_cb));
 
--- a/libpurple/protocols/msn/msn.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/protocols/msn/msn.c	Sat Nov 17 19:41:05 2007 +0000
@@ -283,14 +283,14 @@
 
 	gc = (PurpleConnection *) action->context;
 
-	purple_request_input_with_hint(gc, NULL, _("Set your friendly name."),
+	purple_request_input(gc, NULL, _("Set your friendly name."),
 					   _("This is the name that other MSN buddies will "
 						 "see you as."),
 					   purple_connection_get_display_name(gc), FALSE, FALSE, NULL,
 					   _("OK"), G_CALLBACK(msn_act_id),
 					   _("Cancel"), NULL,
 					   purple_connection_get_account(gc), NULL, NULL,
-					   PURPLE_REQUEST_UI_HINT_ACCOUNT, gc);
+					   gc);
 }
 
 static void
@@ -302,12 +302,12 @@
 	gc = (PurpleConnection *) action->context;
 	session = gc->proto_data;
 
-	purple_request_input_with_hint(gc, NULL, _("Set your home phone number."), NULL,
+	purple_request_input(gc, NULL, _("Set your home phone number."), NULL,
 					   msn_user_get_home_phone(session->user), FALSE, FALSE, NULL,
 					   _("OK"), G_CALLBACK(msn_set_home_phone_cb),
 					   _("Cancel"), NULL,
 					   purple_connection_get_account(gc), NULL, NULL,
-					   PURPLE_REQUEST_UI_HINT_ACCOUNT, gc);
+					   gc);
 }
 
 static void
@@ -319,12 +319,12 @@
 	gc = (PurpleConnection *) action->context;
 	session = gc->proto_data;
 
-	purple_request_input_with_hint(gc, NULL, _("Set your work phone number."), NULL,
+	purple_request_input(gc, NULL, _("Set your work phone number."), NULL,
 					   msn_user_get_work_phone(session->user), FALSE, FALSE, NULL,
 					   _("OK"), G_CALLBACK(msn_set_work_phone_cb),
 					   _("Cancel"), NULL,
 					   purple_connection_get_account(gc), NULL, NULL,
-					   PURPLE_REQUEST_UI_HINT_ACCOUNT, gc);
+					   gc);
 }
 
 static void
@@ -336,12 +336,12 @@
 	gc = (PurpleConnection *) action->context;
 	session = gc->proto_data;
 
-	purple_request_input_with_hint(gc, NULL, _("Set your mobile phone number."), NULL,
+	purple_request_input(gc, NULL, _("Set your mobile phone number."), NULL,
 					   msn_user_get_mobile_phone(session->user), FALSE, FALSE, NULL,
 					   _("OK"), G_CALLBACK(msn_set_mobile_phone_cb),
 					   _("Cancel"), NULL,
 					   purple_connection_get_account(gc), NULL, NULL,
-					   PURPLE_REQUEST_UI_HINT_ACCOUNT, gc);
+					   gc);
 }
 
 static void
@@ -351,13 +351,13 @@
 
 	gc = (PurpleConnection *) action->context;
 
-	purple_request_action_with_hint(gc, NULL, _("Allow MSN Mobile pages?"),
+	purple_request_action(gc, NULL, _("Allow MSN Mobile pages?"),
 						_("Do you want to allow or disallow people on "
 						  "your buddy list to send you MSN Mobile pages "
 						  "to your cell phone or other mobile device?"),
 						-1,
 						purple_connection_get_account(gc), NULL, NULL,
-						PURPLE_REQUEST_UI_HINT_ACCOUNT, gc, 3,
+						gc, 3,
 						_("Allow"), G_CALLBACK(enable_msn_pages_cb),
 						_("Disallow"), G_CALLBACK(disable_msn_pages_cb),
 						_("Cancel"), NULL);
@@ -401,12 +401,12 @@
 	data->gc = gc;
 	data->passport = buddy->name;
 
-	purple_request_input_with_hint(gc, NULL, _("Send a mobile message."), NULL,
+	purple_request_input(gc, NULL, _("Send a mobile message."), NULL,
 					   NULL, TRUE, FALSE, NULL,
 					   _("Page"), G_CALLBACK(send_to_mobile_cb),
 					   _("Close"), G_CALLBACK(close_mobile_page_cb),
 					   purple_connection_get_account(gc), purple_buddy_get_name(buddy), NULL,
-					   PURPLE_REQUEST_UI_HINT_ACCOUNT, data);
+					   data);
 }
 
 static gboolean
--- a/libpurple/protocols/msnp9/msn.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/protocols/msnp9/msn.c	Sat Nov 17 19:41:05 2007 +0000
@@ -2218,4 +2218,4 @@
 		PURPLE_CALLBACK(msn_uri_handler), NULL);
 }
 
-PURPLE_INIT_PLUGIN(msn, init_plugin, info);
+PURPLE_INIT_PLUGIN(msnp9, init_plugin, info);
--- a/libpurple/protocols/msnp9/userlist.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/protocols/msnp9/userlist.c	Sat Nov 17 19:41:05 2007 +0000
@@ -41,10 +41,15 @@
 msn_accept_add_cb(gpointer data)
 {
 	MsnPermitAdd *pa = data;
-	MsnSession *session = pa->gc->proto_data;
-	MsnUserList *userlist = session->userlist;
+	MsnSession *session;
+	MsnUserList *userlist;
 
-	msn_userlist_add_buddy(userlist, pa->who, MSN_LIST_AL, NULL);
+	if (PURPLE_CONNECTION_IS_VALID(pa->gc)) {
+		session = pa->gc->proto_data;
+		userlist = session->userlist;
+
+		msn_userlist_add_buddy(userlist, pa->who, MSN_LIST_AL, NULL);
+	}
 
 	g_free(pa->who);
 	g_free(pa->friendly);
@@ -55,10 +60,15 @@
 msn_cancel_add_cb(gpointer data)
 {
 	MsnPermitAdd *pa = data;
-	MsnSession *session = pa->gc->proto_data;
-	MsnUserList *userlist = session->userlist;
+	MsnSession *session;
+	MsnUserList *userlist;
 
-	msn_userlist_add_buddy(userlist, pa->who, MSN_LIST_BL, NULL);
+	if (PURPLE_CONNECTION_IS_VALID(pa->gc)) {
+		session = pa->gc->proto_data;
+		userlist = session->userlist;
+
+		msn_userlist_add_buddy(userlist, pa->who, MSN_LIST_BL, NULL);
+	}
 
 	g_free(pa->who);
 	g_free(pa->friendly);
--- a/libpurple/protocols/myspace/myspace.h	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/protocols/myspace/myspace.h	Sat Nov 17 19:41:05 2007 +0000
@@ -41,7 +41,7 @@
 #include "notify.h"
 #include "plugin.h"
 #include "accountopt.h"
-#include "version.h"
+#include "libpurple/version.h"
 #include "cipher.h"     /* for SHA-1 */
 #include "util.h"       /* for base64 */
 #include "debug.h"      /* for purple_debug_info */
--- a/libpurple/protocols/novell/novell.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/protocols/novell/novell.c	Sat Nov 17 19:41:05 2007 +0000
@@ -1921,10 +1921,10 @@
 
 	/* Prompt the user */
 	gc = purple_account_get_connection(user->client_data);
-	purple_request_action_with_hint(gc, title, primary, secondary,
+	purple_request_action(gc, title, primary, secondary,
 						PURPLE_DEFAULT_ACTION_NONE,
 						purple_connection_get_account(gc), name, NULL,
-						PURPLE_REQUEST_UI_HINT_CONV, parms, 2,
+						parms, 2,
 						_("Yes"), G_CALLBACK(_join_conference_cb),
 						_("No"), G_CALLBACK(_reject_conference_cb));
 
@@ -2175,7 +2175,7 @@
 	if (server == NULL || *server == '\0') {
 
 		/* TODO: Would be nice to prompt if not set!
-		 *  purple_request_fields_with_hint(gc, _("Server Address"),...);
+		 *  purple_request_fields(gc, _("Server Address"),...);
 		 */
 
 		/* ...but for now just error out with a nice message. */
--- a/libpurple/protocols/oscar/oscar.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Sat Nov 17 19:41:05 2007 +0000
@@ -1444,13 +1444,13 @@
 	purple_debug_info("oscar", "Got SecurID request\n");
 
 	primary = g_strdup_printf("Enter the SecurID key for %s.", purple_account_get_username(account));
-	purple_request_input_with_hint(gc, NULL, _("Enter SecurID"), primary,
+	purple_request_input(gc, NULL, _("Enter SecurID"), primary,
 					   _("Enter the 6 digit number from the digital display."),
 					   FALSE, FALSE, NULL,
 					   _("_OK"), G_CALLBACK(purple_parse_auth_securid_request_yes_cb),
 					   _("_Cancel"), G_CALLBACK(purple_parse_auth_securid_request_no_cb),
 					   account, NULL, NULL,
-					   PURPLE_REQUEST_UI_HINT_ACCOUNT, gc);
+					   gc);
 	g_free(primary);
 
 	return 1;
@@ -2237,12 +2237,12 @@
 	data->gc = gc;
 	data->name = g_strdup(name);
 
-	purple_request_input_with_hint(data->gc, NULL, _("Authorization Request Message:"),
+	purple_request_input(data->gc, NULL, _("Authorization Request Message:"),
 					   NULL, _("Please authorize me!"), TRUE, FALSE, NULL,
 					   _("_OK"), G_CALLBACK(purple_auth_request),
 					   _("_Cancel"), G_CALLBACK(purple_auth_dontrequest),
 					   purple_connection_get_account(gc), name, NULL,
-					   PURPLE_REQUEST_UI_HINT_BLIST, data);
+					   data);
 }
 
 
@@ -2286,12 +2286,12 @@
 purple_auth_dontgrant_msgprompt(gpointer cbdata)
 {
 	struct name_data *data = cbdata;
-	purple_request_input_with_hint(data->gc, NULL, _("Authorization Denied Message:"),
+	purple_request_input(data->gc, NULL, _("Authorization Denied Message:"),
 					   NULL, _("No reason given."), TRUE, FALSE, NULL,
 					   _("_OK"), G_CALLBACK(purple_auth_dontgrant),
 					   _("_Cancel"), G_CALLBACK(oscar_free_name_data),
 					   purple_connection_get_account(data->gc), data->name, NULL,
-					   PURPLE_REQUEST_UI_HINT_BLIST, data);
+					   data);
 }
 
 /* When someone sends you buddies */
@@ -2472,12 +2472,12 @@
 					data->name = g_strdup(text[i*2+1]);
 					data->nick = g_strdup(text[i*2+2]);
 
-					purple_request_action_with_hint(gc, NULL, message,
+					purple_request_action(gc, NULL, message,
 										_("Do you want to add this buddy "
 										  "to your buddy list?"),
 										PURPLE_DEFAULT_ACTION_NONE,
 										purple_connection_get_account(gc), data->name, NULL,
-										PURPLE_REQUEST_UI_HINT_BLIST, data, 2,
+										data, 2,
 										_("_Add"), G_CALLBACK(purple_icq_buddyadd),
 										_("_Decline"), G_CALLBACK(oscar_free_name_data));
 					g_free(message);
@@ -5231,10 +5231,10 @@
 	data->name = g_strdup(sn);
 	data->nick = (buddy ? g_strdup(purple_buddy_get_alias_only(buddy)) : NULL);
 
-	purple_request_yes_no_with_hint(gc, NULL, _("Authorization Given"), dialog_msg,
+	purple_request_yes_no(gc, NULL, _("Authorization Given"), dialog_msg,
 						PURPLE_DEFAULT_ACTION_NONE,
 						purple_connection_get_account(gc), sn, NULL,
-						PURPLE_REQUEST_UI_HINT_BLIST, data,
+						data,
 						G_CALLBACK(purple_icq_buddyadd),
 						G_CALLBACK(oscar_free_name_data));
 	g_free(dialog_msg);
@@ -5930,12 +5930,12 @@
 	data->nick = g_strdup(purple_buddy_get_alias_only(buddy));
 
 	title = g_strdup_printf(_("Buddy Comment for %s"), data->name);
-	purple_request_input_with_hint(gc, title, _("Buddy Comment:"), NULL,
+	purple_request_input(gc, title, _("Buddy Comment:"), NULL,
 					   comment_utf8, TRUE, FALSE, NULL,
 					   _("_OK"), G_CALLBACK(oscar_ssi_editcomment),
 					   _("_Cancel"), G_CALLBACK(oscar_free_name_data),
 					   purple_connection_get_account(gc), data->name, NULL,
-					   PURPLE_REQUEST_UI_HINT_BUDDY, data);
+					   data);
 	g_free(title);
 
 	g_free(comment);
@@ -5980,13 +5980,13 @@
 	buf = g_strdup_printf(_("You have selected to open a Direct IM connection with %s."),
 			buddy->name);
 
-	purple_request_action_with_hint(gc, NULL, buf,
+	purple_request_action(gc, NULL, buf,
 			_("Because this reveals your IP address, it "
 			  "may be considered a security risk.  Do you "
 			  "wish to continue?"),
 			0,
 			purple_connection_get_account(gc), data->who, NULL,
-			PURPLE_REQUEST_UI_HINT_BUDDY, data, 2,
+			data, 2,
 			_("C_onnect"), G_CALLBACK(oscar_ask_directim_yes_cb),
 			_("_Cancel"), G_CALLBACK(oscar_ask_directim_no_cb));
 	g_free(buf);
@@ -6138,12 +6138,12 @@
 
 	purple_request_fields_add_group(fields, g);
 
-	purple_request_fields_with_hint(gc, _("ICQ Privacy Options"), _("ICQ Privacy Options"),
+	purple_request_fields(gc, _("ICQ Privacy Options"), _("ICQ Privacy Options"),
 						NULL, fields,
 						_("OK"), G_CALLBACK(oscar_icq_privacy_opts),
 						_("Cancel"), NULL,
 						purple_connection_get_account(gc), NULL, NULL,
-						PURPLE_REQUEST_UI_HINT_ACCOUNT, gc);
+						gc);
 }
 
 static void oscar_format_screenname(PurpleConnection *gc, const char *nick) {
@@ -6211,12 +6211,12 @@
 static void oscar_show_change_email(PurplePluginAction *action)
 {
 	PurpleConnection *gc = (PurpleConnection *) action->context;
-	purple_request_input_with_hint(gc, NULL, _("Change Address To:"), NULL, NULL,
+	purple_request_input(gc, NULL, _("Change Address To:"), NULL, NULL,
 					   FALSE, FALSE, NULL,
 					   _("_OK"), G_CALLBACK(oscar_change_email),
 					   _("_Cancel"), NULL,
 					   purple_connection_get_account(gc), NULL, NULL,
-					   PURPLE_REQUEST_UI_HINT_ACCOUNT, gc);
+					   gc);
 }
 
 static void oscar_show_awaitingauth(PurplePluginAction *action)
@@ -6278,7 +6278,7 @@
 static void oscar_show_find_email(PurplePluginAction *action)
 {
 	PurpleConnection *gc = (PurpleConnection *) action->context;
-	purple_request_input_with_hint(gc, _("Find Buddy by E-Mail"),
+	purple_request_input(gc, _("Find Buddy by E-Mail"),
 					   _("Search for a buddy by e-mail address"),
 					   _("Type the e-mail address of the buddy you are "
 						 "searching for."),
@@ -6286,7 +6286,7 @@
 					   _("_Search"), G_CALLBACK(search_by_email_cb),
 					   _("_Cancel"), NULL,
 					   purple_connection_get_account(gc), NULL, NULL,
-					   PURPLE_REQUEST_UI_HINT_ACCOUNT, gc);
+					   gc);
 }
 
 static void oscar_show_set_info(PurplePluginAction *action)
--- a/libpurple/protocols/oscar/peer.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/protocols/oscar/peer.c	Sat Nov 17 19:41:05 2007 +0000
@@ -1035,7 +1035,7 @@
 		buf = g_strdup_printf(_("%s has just asked to directly connect to %s"),
 				sn, purple_account_get_username(account));
 
-		purple_request_action_with_hint(conn, NULL, buf,
+		purple_request_action(conn, NULL, buf,
 						_("This requires a direct connection between "
 						  "the two computers and is necessary for IM "
 						  "Images.  Because your IP address will be "
@@ -1043,7 +1043,7 @@
 						  "risk."),
 						PURPLE_DEFAULT_ACTION_NONE,
 						account, sn, NULL,
-						PURPLE_REQUEST_UI_HINT_BUDDY, conn, 2,
+						conn, 2,
 						_("C_onnect"), G_CALLBACK(peer_connection_got_proposition_yes_cb),
 						_("Cancel"), G_CALLBACK(peer_connection_got_proposition_no_cb));
 	}
--- a/libpurple/protocols/qq/buddy_info.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/protocols/qq/buddy_info.c	Sat Nov 17 19:41:05 2007 +0000
@@ -519,12 +519,12 @@
 		mid->info->qq_show = g_strdup(info->qq_show);
 		mid->info->unknown6 = g_strdup(info->unknown6);
 
-		purple_request_fields_with_hint(gc, _("Modify my information"),
+		purple_request_fields(gc, _("Modify my information"),
 			_("Modify my information"), NULL, fields,
 			_("Update my information"), G_CALLBACK(modify_info_ok_cb),
 			_("Cancel"), G_CALLBACK(modify_info_cancel_cb),
 			purple_connection_get_account(gc), NULL, NULL,
-			"account", mid);
+			mid);
 	}
 }
 
--- a/libpurple/protocols/qq/buddy_opt.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/protocols/qq/buddy_opt.c	Sat Nov 17 19:41:05 2007 +0000
@@ -209,11 +209,11 @@
 	msg2 = g_strdup(_("Input your reason:"));
 
 	nombre = uid_to_purple_name(uid);
-	purple_request_input_with_hint(gc, _("Reject request"), msg1, msg2,
+	purple_request_input(gc, _("Reject request"), msg1, msg2,
 			   _("Sorry, you are not my type..."), TRUE, FALSE,
 			   NULL, _("Reject"), G_CALLBACK(_qq_reject_add_request_real), _("Cancel"), NULL,
 			   purple_connection_get_account(gc), nombre, NULL,
-			   PURPLE_REQUEST_UI_HINT_BUDDY, g2);
+			   g2);
 	g_free(nombre);
 }
 
@@ -402,7 +402,7 @@
 			g->gc = gc;
 			g->uid = for_uid;
 			msg = g_strdup_printf(_("User %d needs authentication"), for_uid);
-			purple_request_input_with_hint(gc, NULL, msg,
+			purple_request_input(gc, NULL, msg,
 					   _("Input request here"), /* TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands */
 					   _("Would you be my friend?"),
 					   TRUE, FALSE, NULL, _("Send"),
@@ -410,7 +410,7 @@
 					   (_qq_send_packet_add_buddy_auth_with_gc_and_uid),
 					   _("Cancel"), G_CALLBACK(qq_do_nothing_with_gc_and_uid),
 					   purple_connection_get_account(gc), nombre, NULL,
-					   PURPLE_REQUEST_UI_HINT_BUDDY, g);
+					   g);
 			g_free(msg);
 			g_free(nombre);
 		} else {	/* add OK */
--- a/libpurple/protocols/qq/group.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/protocols/qq/group.c	Sat Nov 17 19:41:05 2007 +0000
@@ -116,14 +116,14 @@
 	purple_roomlist_set_fields(rl, fields);
 	purple_roomlist_set_in_progress(qd->roomlist, TRUE);
 
-	purple_request_input_with_hint(gc, _("QQ Qun"),
+	purple_request_input(gc, _("QQ Qun"),
 			   _("Please enter external group ID"),
 			   _("You can only search for permanent QQ groups\n"),
 			   NULL, FALSE, FALSE, NULL, 
 			   _("Search"), G_CALLBACK(_qq_group_search_callback), 
 			   _("Cancel"), G_CALLBACK(_qq_group_search_cancel_callback), 
 			   purple_connection_get_account(gc), NULL, NULL,
-			   PURPLE_REQUEST_UI_HINT_CONV, gc);
+			   gc);
 
 	return qd->roomlist;
 }
--- a/libpurple/protocols/qq/group_im.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/protocols/qq/group_im.c	Sat Nov 17 19:41:05 2007 +0000
@@ -133,11 +133,11 @@
 
 	nombre = uid_to_purple_name(user_uid);
 
-	purple_request_action_with_hint(gc, _("QQ Qun Operation"),
+	purple_request_action(gc, _("QQ Qun Operation"),
 			    msg, reason,
 			    2,
 				purple_connection_get_account(gc), nombre, NULL,
-				PURPLE_REQUEST_UI_HINT_CONV, g, 3,
+				g, 3,
 			    _("Approve"),
 			    G_CALLBACK
 			    (qq_group_approve_application_with_struct),
--- a/libpurple/protocols/qq/group_join.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/protocols/qq/group_join.c	Sat Nov 17 19:41:05 2007 +0000
@@ -132,14 +132,14 @@
 	g = g_new0(gc_and_uid, 1);
 	g->gc = gc;
 	g->uid = group->internal_group_id;
-	purple_request_input_with_hint(gc, NULL, msg,
+	purple_request_input(gc, NULL, msg,
 			   _("Input request here"),
 			   _("Would you be my friend?"), TRUE, FALSE, NULL,
 			   _("Send"),
 			   G_CALLBACK(_qq_group_join_auth_with_gc_and_id),
 			   _("Cancel"), G_CALLBACK(qq_do_nothing_with_gc_and_uid),
 			   purple_connection_get_account(gc), group->group_name_utf8, NULL,
-			   PURPLE_REQUEST_UI_HINT_CONV, g);
+			   g);
 	g_free(msg);
 }
 
@@ -356,13 +356,13 @@
 	g->gc = gc;
 	g->uid = internal_group_id;
 
-	purple_request_action_with_hint(gc, _("QQ Qun Operation"),
+	purple_request_action(gc, _("QQ Qun Operation"),
 			    _("Are you sure you want to leave this Qun?"),
 			    _
 			    ("Note, if you are the creator, \nthis operation will eventually remove this Qun."),
 			    1,
 				purple_connection_get_account(gc), NULL, NULL,
-			    PURPLE_REQUEST_UI_HINT_CONV, g, 2, _("Cancel"),
+			    g, 2, _("Cancel"),
 			    G_CALLBACK(qq_do_nothing_with_gc_and_uid),
 			    _("Continue"), G_CALLBACK(_qq_group_exit_with_gc_and_id));
 }
--- a/libpurple/protocols/qq/group_opt.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/protocols/qq/group_opt.c	Sat Nov 17 19:41:05 2007 +0000
@@ -121,9 +121,9 @@
 	g_return_if_fail(g != NULL && g->gc != NULL && g->member > 0);
 
 	qq_send_packet_get_info(g->gc, g->member, TRUE);	/* we want to see window */
-	purple_request_action_with_hint(g->gc, NULL, _("Do you want to approve the request?"), "", 2,
+	purple_request_action(g->gc, NULL, _("Do you want to approve the request?"), "", 2,
 					purple_connection_get_account(g->gc), NULL, NULL,
-					PURPLE_REQUEST_UI_HINT_CONV, g, 2,
+					g, 2,
 					_("Reject"), G_CALLBACK(qq_group_reject_application_with_struct),
 					_("Approve"), G_CALLBACK(qq_group_approve_application_with_struct));
 }
@@ -137,13 +137,13 @@
 	msg2 = g_strdup(_("Enter your reason:"));
 
 	nombre = uid_to_purple_name(g->member);
-	purple_request_input_with_hint(g->gc, /* title */ NULL, msg1, msg2,
+	purple_request_input(g->gc, /* title */ NULL, msg1, msg2,
 			   _("Sorry, you are not my type..."), /* multiline */ TRUE, /* masked */ FALSE,
 			   /* hint */ NULL,
 			   _("Send"), G_CALLBACK(_qq_group_reject_application_real),
 			   _("Cancel"), G_CALLBACK(_qq_group_do_nothing_with_struct),
 			   purple_connection_get_account(g->gc), nombre, NULL,
-			   PURPLE_REQUEST_UI_HINT_CONV, g);
+			   g);
 
 	g_free(msg1);
 	g_free(msg2);
@@ -388,13 +388,13 @@
 	g->gc = gc;
 	g->uid = internal_group_id;
 
-	purple_request_action_with_hint(gc, _("QQ Qun Operation"),
+	purple_request_action(gc, _("QQ Qun Operation"),
 			    _("You have successfully created a Qun"),
 			    _
 			    ("Would you like to set up the Qun details now?"),
 			    1,
 				purple_connection_get_account(gc), NULL, NULL,
-				PURPLE_REQUEST_UI_HINT_CONV, g, 2,
+				g, 2,
 				_("Setup"), G_CALLBACK(qq_group_setup_with_gc_and_uid),
 			    _("Cancel"), G_CALLBACK(qq_do_nothing_with_gc_and_uid));
 }
--- a/libpurple/protocols/qq/qq.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/protocols/qq/qq.c	Sat Nov 17 19:41:05 2007 +0000
@@ -418,9 +418,9 @@
 	g->gc = gc;
 	g->uid = uid;
 
-	purple_request_action_with_hint(gc, _("Block Buddy"),
+	purple_request_action(gc, _("Block Buddy"),
 			    _("Are you sure you want to block this buddy?"), NULL,
-			    1, g, "blist", 2,
+			    1, g, 2,
 			    _("Cancel"),
 			    G_CALLBACK(qq_do_nothing_with_gc_and_uid),
 			    _("Block"), G_CALLBACK(qq_block_buddy_with_gc_and_uid));
@@ -471,11 +471,11 @@
 static void _qq_menu_create_permanent_group(PurplePluginAction * action)
 {
 	PurpleConnection *gc = (PurpleConnection *) action->context;
-	purple_request_input_with_hint(gc, _("Create QQ Qun"),
+	purple_request_input(gc, _("Create QQ Qun"),
 			   _("Input Qun name here"),
 			   _("Only QQ members can create permanent Qun"),
 			   "OpenQ", FALSE, FALSE, NULL,
-			   _("Create"), G_CALLBACK(qq_group_create_with_name), _("Cancel"), NULL, "blist", gc);
+			   _("Create"), G_CALLBACK(qq_group_create_with_name), _("Cancel"), NULL, gc);
 }
 */
 
--- a/libpurple/protocols/qq/sys_msg.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/protocols/qq/sys_msg.c	Sat Nov 17 19:41:05 2007 +0000
@@ -83,10 +83,10 @@
 	qq_send_packet_get_info(gc, uid, TRUE);	/* we want to see window */
 
 	nombre = uid_to_purple_name(uid);
-	purple_request_action_with_hint
+	purple_request_action
 	    (gc, NULL, _("Do you want to approve the request?"), "", 2,
 		 purple_connection_get_account(gc), nombre, NULL,
-		 PURPLE_REQUEST_UI_HINT_CONV, g, 2,
+		 g, 2,
 	     _("Reject"), G_CALLBACK(qq_reject_add_request_with_gc_and_uid),
 	     _("Approve"), G_CALLBACK(qq_approve_add_request_with_gc_and_uid));
 	g_free(nombre);
@@ -106,11 +106,11 @@
 
 	qq_send_packet_get_info(gc, uid, TRUE);	/* we want to see window */
 	nombre = uid_to_purple_name(uid);
-	purple_request_action_with_hint
+	purple_request_action
 	    (gc, NULL, _("Do you want to add this buddy?"), "", 2,
 		 purple_connection_get_account(gc), nombre, NULL,
-		 PURPLE_REQUEST_UI_HINT_BUDDY, g, 2,
-		 _("Cancel"), NULL,
+		 g, 2,
+	     _("Cancel"), NULL,
 		 _("Add"), G_CALLBACK(qq_add_buddy_with_gc_and_uid));
 	g_free(nombre);
 }
@@ -165,10 +165,10 @@
 		g->uid = uid;	/* only need to get value */
 		message = g_strdup_printf(_("You have been added by %s"), from);
 		_qq_sys_msg_log_write(gc, message, from);
-		purple_request_action_with_hint(gc, NULL, message,
+		purple_request_action(gc, NULL, message,
 				    _("Would you like to add him?"), 2,
 					purple_connection_get_account(gc), name, NULL,
-					PURPLE_REQUEST_UI_HINT_BUDDY, g, 3,
+					g, 3,
 				    _("Cancel"), NULL,
 					_("Add"), G_CALLBACK(qq_add_buddy_with_gc_and_uid),
 				    _("Search"), G_CALLBACK(_qq_search_before_add_with_gc_and_uid));
@@ -239,10 +239,10 @@
 	reason = g_strdup_printf(_("Message: %s"), msg_utf8);
 	_qq_sys_msg_log_write(gc, message, from);
 
-	purple_request_action_with_hint
+	purple_request_action
 	    (gc, NULL, message, reason, 2,
 		purple_connection_get_account(gc), name, NULL,
-		 PURPLE_REQUEST_UI_HINT_BUDDY, g, 3,
+		 g, 3,
 	     _("Reject"),
 	     G_CALLBACK(qq_reject_add_request_with_gc_and_uid),
 	     _("Approve"),
@@ -259,10 +259,10 @@
 		g2->gc = gc;
 		g2->uid = strtol(from, NULL, 10);
 		message = g_strdup_printf(_("%s is not in your buddy list"), from);
-		purple_request_action_with_hint(gc, NULL, message,
+		purple_request_action(gc, NULL, message,
 				    _("Would you like to add him?"), 2,
 					purple_connection_get_account(gc), name, NULL,
-					PURPLE_REQUEST_UI_HINT_BLIST, g2, 3,
+					g2, 3,
 					_("Cancel"), NULL,
 					_("Add"), G_CALLBACK(qq_add_buddy_with_gc_and_uid),
 				    _("Search"), G_CALLBACK(_qq_search_before_add_with_gc_and_uid));
--- a/libpurple/protocols/sametime/sametime.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/protocols/sametime/sametime.c	Sat Nov 17 19:41:05 2007 +0000
@@ -3424,12 +3424,12 @@
 	   " message to be sent to %s");
   msg1 = g_strdup_printf(msgB, buddy->name);
 
-  purple_request_fields_with_hint(gc, _("New Conference"),
+  purple_request_fields(gc, _("New Conference"),
 		      msgA, msg1, fields,
 		      _("Create"), G_CALLBACK(conf_create_prompt_join),
 		      _("Cancel"), G_CALLBACK(conf_create_prompt_cancel),
 			  acct, purple_buddy_get_name(buddy), NULL,
-		      PURPLE_REQUEST_UI_HINT_CONV, buddy);
+		      buddy);
   g_free(msg1);
 }
 
@@ -3510,12 +3510,12 @@
 	   " create a new conference to invite this user to.");
   msg = g_strdup_printf(msgB, buddy->name);
 
-  purple_request_fields_with_hint(gc, _("Invite to Conference"),
+  purple_request_fields(gc, _("Invite to Conference"),
 		      msgA, msg, fields,
 		      _("Invite"), G_CALLBACK(conf_select_prompt_invite),
 		      _("Cancel"), G_CALLBACK(conf_select_prompt_cancel),
 			  acct, purple_buddy_get_name(buddy), NULL,
-		      PURPLE_REQUEST_UI_HINT_CONV, buddy);
+		      buddy);
   g_free(msg);
 }
 
@@ -3683,13 +3683,13 @@
 	  " continue logging in.");
   msg = g_strdup_printf(msgA, NSTR(purple_account_get_username(acct)));
   
-  purple_request_input_with_hint(gc, _("Meanwhile Connection Setup"),
+  purple_request_input(gc, _("Meanwhile Connection Setup"),
 		     _("No Sametime Community Server Specified"), msg,
 		     MW_PLUGIN_DEFAULT_HOST, FALSE, FALSE, NULL,
 		     _("Connect"), G_CALLBACK(prompt_host_ok_cb),
 		     _("Cancel"), G_CALLBACK(prompt_host_cancel_cb),
 			 acct, NULL, NULL,
-		     PURPLE_REQUEST_UI_HINT_CONV, gc);
+		     gc);
 
   g_free(msg);
 }
@@ -5261,10 +5261,10 @@
   title = g_strdup_printf(_("Import Sametime List for Account %s"),
 			  purple_account_get_username(account));
 
-  purple_request_file_with_hint(gc, title, NULL, FALSE,
+  purple_request_file(gc, title, NULL, FALSE,
 		    G_CALLBACK(st_import_action_cb), NULL,
 		    account, NULL, NULL,
-		    PURPLE_REQUEST_UI_HINT_CONV, gc);
+		    gc);
 
   g_free(title);
 }
@@ -5301,10 +5301,10 @@
   title = g_strdup_printf(_("Export Sametime List for Account %s"),
 			  purple_account_get_username(account));
 
-  purple_request_file_with_hint(gc, title, NULL, TRUE,
+  purple_request_file(gc, title, NULL, TRUE,
 		    G_CALLBACK(st_export_action_cb), NULL,
 			account, NULL, NULL,
-		    PURPLE_REQUEST_UI_HINT_CONV, gc);
+		    gc);
 
   g_free(title);
 }
@@ -5437,12 +5437,12 @@
 	  " the list below to add it to your buddy list.");
   msg = g_strdup_printf(msgB, result->name);
 
-  purple_request_fields_with_hint(gc, _("Select Notes Address Book"),
+  purple_request_fields(gc, _("Select Notes Address Book"),
 		      msgA, msg, fields,
 		      _("Add Group"), G_CALLBACK(remote_group_multi_cb),
 		      _("Cancel"), G_CALLBACK(remote_group_multi_cleanup),
 			  purple_connection_get_account(gc), result->name, NULL,
-		      PURPLE_REQUEST_UI_HINT_BLIST, pd);
+		      pd);
 
   g_free(msg);
 }
@@ -5527,12 +5527,12 @@
   msgB = _("Enter the name of a Notes Address Book group in the field below"
 	  " to add the group and its members to your buddy list.");
 
-  purple_request_input_with_hint(gc, _("Add Group"), msgA, msgB, NULL,
+  purple_request_input(gc, _("Add Group"), msgA, msgB, NULL,
 		     FALSE, FALSE, NULL,
 		     _("Add"), G_CALLBACK(remote_group_action_cb),
 		     _("Cancel"), NULL,
 			 purple_connection_get_account(gc), NULL, NULL,
-		     PURPLE_REQUEST_UI_HINT_BLIST, gc);
+		     gc);
 }
 
 
@@ -5652,12 +5652,12 @@
   msgB = _("Enter a name or partial ID in the field below to search"
 	   " for matching users in your Sametime community.");
 
-  purple_request_input_with_hint(gc, _("User Search"), msgA, msgB, NULL,
+  purple_request_input(gc, _("User Search"), msgA, msgB, NULL,
 		     FALSE, FALSE, NULL,
 		     _("Search"), G_CALLBACK(search_action_cb),
 		     _("Cancel"), NULL,
 			 purple_connection_get_account(gc), NULL, NULL,
-			 PURPLE_REQUEST_UI_HINT_BLIST, gc);
+			 gc);
 }
 
 
--- a/libpurple/protocols/silc/buddy.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/protocols/silc/buddy.c	Sat Nov 17 19:41:05 2007 +0000
@@ -312,9 +312,9 @@
 		a->hostname = strdup(hostname);
 	a->port = port;
 
-	purple_request_action_with_hint(client->application, _("Key Agreement Request"), tmp,
+	purple_request_action(client->application, _("Key Agreement Request"), tmp,
 			      hostname ? tmp2 : NULL, 1, gc->account, client_entry->nickname,
-			      NULL, PURPLE_REQUEST_UI_HINT_BLIST, a, 2, _("Yes"), G_CALLBACK(silcpurple_buddy_keyagr_request_cb),
+			      NULL, a, 2, _("Yes"), G_CALLBACK(silcpurple_buddy_keyagr_request_cb),
 			      _("No"), G_CALLBACK(silcpurple_buddy_keyagr_request_cb));
 }
 
@@ -449,11 +449,11 @@
 	p->client = sg->client;
 	p->conn = sg->conn;
 	p->client_id = client_entry->id;
-	purple_request_input_with_hint(gc, _("IM With Password"), NULL,
+	purple_request_input(gc, _("IM With Password"), NULL,
 	                     _("Set IM Password"), NULL, FALSE, TRUE, NULL,
 	                     _("OK"), G_CALLBACK(silcpurple_buddy_privkey_cb),
 	                     _("Cancel"), G_CALLBACK(silcpurple_buddy_privkey_cb),
-	                     gc->account, NULL, NULL, PURPLE_REQUEST_UI_HINT_BLIST, p);
+	                     gc->account, NULL, NULL, p);
 
 	silc_client_list_free(sg->client, sg->conn, clients);
 }
@@ -1059,10 +1059,10 @@
 	}
 
 	/* Open file selector to select the public key. */
-	purple_request_file_with_hint(r->client->application, _("Open..."), NULL, FALSE,
+	purple_request_file(r->client->application, _("Open..."), NULL, FALSE,
 			    G_CALLBACK(silcpurple_add_buddy_ask_import),
 			    G_CALLBACK(silcpurple_add_buddy_ask_pk_cancel),
-			    purple_buddy_get_account(r->b), purple_buddy_get_name(r->b), NULL, PURPLE_REQUEST_UI_HINT_BLIST, r);
+			    purple_buddy_get_account(r->b), purple_buddy_get_name(r->b), NULL, r);
 
 }
 
@@ -1072,10 +1072,10 @@
 	char tmp[512];
 	g_snprintf(tmp, sizeof(tmp), _("The %s buddy is not present in the network"),
 		   r->b->name);
-	purple_request_action_with_hint(r->client->application, _("Add Buddy"), tmp,
+	purple_request_action(r->client->application, _("Add Buddy"), tmp,
 			      _("To add the buddy you must import his/her public key. "
 				"Press Import to import a public key."), 0,
-			      purple_buddy_get_account(r->b), purple_buddy_get_name(r->b), NULL, PURPLE_REQUEST_UI_HINT_BLIST, r, 2,
+			      purple_buddy_get_account(r->b), purple_buddy_get_name(r->b), NULL, r, 2,
 			      _("Cancel"), G_CALLBACK(silcpurple_add_buddy_ask_pk_cb),
 			      _("_Import..."), G_CALLBACK(silcpurple_add_buddy_ask_pk_cb));
 }
@@ -1182,7 +1182,7 @@
 		silc_free(fingerprint);
 	}
 
-	purple_request_fields_with_hint(r->client->application, _("Add Buddy"),
+	purple_request_fields(r->client->application, _("Add Buddy"),
 			      _("Select correct user"),
 			      r->pubkey_search
 			      ? _("More than one user was found with the same public key. Select "
@@ -1192,7 +1192,7 @@
 			      fields,
 			      _("OK"), G_CALLBACK(silcpurple_add_buddy_select_cb),
 			      _("Cancel"), G_CALLBACK(silcpurple_add_buddy_select_cancel),
-			      purple_buddy_get_account(r->b), purple_buddy_get_name(r->b), NULL, PURPLE_REQUEST_UI_HINT_BLIST, r);
+			      purple_buddy_get_account(r->b), purple_buddy_get_name(r->b), NULL, r);
 }
 
 static void
--- a/libpurple/protocols/silc/chat.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/protocols/silc/chat.c	Sat Nov 17 19:41:05 2007 +0000
@@ -303,10 +303,10 @@
 	f = purple_request_fields_get_field(fields, "list");
 	if (!purple_request_field_list_get_selected(f)) {
 		/* Add new public key */
-		purple_request_file_with_hint(sg->gc, _("Open Public Key..."), NULL, FALSE,
+		purple_request_file(sg->gc, _("Open Public Key..."), NULL, FALSE,
 				    G_CALLBACK(silcpurple_chat_chpk_add),
 				    G_CALLBACK(silcpurple_chat_chpk_cancel),
-				    purple_connection_get_account(sg->gc), NULL, NULL, PURPLE_REQUEST_UI_HINT_CONV, sgc);
+				    purple_connection_get_account(sg->gc), NULL, NULL, sgc);
 		return;
 	}
 
@@ -443,11 +443,11 @@
 	if (!channel_pubkeys || !silc_dlist_count(channel_pubkeys)) {
 		f = purple_request_field_list_new("list", NULL);
 		purple_request_field_group_add_field(g, f);
-		purple_request_fields_with_hint(sg->gc, _("Channel Authentication"),
+		purple_request_fields(sg->gc, _("Channel Authentication"),
 				      _("Channel Authentication"), t, fields,
 				      _("Add / Remove"), G_CALLBACK(silcpurple_chat_chpk_cb),
 				      _("OK"), G_CALLBACK(silcpurple_chat_chauth_ok),
-				      purple_connection_get_account(sg->gc), NULL, NULL, PURPLE_REQUEST_UI_HINT_CONV, sgc);
+				      purple_connection_get_account(sg->gc), NULL, NULL, sgc);
 		if (channel_pubkeys)
 		  silc_dlist_uninit(channel_pubkeys);
 		return;
@@ -480,11 +480,11 @@
 	}
 
 	purple_request_field_list_set_multi_select(f, FALSE);
-	purple_request_fields_with_hint(sg->gc, _("Channel Authentication"),
+	purple_request_fields(sg->gc, _("Channel Authentication"),
 			      _("Channel Authentication"), t, fields,
 			      _("Add / Remove"), G_CALLBACK(silcpurple_chat_chpk_cb),
 			      _("OK"), G_CALLBACK(silcpurple_chat_chauth_ok),
-			      purple_connection_get_account(sg->gc), NULL, NULL, PURPLE_REQUEST_UI_HINT_CONV, sgc);
+			      purple_connection_get_account(sg->gc), NULL, NULL, sgc);
 }
 
 static void
@@ -615,10 +615,10 @@
 	g_snprintf(tmp, sizeof(tmp),
 		   _("Please enter the %s channel private group name and passphrase."),
 		   p->channel);
-	purple_request_fields_with_hint(gc, _("Add Channel Private Group"), NULL, tmp, fields,
+	purple_request_fields(gc, _("Add Channel Private Group"), NULL, tmp, fields,
 			      _("Add"), G_CALLBACK(silcpurple_chat_prv_add),
 			      _("Cancel"), G_CALLBACK(silcpurple_chat_prv_cancel),
-			      purple_connection_get_account(gc), NULL, NULL, PURPLE_REQUEST_UI_HINT_CONV, p);
+			      purple_connection_get_account(gc), NULL, NULL, p);
 }
 
 
@@ -743,12 +743,12 @@
 	s->channel = ch;
 	s->sg = sg;
 	g_snprintf(tmp, sizeof(tmp), "%d", (int)channel->user_limit);
-	purple_request_input_with_hint(gc, _("User Limit"), NULL,
+	purple_request_input(gc, _("User Limit"), NULL,
 			   _("Set user limit on channel. Set to zero to reset user limit."),
 			   tmp, FALSE, FALSE, NULL,
 			   _("OK"), G_CALLBACK(silcpurple_chat_ulimit_cb),
 			   _("Cancel"), G_CALLBACK(silcpurple_chat_ulimit_cb),
-			   purple_connection_get_account(gc), NULL, NULL, PURPLE_REQUEST_UI_HINT_CONV, s);
+			   purple_connection_get_account(gc), NULL, NULL, s);
 }
 
 static void
--- a/libpurple/protocols/silc/ops.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/protocols/silc/ops.c	Sat Nov 17 19:41:05 2007 +0000
@@ -1814,11 +1814,11 @@
 		return;
 	internal->u.ask_pass = completion;
 	internal->context = context;
-	purple_request_input_with_hint(gc, _("Passphrase"), NULL,
+	purple_request_input(gc, _("Passphrase"), NULL,
 			     _("Passphrase required"), NULL, FALSE, TRUE, NULL,
 			     _("OK"), G_CALLBACK(silc_ask_passphrase_cb),
 			     _("Cancel"), G_CALLBACK(silc_ask_passphrase_cb),
-			     purple_connection_get_account(gc), NULL, NULL, PURPLE_REQUEST_UI_HINT_BLIST, internal);
+			     purple_connection_get_account(gc), NULL, NULL, internal);
 }
 
 
--- a/libpurple/protocols/silc/pk.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/protocols/silc/pk.c	Sat Nov 17 19:41:05 2007 +0000
@@ -107,9 +107,9 @@
 		   _("Fingerprint and babbleprint for the %s key are:\n\n"
 		     "%s\n%s\n"), entity, fingerprint, babbleprint);
 
-	purple_request_action_with_hint(gc, _("Verify Public Key"), tmp, tmp2,
+	purple_request_action(gc, _("Verify Public Key"), tmp, tmp2,
 			      PURPLE_DEFAULT_ACTION_NONE,
-			      purple_connection_get_account(gc), entity, NULL, PURPLE_REQUEST_UI_HINT_BLIST, verify, 3,
+			      purple_connection_get_account(gc), entity, NULL, verify, 3,
 			      _("Yes"), G_CALLBACK(silcpurple_verify_cb),
 			      _("No"), G_CALLBACK(silcpurple_verify_cb),
 			      _("_View..."), G_CALLBACK(silcpurple_verify_details));
--- a/libpurple/protocols/silc/silc.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/protocols/silc/silc.c	Sat Nov 17 19:41:05 2007 +0000
@@ -956,7 +956,7 @@
 	purple_request_field_group_add_field(g, f);
 	purple_request_fields_add_group(fields, g);
 
-	purple_request_fields_with_hint(gc, _("User Online Status Attributes"),
+	purple_request_fields(gc, _("User Online Status Attributes"),
 			    _("User Online Status Attributes"),
 			    _("You can let other users see your online status information "
 			      "and your personal information. Please fill the information "
@@ -964,7 +964,7 @@
 			    fields,
 			    _("OK"), G_CALLBACK(silcpurple_attrs_cb),
 			    _("Cancel"), G_CALLBACK(silcpurple_attrs_cancel),
-				gc->account, NULL, NULL, PURPLE_REQUEST_UI_HINT_BLIST, gc);
+				gc->account, NULL, NULL, gc);
 }
 
 static void
@@ -1168,11 +1168,11 @@
 	purple_request_field_group_add_field(g, f);
 	purple_request_fields_add_group(fields, g);
 
-	purple_request_fields_with_hint(gc, _("Create New SILC Key Pair"),
+	purple_request_fields(gc, _("Create New SILC Key Pair"),
 			      _("Create New SILC Key Pair"), NULL, fields,
 			      _("Generate Key Pair"), G_CALLBACK(silcpurple_create_keypair_cb),
 			      _("Cancel"), G_CALLBACK(silcpurple_create_keypair_cancel),
-			      gc->account, NULL, NULL, PURPLE_REQUEST_UI_HINT_BLIST, gc);
+			      gc->account, NULL, NULL, gc);
 
 	g_strfreev(u);
 	silc_free(hostname);
--- a/libpurple/protocols/silc/util.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/protocols/silc/util.c	Sat Nov 17 19:41:05 2007 +0000
@@ -382,10 +382,10 @@
 
 	buf = g_string_free(s, FALSE);
 
-	purple_request_action_with_hint(sg->gc, _("Public Key Information"),
+	purple_request_action(sg->gc, _("Public Key Information"),
 			      _("Public Key Information"),
 			      buf, 0, purple_connection_get_account(sg->gc),
-			      NULL, NULL, PURPLE_REQUEST_UI_HINT_BLIST, context, 1, _("Close"), callback);
+			      NULL, NULL, context, 1, _("Close"), callback);
 
 	g_free(buf);
 	silc_free(fingerprint);
--- a/libpurple/protocols/silc/wb.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/protocols/silc/wb.c	Sat Nov 17 19:41:05 2007 +0000
@@ -303,8 +303,8 @@
 	req->channel = channel;
 	req->sg = sg;
 
-	purple_request_action_with_hint(sender, _("Whiteboard"), tmp, NULL, 1,
-				sg->account, sender->nickname, NULL, PURPLE_REQUEST_UI_HINT_BLIST, req, 2,
+	purple_request_action(gc, _("Whiteboard"), tmp, NULL, 1,
+				sg->account, sender->nickname, NULL, req, 2,
 			    _("Yes"), G_CALLBACK(silcpurple_wb_request_cb),
 			    _("No"), G_CALLBACK(silcpurple_wb_request_cb));
 }
--- a/libpurple/protocols/silc10/buddy.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/protocols/silc10/buddy.c	Sat Nov 17 19:41:05 2007 +0000
@@ -309,9 +309,9 @@
 		a->hostname = strdup(hostname);
 	a->port = port;
 
-	purple_request_action_with_hint(client->application, _("Key Agreement Request"), tmp,
+	purple_request_action(client->application, _("Key Agreement Request"), tmp,
 			    hostname ? tmp2 : NULL, 1, gc->account, client_entry->nickname,
-				NULL, PURPLE_REQUEST_UI_HINT_BLIST, a, 2, _("Yes"), G_CALLBACK(silcpurple_buddy_keyagr_request_cb),
+				NULL, a, 2, _("Yes"), G_CALLBACK(silcpurple_buddy_keyagr_request_cb),
 			    _("No"), G_CALLBACK(silcpurple_buddy_keyagr_request_cb));
 }
 
@@ -462,11 +462,11 @@
 	p->client = sg->client;
 	p->conn = sg->conn;
 	p->client_id = *clients[0]->id;
-	purple_request_input_with_hint(gc, _("IM With Password"), NULL,
+	purple_request_input(gc, _("IM With Password"), NULL,
 	                     _("Set IM Password"), NULL, FALSE, TRUE, NULL,
 	                     _("OK"), G_CALLBACK(silcpurple_buddy_privkey_cb),
 	                     _("Cancel"), G_CALLBACK(silcpurple_buddy_privkey_cb),
-	                     gc->account, NULL, NULL, PURPLE_REQUEST_UI_HINT_BLIST, p);
+	                     gc->account, NULL, NULL, p);
 
 	silc_free(clients);
 	silc_free(nickname);
@@ -1067,10 +1067,10 @@
 	}
 
 	/* Open file selector to select the public key. */
-	purple_request_file_with_hint(r->client->application, _("Open..."), NULL, FALSE,
+	purple_request_file(r->client->application, _("Open..."), NULL, FALSE,
 			  G_CALLBACK(silcpurple_add_buddy_ask_import),
 			  G_CALLBACK(silcpurple_add_buddy_ask_pk_cancel),
-			  purple_buddy_get_account(r->b), purple_buddy_get_name(r->b), NULL, PURPLE_REQUEST_UI_HINT_BLIST, r);
+			  purple_buddy_get_account(r->b), purple_buddy_get_name(r->b), NULL, r);
 
 }
 
@@ -1080,10 +1080,10 @@
 	char tmp[512];
 	g_snprintf(tmp, sizeof(tmp), _("The %s buddy is not present in the network"),
 		   r->b->name);
-	purple_request_action_with_hint(r->client->application, _("Add Buddy"), tmp,
+	purple_request_action(r->client->application, _("Add Buddy"), tmp,
 			    _("To add the buddy you must import his/her public key. "
 			      "Press Import to import a public key."), 0,
-				  purple_buddy_get_account(r->b), purple_buddy_get_name(r->b), NULL, PURPLE_REQUEST_UI_HINT_BLIST, r, 2,
+				  purple_buddy_get_account(r->b), purple_buddy_get_name(r->b), NULL, r, 2,
 			    _("Cancel"), G_CALLBACK(silcpurple_add_buddy_ask_pk_cb),
 			    _("_Import..."), G_CALLBACK(silcpurple_add_buddy_ask_pk_cb));
 }
@@ -1180,7 +1180,7 @@
 		silc_free(fingerprint);
 	}
 
-	purple_request_fields_with_hint(r->client->application, _("Add Buddy"),
+	purple_request_fields(r->client->application, _("Add Buddy"),
 				_("Select correct user"),
 				r->pubkey_search
 					? _("More than one user was found with the same public key. Select "
@@ -1190,7 +1190,7 @@
 				fields,
 				_("OK"), G_CALLBACK(silcpurple_add_buddy_select_cb),
 				_("Cancel"), G_CALLBACK(silcpurple_add_buddy_select_cancel),
-				purple_buddy_get_account(r->b), purple_buddy_get_name(r->b), NULL, PURPLE_REQUEST_UI_HINT_BLIST, r);
+				purple_buddy_get_account(r->b), purple_buddy_get_name(r->b), NULL, r);
 }
 
 static void
--- a/libpurple/protocols/silc10/chat.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/protocols/silc10/chat.c	Sat Nov 17 19:41:05 2007 +0000
@@ -288,10 +288,10 @@
 	f = purple_request_fields_get_field(fields, "list");
 	if (!purple_request_field_list_get_selected(f)) {
 		/* Add new public key */
-		purple_request_file_with_hint(sg->gc, _("Open Public Key..."), NULL, FALSE,
+		purple_request_file(sg->gc, _("Open Public Key..."), NULL, FALSE,
 				  G_CALLBACK(silcpurple_chat_chpk_add),
 				  G_CALLBACK(silcpurple_chat_chpk_cancel),
-				  purple_connection_get_account(sg->gc), NULL, NULL, PURPLE_REQUEST_UI_HINT_CONV, sgc);
+				  purple_connection_get_account(sg->gc), NULL, NULL, sgc);
 		return;
 	}
 
@@ -419,11 +419,11 @@
 	if (!channel_pubkeys) {
 		f = purple_request_field_list_new("list", NULL);
 		purple_request_field_group_add_field(g, f);
-		purple_request_fields_with_hint(sg->gc, _("Channel Authentication"),
+		purple_request_fields(sg->gc, _("Channel Authentication"),
 				    _("Channel Authentication"), t, fields,
 				    _("Add / Remove"), G_CALLBACK(silcpurple_chat_chpk_cb),
 				    _("OK"), G_CALLBACK(silcpurple_chat_chauth_ok),
-					purple_connection_get_account(sg->gc), NULL, NULL, PURPLE_REQUEST_UI_HINT_CONV, sgc);
+					purple_connection_get_account(sg->gc), NULL, NULL, sgc);
 		return;
 	}
 	sgc->pubkeys = silc_buffer_copy(channel_pubkeys);
@@ -458,11 +458,11 @@
 	}
 
 	purple_request_field_list_set_multi_select(f, FALSE);
-	purple_request_fields_with_hint(sg->gc, _("Channel Authentication"),
+	purple_request_fields(sg->gc, _("Channel Authentication"),
 			    _("Channel Authentication"), t, fields,
 			    _("Add / Remove"), G_CALLBACK(silcpurple_chat_chpk_cb),
 			    _("OK"), G_CALLBACK(silcpurple_chat_chauth_ok),
-				purple_connection_get_account(sg->gc), NULL, NULL, PURPLE_REQUEST_UI_HINT_CONV, sgc);
+				purple_connection_get_account(sg->gc), NULL, NULL, sgc);
 
 	silc_argument_payload_free(chpks);
 }
@@ -595,10 +595,10 @@
 	g_snprintf(tmp, sizeof(tmp),
 		   _("Please enter the %s channel private group name and passphrase."),
 		   p->channel);
-	purple_request_fields_with_hint(gc, _("Add Channel Private Group"), NULL, tmp, fields,
+	purple_request_fields(gc, _("Add Channel Private Group"), NULL, tmp, fields,
 			    _("Add"), G_CALLBACK(silcpurple_chat_prv_add),
 			    _("Cancel"), G_CALLBACK(silcpurple_chat_prv_cancel),
-				purple_connection_get_account(gc), NULL, NULL, PURPLE_REQUEST_UI_HINT_CONV, p);
+				purple_connection_get_account(gc), NULL, NULL, p);
 }
 
 
@@ -723,12 +723,12 @@
 	s->channel = ch;
 	s->sg = sg;
 	g_snprintf(tmp, sizeof(tmp), "%d", (int)channel->user_limit);
-	purple_request_input_with_hint(gc, _("User Limit"), NULL,
+	purple_request_input(gc, _("User Limit"), NULL,
 			   _("Set user limit on channel. Set to zero to reset user limit."),
 			   tmp, FALSE, FALSE, NULL,
 			   _("OK"), G_CALLBACK(silcpurple_chat_ulimit_cb),
 			   _("Cancel"), G_CALLBACK(silcpurple_chat_ulimit_cb),
-			   purple_connection_get_account(gc), NULL, NULL, PURPLE_REQUEST_UI_HINT_CONV, s);
+			   purple_connection_get_account(gc), NULL, NULL, s);
 }
 
 static void
--- a/libpurple/protocols/silc10/ops.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/protocols/silc10/ops.c	Sat Nov 17 19:41:05 2007 +0000
@@ -1291,9 +1291,9 @@
 
 #if 0 /* XXX for now, let's not show attrs here */
 			if (client_entry->attrs)
-				purple_request_action_with_hint(gc, _("User Information"),
+				purple_request_action(gc, _("User Information"),
 						_("User Information"),
-						buf, 1, PURPLE_REQUEST_UI_HINT_BLIST, client_entry, 2,
+						buf, 1, client_entry, 2,
 						_("OK"), G_CALLBACK(silcpurple_whois_more),
 						_("_More..."), G_CALLBACK(silcpurple_whois_more), gc->account, NULL, NULL);
 			else
@@ -1898,11 +1898,11 @@
 		return;
 	internal->completion = completion;
 	internal->context = context;
-	purple_request_input_with_hint(gc, _("Passphrase"), NULL,
+	purple_request_input(gc, _("Passphrase"), NULL,
 			   _("Passphrase required"), NULL, FALSE, TRUE, NULL,
 			   _("OK"), G_CALLBACK(silc_ask_passphrase_cb),
 			   _("Cancel"), G_CALLBACK(silc_ask_passphrase_cb),
-			   purple_connection_get_account(gc), NULL, NULL, PURPLE_REQUEST_UI_HINT_BLIST, internal);
+			   purple_connection_get_account(gc), NULL, NULL, internal);
 }
 
 
--- a/libpurple/protocols/silc10/pk.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/protocols/silc10/pk.c	Sat Nov 17 19:41:05 2007 +0000
@@ -113,9 +113,9 @@
 		   _("Fingerprint and babbleprint for the %s key are:\n\n"
 		     "%s\n%s\n"), entity, fingerprint, babbleprint);
 
-	purple_request_action_with_hint(gc, _("Verify Public Key"), tmp, tmp2,
+	purple_request_action(gc, _("Verify Public Key"), tmp, tmp2,
 						PURPLE_DEFAULT_ACTION_NONE,
-						purple_connection_get_account(gc), entity, NULL, PURPLE_REQUEST_UI_HINT_BLIST, verify, 3,
+						purple_connection_get_account(gc), entity, NULL, verify, 3,
 			    _("Yes"), G_CALLBACK(silcpurple_verify_cb),
 			    _("No"), G_CALLBACK(silcpurple_verify_cb),
 			    _("_View..."), G_CALLBACK(silcpurple_verify_details));
--- a/libpurple/protocols/silc10/silc.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/protocols/silc10/silc.c	Sat Nov 17 19:41:05 2007 +0000
@@ -726,7 +726,7 @@
 	purple_request_field_group_add_field(g, f);
 	purple_request_fields_add_group(fields, g);
 
-	purple_request_fields_with_hint(gc, _("User Online Status Attributes"),
+	purple_request_fields(gc, _("User Online Status Attributes"),
 			    _("User Online Status Attributes"),
 			    _("You can let other users see your online status information "
 			      "and your personal information. Please fill the information "
@@ -734,7 +734,7 @@
 			    fields,
 			    _("OK"), G_CALLBACK(silcpurple_attrs_cb),
 			    _("Cancel"), G_CALLBACK(silcpurple_attrs_cancel),
-				gc->account, NULL, NULL, PURPLE_REQUEST_UI_HINT_BLIST, gc);
+				gc->account, NULL, NULL, gc);
 }
 
 static void
@@ -936,14 +936,11 @@
 	purple_request_field_group_add_field(g, f);
 	purple_request_fields_add_group(fields, g);
 
-	purple_request_fields_with_hint(gc, _("Create New SILC Key Pair"),
-	                                _("Create New SILC Key Pair"), NULL,
-	                                fields, _("Generate Key Pair"),
-	                                G_CALLBACK(silcpurple_create_keypair_cb),
-	                                _("Cancel"),
-                                        G_CALLBACK(silcpurple_create_keypair_cancel),
-	                                gc->account, NULL, NULL,
-                                        PURPLE_REQUEST_UI_HINT_BLIST, gc);
+	purple_request_fields(gc, _("Create New SILC Key Pair"),
+			    _("Create New SILC Key Pair"), NULL, fields,
+			    _("Generate Key Pair"), G_CALLBACK(silcpurple_create_keypair_cb),
+			    _("Cancel"), G_CALLBACK(silcpurple_create_keypair_cancel),
+				gc->account, NULL, NULL, gc);
 
 	g_strfreev(u);
 	silc_free(hostname);
--- a/libpurple/protocols/silc10/util.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/protocols/silc10/util.c	Sat Nov 17 19:41:05 2007 +0000
@@ -371,10 +371,10 @@
 
 	buf = g_string_free(s, FALSE);
 
-	purple_request_action_with_hint(sg->gc, _("Public Key Information"),
+	purple_request_action(sg->gc, _("Public Key Information"),
 			    _("Public Key Information"),
 			    buf, 0, purple_connection_get_account(sg->gc),
-				NULL, NULL, context, PURPLE_REQUEST_UI_HINT_BLIST, 1, _("Close"), callback);
+				NULL, NULL, context, 1, _("Close"), callback);
 
 	g_free(buf);
 	silc_free(fingerprint);
--- a/libpurple/protocols/silc10/wb.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/protocols/silc10/wb.c	Sat Nov 17 19:41:05 2007 +0000
@@ -302,8 +302,8 @@
 	req->channel = channel;
 	req->sg = sg;
 
-	purple_request_action_with_hint(sender, _("Whiteboard"), tmp, NULL, 1,
-				sg->account, sender->nickname, NULL, PURPLE_REQUEST_UI_HINT_CONV, req, 2,
+	purple_request_action(sender, _("Whiteboard"), tmp, NULL, 1,
+				sg->account, sender->nickname, NULL, req, 2,
 			    _("Yes"), G_CALLBACK(silcpurple_wb_request_cb),
 			    _("No"), G_CALLBACK(silcpurple_wb_request_cb));
 }
--- a/libpurple/protocols/toc/toc.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/protocols/toc/toc.c	Sat Nov 17 19:41:05 2007 +0000
@@ -2216,8 +2216,8 @@
 		g_snprintf(buf, sizeof(buf), _("%s requests you to send them a file"), ft->user);
 	}
 
-	purple_request_accept_cancel_with_hint(ft->gc, NULL, buf, NULL, 
-							   PURPLE_DEFAULT_ACTION_NONE, PURPLE_REQUEST_UI_HINT_XFER, ft,
+	purple_request_accept_cancel(ft->gc, NULL, buf, NULL, 
+							   PURPLE_DEFAULT_ACTION_NONE, ft,
 							   G_CALLBACK(toc_accept_ft),
 							   G_CALLBACK(toc_reject_ft));
 }
--- a/libpurple/protocols/yahoo/yahoo.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/protocols/yahoo/yahoo.c	Sat Nov 17 19:41:05 2007 +0000
@@ -902,12 +902,12 @@
 			PurpleBuddy *buddy;
 			PurpleAccount *account;
 			PurpleConversation *c;
-			char *username, *str;
-
-			str = NULL;
+			char *username;
 
 			account = purple_connection_get_account(gc);
-			c = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, im->from);
+			c = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, im->from, account);
+			if (c == NULL)
+				c = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, im->from);
 
 			if ((buddy = purple_find_buddy(account, im->from)) != NULL)
 				username = g_markup_escape_text(purple_buddy_get_alias(buddy), -1);
@@ -917,7 +917,6 @@
 			serv_got_attention(gc, username, YAHOO_BUZZ);
 
 			g_free(username);
-			g_free(str);
 			g_free(m);
 			g_free(im);
 			continue;
@@ -1028,12 +1027,12 @@
 static void
 yahoo_buddy_add_deny_reason_cb(gpointer data) {
 	struct yahoo_add_request *add_req = data;
-	purple_request_input_with_hint(add_req->gc, NULL, _("Authorization denied message:"),
+	purple_request_input(add_req->gc, NULL, _("Authorization denied message:"),
 			NULL, _("No reason given."), TRUE, FALSE, NULL,
 			_("OK"), G_CALLBACK(yahoo_buddy_add_deny_cb),
 			_("Cancel"), G_CALLBACK(yahoo_buddy_add_deny_noreason_cb),
 			purple_connection_get_account(add_req->gc), add_req->who, NULL,
-			PURPLE_REQUEST_UI_HINT_BLIST, add_req);
+			add_req);
 }
 
 static void yahoo_buddy_denied_our_add(PurpleConnection *gc, const char *who, const char *reason)
@@ -2065,9 +2064,9 @@
 		g_snprintf(buf, sizeof(buf), _("You have tried to ignore %s, but the "
 					"user is on your buddy list.  Clicking \"Yes\" "
 					"will remove and ignore the buddy."), who);
-		purple_request_yes_no_with_hint(gc, NULL, _("Ignore buddy?"), buf, 0,
+		purple_request_yes_no(gc, NULL, _("Ignore buddy?"), buf, 0,
 						gc->account, who, NULL,
-						PURPLE_REQUEST_UI_HINT_BLIST, b,
+						b,
 						G_CALLBACK(ignore_buddy),
 						G_CALLBACK(keep_buddy));
 		break;
@@ -2097,7 +2096,7 @@
 
 		if (pair->key == 66)
 			err = strtol(pair->value, NULL, 10);
-		if (pair->key == 20)
+		else if (pair->key == 20)
 			url = pair->value;
 
 		l = l->next;
@@ -3503,23 +3502,23 @@
 static void yahoo_show_act_id(PurplePluginAction *action)
 {
 	PurpleConnection *gc = (PurpleConnection *) action->context;
-	purple_request_input_with_hint(gc, NULL, _("Activate which ID?"), NULL,
+	purple_request_input(gc, NULL, _("Activate which ID?"), NULL,
 					   purple_connection_get_display_name(gc), FALSE, FALSE, NULL,
 					   _("OK"), G_CALLBACK(yahoo_act_id),
 					   _("Cancel"), NULL,
 					   purple_connection_get_account(gc), NULL, NULL,
-					   PURPLE_REQUEST_UI_HINT_ACCOUNT, gc);
+					   gc);
 }
 
 static void yahoo_show_chat_goto(PurplePluginAction *action)
 {
 	PurpleConnection *gc = (PurpleConnection *) action->context;
-	purple_request_input_with_hint(gc, NULL, _("Join who in chat?"), NULL,
+	purple_request_input(gc, NULL, _("Join whom in chat?"), NULL,
 					   "", FALSE, FALSE, NULL,
 					   _("OK"), G_CALLBACK(yahoo_chat_goto),
 					   _("Cancel"), NULL,
 					   purple_connection_get_account(gc), NULL, NULL,
-					   PURPLE_REQUEST_UI_HINT_CONV, gc);
+					   gc);
 }
 
 static GList *yahoo_actions(PurplePlugin *plugin, gpointer context) {
--- a/libpurple/request.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/request.c	Sat Nov 17 19:41:05 2007 +0000
@@ -377,13 +377,6 @@
 		g_hash_table_destroy(field->u.list.item_data);
 		g_hash_table_destroy(field->u.list.selected_table);
 	}
-	else if (field->type == PURPLE_REQUEST_FIELD_BLIST)
-	{
-		if (field->u.blist.default_nodes)
-			g_list_free(field->u.blist.default_nodes);
-		if (field->u.blist.selecteds)
-			g_list_free(field->u.blist.selecteds);
-	}
 
 	g_free(field);
 }
@@ -1140,85 +1133,6 @@
 
 /* -- */
 
-PurpleRequestField *purple_request_field_blist_nodes_new(const char *id,
-		const char *text, PurpleRequestBlistFlags flags, GList *selected)
-{
-	PurpleRequestField *field;
-
-	g_return_val_if_fail(id   != NULL, NULL);
-	g_return_val_if_fail(text != NULL, NULL);
-
-	field = purple_request_field_new(id, text, PURPLE_REQUEST_FIELD_BLIST);
-
-	field->u.blist.flags = flags;
-	field->u.blist.default_nodes = selected;
-	purple_request_field_blist_set_selection_list(field, selected);
-
-	return field;
-}
-
-PurpleFilterBlistFunc
-purple_request_field_blist_set_filter(PurpleRequestField *field, PurpleFilterBlistFunc filter)
-{
-	PurpleFilterBlistFunc old;
-	g_return_val_if_fail(field != NULL, NULL);
-	g_return_val_if_fail(field->type == PURPLE_REQUEST_FIELD_BLIST, NULL);
-	old = field->u.blist.filter;
-	field->u.blist.filter = filter;
-	return old;
-}
-
-PurpleFilterBlistFunc
-purple_request_field_blist_get_filter(const PurpleRequestField *field)
-{
-	g_return_val_if_fail(field != NULL, NULL);
-	g_return_val_if_fail(field->type == PURPLE_REQUEST_FIELD_BLIST, NULL);
-	return field->u.blist.filter;
-}
-
-GList *purple_request_field_blist_get_selection_list(const PurpleRequestField *field)
-{
-	g_return_val_if_fail(field != NULL, NULL);
-	g_return_val_if_fail(field->type == PURPLE_REQUEST_FIELD_BLIST, NULL);
-	return field->u.blist.selecteds;
-}
-
-gboolean purple_request_field_blist_add(PurpleRequestField *field, PurpleBlistNode *node)
-{
-	g_return_val_if_fail(field != NULL, FALSE);
-	g_return_val_if_fail(field->type == PURPLE_REQUEST_FIELD_BLIST, FALSE);
-	if (!g_list_find(field->u.blist.selecteds, node)) {
-		field->u.blist.selecteds = g_list_append(field->u.blist.selecteds, node);
-		return TRUE;
-	} else {
-		return FALSE;
-	}
-}
-
-gboolean purple_request_field_blist_remove(PurpleRequestField *field, PurpleBlistNode *node)
-{
-	GList *search;
-	g_return_val_if_fail(field != NULL, FALSE);
-	g_return_val_if_fail(field->type == PURPLE_REQUEST_FIELD_BLIST, FALSE);
-	if ((search = g_list_find(field->u.blist.selecteds, node)) != NULL) {
-		field->u.blist.selecteds = g_list_delete_link(field->u.blist.selecteds, search);
-		return TRUE;
-	} else {
-		return FALSE;
-	}
-}
-
-void purple_request_field_blist_set_selection_list(PurpleRequestField *field, GList *selecteds)
-{
-	g_return_if_fail(field != NULL);
-	g_return_if_fail(field->type == PURPLE_REQUEST_FIELD_BLIST);
-	if (field->u.blist.selecteds)
-		g_list_free(field->u.blist.selecteds);
-	field->u.blist.selecteds = selecteds;
-}
-
-/* -- */
-
 void *
 purple_request_input(void *handle, const char *title, const char *primary,
 				   const char *secondary, const char *default_value,
@@ -1228,20 +1142,6 @@
 				   PurpleAccount *account, const char *who, PurpleConversation *conv,
 				   void *user_data)
 {
-	return purple_request_input_with_hint(
-		handle, title, primary, secondary, default_value, multiline, masked, hint, ok_text, ok_cb,
-		cancel_text, cancel_cb, account, who, conv, PURPLE_REQUEST_UI_HINT_BLIST, user_data);
-}
-
-void *
-purple_request_input_with_hint(void *handle, const char *title, const char *primary,
-				   const char *secondary, const char *default_value,
-				   gboolean multiline, gboolean masked, gchar *hint,
-				   const char *ok_text, GCallback ok_cb,
-				   const char *cancel_text, GCallback cancel_cb,
-				   PurpleAccount *account, const char *who, PurpleConversation *conv,
-				   const char *ui_hint, void *user_data)
-{
 	PurpleRequestUiOps *ops;
 
 	g_return_val_if_fail(ok_text != NULL, NULL);
@@ -1261,7 +1161,7 @@
 											 ok_text, ok_cb,
 											 cancel_text, cancel_cb,
 											 account, who, conv,
-											 ui_hint, user_data);
+											 user_data);
 
 		handles = g_list_append(handles, info);
 
@@ -1286,34 +1186,10 @@
 	g_return_val_if_fail(ok_cb   != NULL,  NULL);
 
 	va_start(args, user_data);
-	ui_handle = purple_request_choice_varg_with_hint(handle, title, primary, secondary,
+	ui_handle = purple_request_choice_varg(handle, title, primary, secondary,
 					     default_value, ok_text, ok_cb,
 					     cancel_text, cancel_cb,
-					     account, who, conv, PURPLE_REQUEST_UI_HINT_BLIST, user_data, args);
-	va_end(args);
-
-	return ui_handle;
-}
-
-void *
-purple_request_choice_with_hint(void *handle, const char *title, const char *primary,
-					const char *secondary, int default_value,
-					const char *ok_text, GCallback ok_cb,
-					const char *cancel_text, GCallback cancel_cb,
-					PurpleAccount *account, const char *who, PurpleConversation *conv,
-					const char *ui_hint, void *user_data, ...)
-{
-	void *ui_handle;
-	va_list args;
-
-	g_return_val_if_fail(ok_text != NULL,  NULL);
-	g_return_val_if_fail(ok_cb   != NULL,  NULL);
-
-	va_start(args, user_data);
-	ui_handle = purple_request_choice_varg_with_hint(handle, title, primary, secondary,
-					     default_value, ok_text, ok_cb,
-					     cancel_text, cancel_cb,
-					     account, who, conv, ui_hint, user_data, args);
+					     account, who, conv, user_data, args);
 	va_end(args);
 
 	return ui_handle;
@@ -1328,20 +1204,6 @@
 			 PurpleAccount *account, const char *who, PurpleConversation *conv,
 			 void *user_data, va_list choices)
 {
-	return purple_request_choice_varg_with_hint(
-		handle, title, primary, secondary, default_value, ok_text, ok_cb,
-		cancel_text, cancel_cb, account, who, conv, PURPLE_REQUEST_UI_HINT_BLIST, user_data, choices);
-}
-
-void *
-purple_request_choice_varg_with_hint(void *handle, const char *title,
-			 const char *primary, const char *secondary,
-			 int default_value,
-			 const char *ok_text, GCallback ok_cb,
-			 const char *cancel_text, GCallback cancel_cb,
-			 PurpleAccount *account, const char *who, PurpleConversation *conv,
-			 const char *ui_hint, void *user_data, va_list choices)
-{
 	PurpleRequestUiOps *ops;
 
 	g_return_val_if_fail(ok_text != NULL,  NULL);
@@ -1360,7 +1222,7 @@
 						      ok_text, ok_cb,
 						      cancel_text, cancel_cb,
 							  account, who, conv,
-						      ui_hint, user_data, choices);
+						      user_data, choices);
 
 		handles = g_list_append(handles, info);
 
@@ -1382,29 +1244,9 @@
 	g_return_val_if_fail(action_count > 0, NULL);
 
 	va_start(args, action_count);
-	ui_handle = purple_request_action_varg_with_hint(handle, title, primary, secondary,
+	ui_handle = purple_request_action_varg(handle, title, primary, secondary,
 										 default_action, account, who, conv,
-										 PURPLE_REQUEST_UI_HINT_BLIST, user_data, action_count, args);
-	va_end(args);
-
-	return ui_handle;
-}
-
-void *
-purple_request_action_with_hint(void *handle, const char *title, const char *primary,
-					const char *secondary, int default_action,
-					PurpleAccount *account, const char *who, PurpleConversation *conv,
-					const char *ui_hint, void *user_data, size_t action_count, ...)
-{
-	void *ui_handle;
-	va_list args;
-
-	g_return_val_if_fail(action_count > 0, NULL);
-
-	va_start(args, action_count);
-	ui_handle = purple_request_action_varg_with_hint(handle, title, primary, secondary,
-										 default_action, account, who, conv,
-										 ui_hint, user_data, action_count, args);
+										 user_data, action_count, args);
 	va_end(args);
 
 	return ui_handle;
@@ -1415,19 +1257,7 @@
 						 const char *primary, const char *secondary,
 						 int default_action,
 						 PurpleAccount *account, const char *who, PurpleConversation *conv,
-						 void *user_data, size_t action_count, va_list actions)
-{
-	return purple_request_action_varg_with_hint(
-		handle, title, primary, secondary, default_action, account, who, conv,
-		PURPLE_REQUEST_UI_HINT_BLIST, user_data, action_count, actions);
-}
-
-void *
-purple_request_action_varg_with_hint(void *handle, const char *title,
-						 const char *primary, const char *secondary,
-						 int default_action,
-						 PurpleAccount *account, const char *who, PurpleConversation *conv,
-						 const char *ui_hint, void *user_data, size_t action_count, va_list actions)
+						  void *user_data, size_t action_count, va_list actions)
 {
 	PurpleRequestUiOps *ops;
 
@@ -1443,7 +1273,7 @@
 		info->handle    = handle;
 		info->ui_handle = ops->request_action(title, primary, secondary,
 											  default_action, account, who, conv,
-											  ui_hint, user_data, action_count, actions);
+											  user_data, action_count, actions);
 
 		handles = g_list_append(handles, info);
 
@@ -1461,19 +1291,6 @@
 					PurpleAccount *account, const char *who, PurpleConversation *conv,
 					void *user_data)
 {
-	return purple_request_fields_with_hint(
-		handle, title, primary, secondary, fields, ok_text, ok_cb,
-		cancel_text, cancel_cb, account, who, conv, PURPLE_REQUEST_UI_HINT_BLIST, user_data);
-}
-
-void *
-purple_request_fields_with_hint(void *handle, const char *title, const char *primary,
-					const char *secondary, PurpleRequestFields *fields,
-					const char *ok_text, GCallback ok_cb,
-					const char *cancel_text, GCallback cancel_cb,
-					PurpleAccount *account, const char *who, PurpleConversation *conv,
-					const char *ui_hint, void *user_data)
-{
 	PurpleRequestUiOps *ops;
 
 	g_return_val_if_fail(fields  != NULL, NULL);
@@ -1492,7 +1309,7 @@
 											  fields, ok_text, ok_cb,
 											  cancel_text, cancel_cb,
 											  account, who, conv,
-											  ui_hint, user_data);
+											  user_data);
 
 		handles = g_list_append(handles, info);
 
@@ -1509,17 +1326,6 @@
 				  PurpleAccount *account, const char *who, PurpleConversation *conv,
 				  void *user_data)
 {
-	return purple_request_file_with_hint(
-		handle, title, filename, savedialog, ok_cb, cancel_cb, account, who, conv, PURPLE_REQUEST_UI_HINT_BLIST, user_data);
-}
-
-void *
-purple_request_file_with_hint(void *handle, const char *title, const char *filename,
-				  gboolean savedialog,
-				  GCallback ok_cb, GCallback cancel_cb,
-				  PurpleAccount *account, const char *who, PurpleConversation *conv,
-				  const char *ui_hint, void *user_data)
-{
 	PurpleRequestUiOps *ops;
 
 	ops = purple_request_get_ui_ops();
@@ -1532,7 +1338,7 @@
 		info->handle    = handle;
 		info->ui_handle = ops->request_file(title, filename, savedialog,
 											ok_cb, cancel_cb,
-											account, who, conv, ui_hint, user_data);
+											account, who, conv, user_data);
 		handles = g_list_append(handles, info);
 		return info->ui_handle;
 	}
@@ -1546,16 +1352,6 @@
 				  PurpleAccount *account, const char *who, PurpleConversation *conv,
 				  void *user_data)
 {
-	return purple_request_folder_with_hint(
-		handle, title, dirname, ok_cb, cancel_cb, account, who, conv, PURPLE_REQUEST_UI_HINT_BLIST, user_data);
-}
-
-void *
-purple_request_folder_with_hint(void *handle, const char *title, const char *dirname,
-				  GCallback ok_cb, GCallback cancel_cb,
-				  PurpleAccount *account, const char *who, PurpleConversation *conv,
-				  const char *ui_hint, void *user_data)
-{
 	PurpleRequestUiOps *ops;
 
 	ops = purple_request_get_ui_ops();
@@ -1569,7 +1365,7 @@
 		info->ui_handle = ops->request_folder(title, dirname,
 											ok_cb, cancel_cb,
 											account, who, conv,
-											ui_hint, user_data);
+											user_data);
 		handles = g_list_append(handles, info);
 		return info->ui_handle;
 	}
--- a/libpurple/request.h	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/request.h	Sat Nov 17 19:41:05 2007 +0000
@@ -61,8 +61,7 @@
 	PURPLE_REQUEST_FIELD_LIST,
 	PURPLE_REQUEST_FIELD_LABEL,
 	PURPLE_REQUEST_FIELD_IMAGE,
-	PURPLE_REQUEST_FIELD_ACCOUNT,
-	PURPLE_REQUEST_FIELD_BLIST,
+	PURPLE_REQUEST_FIELD_ACCOUNT
 
 } PurpleRequestFieldType;
 
@@ -95,17 +94,6 @@
 } PurpleRequestFieldGroup;
 
 /**
- * Flags that can be used for Buddylist Fields.
- */
-typedef enum
-{
-	PURPLE_REQUEST_BLIST_FLAG_BUDDY         = 0x01,  /**< Include buddies in the list. */
-	PURPLE_REQUEST_BLIST_FLAG_CHAT          = 0x02,  /**< Include chats in the list. */
-	PURPLE_REQUEST_BLIST_FLAG_GROUP         = 0x04,  /**< Include groups in the list. */
-	PURPLE_REQUEST_BLIST_FLAG_ALLOW_OFFLINE = 0x08,  /**< Include offline buddies in the list. */
-} PurpleRequestBlistFlags;
-
-/**
  * A request field.
  */
 typedef struct
@@ -184,91 +172,12 @@
 			gsize size;
 		} image;
 
-		struct
-		{
-			GList *default_nodes;
-			PurpleRequestBlistFlags flags;
-			GList *selecteds;
-			PurpleFilterBlistFunc filter;
-		} blist;
-
 	} u;
 
 	void *ui_data;
 
 } PurpleRequestField;
 
-/*
- * UI hints for the request functions.  These are used by libpurple.
- */
-
-/**
- * @since 2.3.0
- */
-#define PURPLE_REQUEST_UI_HINT_ACCOUNT  "account"
-
-/**
- * @since 2.3.0
- */
-#define PURPLE_REQUEST_UI_HINT_BLIST    "blist"
-
-/**
- * @since 2.3.0
- */
-#define PURPLE_REQUEST_UI_HINT_BUDDY    "buddy"
-
-/**
- * @since 2.3.0
- */
-#define PURPLE_REQUEST_UI_HINT_CONV     "conversation"
-
-/**
- * @since 2.3.0
- */
-#define PURPLE_REQUEST_UI_HINT_REGISTER "register-account"
-
-/**
- * @since 2.3.0
- */
-#define PURPLE_REQUEST_UI_HINT_XFER     "xfer"
-
-
-/*
- * UI hints for the request functions.  These are common hints used by UIs.
- * UIs can still define any hints they like, but standardization is good.
- */
-
-/**
- * @since 2.3.0
- */
-#define PURPLE_REQUEST_UI_HINT_ACCOUNTMGR "accountmgr"
-
-/**
- * @since 2.3.0
- */
-#define PURPLE_REQUEST_UI_HINT_CERTMGR    "certmgr"
-
-/**
- * @since 2.3.0
- */
-#define PURPLE_REQUEST_UI_HINT_PLUGINMGR  "pluginmgr"
-
-/**
- * @since 2.3.0
- */
-#define PURPLE_REQUEST_UI_HINT_POUNCEMGR  "pouncemgr"
-
-/**
- * @since 2.3.0
- */
-#define PURPLE_REQUEST_UI_HINT_PREFSMGR   "preferences"
-
-/**
- * @since 2.3.0
- */
-#define PURPLE_REQUEST_UI_HINT_STATUSMGR  "statusmgr"
-
-
 /**
  * Request UI operations.
  */
@@ -280,33 +189,33 @@
 						   const char *ok_text, GCallback ok_cb,
 						   const char *cancel_text, GCallback cancel_cb,
 						   PurpleAccount *account, const char *who, PurpleConversation *conv,
-						   const char *ui_hint, void *user_data);
+						   void *user_data);
 	void *(*request_choice)(const char *title, const char *primary,
 							const char *secondary, int default_value,
 							const char *ok_text, GCallback ok_cb,
 							const char *cancel_text, GCallback cancel_cb,
 							PurpleAccount *account, const char *who, PurpleConversation *conv,
-							const char *ui_hint, void *user_data, va_list choices);
+							void *user_data, va_list choices);
 	void *(*request_action)(const char *title, const char *primary,
 							const char *secondary, int default_action,
 							PurpleAccount *account, const char *who, PurpleConversation *conv,
-							const char *ui_hint, void *user_data, size_t action_count,
+							void *user_data, size_t action_count,
 							va_list actions);
 	void *(*request_fields)(const char *title, const char *primary,
 							const char *secondary, PurpleRequestFields *fields,
 							const char *ok_text, GCallback ok_cb,
 							const char *cancel_text, GCallback cancel_cb,
 							PurpleAccount *account, const char *who, PurpleConversation *conv,
-							const char *ui_hint, void *user_data);
+							void *user_data);
 	void *(*request_file)(const char *title, const char *filename,
 						  gboolean savedialog, GCallback ok_cb, GCallback cancel_cb,
 						  PurpleAccount *account, const char *who, PurpleConversation *conv,
-						  const char *ui_hint, void *user_data);
+						  void *user_data);
 	void (*close_request)(PurpleRequestType type, void *ui_handle);
 	void *(*request_folder)(const char *title, const char *dirname,
 							GCallback ok_cb, GCallback cancel_cb,
 							PurpleAccount *account, const char *who, PurpleConversation *conv,
-							const char *ui_hint, void *user_data);
+							void *user_data);
 
 	void (*_purple_reserved1)(void);
 	void (*_purple_reserved2)(void);
@@ -1242,98 +1151,6 @@
 /*@}*/
 
 /**************************************************************************/
-/** @name Buddylist Field API                                             */
-/**************************************************************************/
-/*@{*/
-
-/**
- * Creates a buddylist field.
- *
- * @param id       The field ID.
- * @param text     The label for the field.
- * @param flag     Flags dictating what kind of blist nodes should be
- *                 included in the request field.
- * @param selected A list of PurpleBlistNode's to select by default, or @c NULL.
- *
- * @return  The new field.
- *
- * @since 2.3.0
- */
-PurpleRequestField *purple_request_field_blist_nodes_new(const char *id, const char *text,
-		PurpleRequestBlistFlags flag, GList *selected);
-
-/**
- * Set a filter for the request field.
- *
- * @param field   The request field.
- * @param filter  The filter function.
- *
- * @return  The old filter function, or @c NULL if there was none.
- *
- * @since 2.3.0
- */
-PurpleFilterBlistFunc purple_request_field_blist_set_filter(PurpleRequestField *field, PurpleFilterBlistFunc filter);
-
-/**
- * Get the filter function for the request field.
- *
- * @param field  The request field.
- *
- * @return  The filter function, or @c NULL if there isn't any.
- *
- * @since 2.3.0
- */
-PurpleFilterBlistFunc purple_request_field_blist_get_filter(const PurpleRequestField *field);
-
-/**
- * Add a PurpleBlistNode to the selected list.
- *
- * @param field  The request field.
- * @param node   The buddylist node to add to the list.
- *
- * @return  @c TRUE if the node is added to the list, @c FALSE if it was already in the list.
- *
- * @since 2.3.0
- */
-gboolean purple_request_field_blist_add(PurpleRequestField *field, PurpleBlistNode *node);
-
-/**
- * Remove a PurpleBlistNode from the selected list.
- *
- * @param field   The request field.
- * @param node    The buddylist node to remove from the list.
- *
- * @return @c TRUE if the node is removed from the list, @c FALSE if the node is not in the list.
- *
- * @since 2.3.0
- */
-gboolean purple_request_field_blist_remove(PurpleRequestField *field, PurpleBlistNode *node);
-
-/**
- * Set the list of selected nodes in the request field.
- *
- * @param field      The request field.
- * @param selecteds  The list of selected PurpleBlistNode's. Note that the request field
- *                   becomes the owner of the list, and so the caller should not modify it.
- *
- * @since 2.3.0
- */
-void purple_request_field_blist_set_selection_list(PurpleRequestField *field, GList *selecteds);
-
-/**
- * Get a list of the selected buddylist nodes.
- *
- * @param field  The request field.
- *
- * @return A GList of PurpleBlistNode's.
- *
- * @since 2.3.0
- */
-GList *purple_request_field_blist_get_selection_list(const PurpleRequestField *field);
-
-/*@}*/
-
-/**************************************************************************/
 /** @name Request API                                                     */
 /**************************************************************************/
 /*@{*/
@@ -1370,60 +1187,9 @@
  * @param account		The PurpleAccount associated with this request, or NULL if none is
  * @param who			The username of the buddy assocaited with this request, or NULL if none is
  * @param conv			The PurpleConversation associated with this request, or NULL if none is
- * @param ui_hint       UI hint
  * @param user_data     The data to pass to the callback.
  *
  * @return A UI-specific handle.
- *
- * @since 2.3.0
- */
-void *purple_request_input_with_hint(void *handle, const char *title,
-						 const char *primary, const char *secondary,
-						 const char *default_value,
-						 gboolean multiline, gboolean masked, gchar *hint,
-						 const char *ok_text, GCallback ok_cb,
-						 const char *cancel_text, GCallback cancel_cb,
-						 PurpleAccount *account, const char *who, PurpleConversation *conv,
-						 const char *ui_hint, void *user_data);
-
-#ifndef PURPLE_DISABLE_DEPRECATED
-/**
- * Prompts the user for text input.
- *
- * @param handle        The plugin or connection handle.  For some
- *                      things this is EXTREMELY important.  The
- *                      handle is used to programmatically close
- *                      the request dialog when it is no longer
- *                      needed.  For PRPLs this is often a pointer
- *                      to the PurpleConnection instance.  For plugins
- *                      this should be a similar, unique memory
- *                      location.  This value is important because
- *                      it allows a request to be closed, say, when
- *                      you sign offline.  If the request is NOT
- *                      closed it is VERY likely to cause a crash
- *                      whenever the callback handler functions are
- *                      triggered.
- * @param title         The title of the message.
- * @param primary       The main point of the message.
- * @param secondary     The secondary information.
- * @param default_value The default value.
- * @param multiline     TRUE if the inputted text can span multiple lines.
- * @param masked        TRUE if the inputted text should be masked in some way.
- * @param hint          Optionally suggest how the input box should appear.
- *                      Use "html," for example, to allow the user to enter
- *                      HTML.
- * @param ok_text       The text for the @c OK button.
- * @param ok_cb         The callback for the @c OK button.
- * @param cancel_text   The text for the @c Cancel button.
- * @param cancel_cb     The callback for the @c Cancel button.
- * @param account		The PurpleAccount associated with this request, or NULL if none is
- * @param who			The username of the buddy assocaited with this request, or NULL if none is
- * @param conv			The PurpleConversation associated with this request, or NULL if none is
- * @param user_data     The data to pass to the callback.
- *
- * @return A UI-specific handle.
- *
- * @deprecated Please use purple_request_input_with_hint() instead.
  */
 void *purple_request_input(void *handle, const char *title,
 						 const char *primary, const char *secondary,
@@ -1433,7 +1199,6 @@
 						 const char *cancel_text, GCallback cancel_cb,
 						 PurpleAccount *account, const char *who, PurpleConversation *conv,
 						 void *user_data);
-#endif
 
 /**
  * Prompts the user for multiple-choice input.
@@ -1452,48 +1217,11 @@
  * @param account		The PurpleAccount associated with this request, or NULL if none is
  * @param who			The username of the buddy assocaited with this request, or NULL if none is
  * @param conv			The PurpleConversation associated with this request, or NULL if none is
- * @param ui_hint       UI hint
- * @param user_data     The data to pass to the callback.
- * @param ...           The choices.  This argument list should be
- *                      terminated with a NULL parameter.
- *
- * @return A UI-specific handle.
- *
- * @since 2.3.0
- */
-void *purple_request_choice_with_hint(void *handle, const char *title,
-						  const char *primary, const char *secondary,
-						  int default_value,
-						  const char *ok_text, GCallback ok_cb,
-						  const char *cancel_text, GCallback cancel_cb,
-						  PurpleAccount *account, const char *who, PurpleConversation *conv,
-						  const char *ui_hint, void *user_data, ...) G_GNUC_NULL_TERMINATED;
-
-#ifndef PURPLE_DISABLE_DEPRECATED
-/**
- * Prompts the user for multiple-choice input.
- *
- * @param handle        The plugin or connection handle.  For some
- *                      things this is EXTREMELY important.  See
- *                      the comments on purple_request_input.
- * @param title         The title of the message.
- * @param primary       The main point of the message.
- * @param secondary     The secondary information.
- * @param default_value The default value.
- * @param ok_text       The text for the @c OK button.
- * @param ok_cb         The callback for the @c OK button.
- * @param cancel_text   The text for the @c Cancel button.
- * @param cancel_cb     The callback for the @c Cancel button.
- * @param account		The PurpleAccount associated with this request, or NULL if none is
- * @param who			The username of the buddy assocaited with this request, or NULL if none is
- * @param conv			The PurpleConversation associated with this request, or NULL if none is
  * @param user_data     The data to pass to the callback.
  * @param ...           The choices.  This argument list should be
  *                      terminated with a NULL parameter.
  *
  * @return A UI-specific handle.
- *
- * @deprecated Please use purple_request_choice_with_hint() instead.
  */
 void *purple_request_choice(void *handle, const char *title,
 						  const char *primary, const char *secondary,
@@ -1502,7 +1230,6 @@
 						  const char *cancel_text, GCallback cancel_cb,
 						  PurpleAccount *account, const char *who, PurpleConversation *conv,
 						  void *user_data, ...) G_GNUC_NULL_TERMINATED;
-#endif
 
 /**
  * Prompts the user for multiple-choice input.
@@ -1521,48 +1248,11 @@
  * @param account		The PurpleAccount associated with this request, or NULL if none is
  * @param who			The username of the buddy assocaited with this request, or NULL if none is
  * @param conv			The PurpleConversation associated with this request, or NULL if none is
- * @param ui_hint       UI hint
- * @param user_data     The data to pass to the callback.
- * @param choices       The choices.  This argument list should be
- *                      terminated with a @c NULL parameter.
- *
- * @return A UI-specific handle.
- *
- * @since 2.3.0
- */
-void *purple_request_choice_varg_with_hint(void *handle, const char *title,
-							   const char *primary, const char *secondary,
-							   int default_value,
-							   const char *ok_text, GCallback ok_cb,
-							   const char *cancel_text, GCallback cancel_cb,
-							   PurpleAccount *account, const char *who, PurpleConversation *conv,
-							   const char *ui_hint, void *user_data, va_list choices);
-
-#ifndef PURPLE_DISABLE_DEPRECATED
-/**
- * Prompts the user for multiple-choice input.
- *
- * @param handle        The plugin or connection handle.  For some
- *                      things this is EXTREMELY important.  See
- *                      the comments on purple_request_input.
- * @param title         The title of the message.
- * @param primary       The main point of the message.
- * @param secondary     The secondary information.
- * @param default_value The default value.
- * @param ok_text       The text for the @c OK button.
- * @param ok_cb         The callback for the @c OK button.
- * @param cancel_text   The text for the @c Cancel button.
- * @param cancel_cb     The callback for the @c Cancel button.
- * @param account		The PurpleAccount associated with this request, or NULL if none is
- * @param who			The username of the buddy assocaited with this request, or NULL if none is
- * @param conv			The PurpleConversation associated with this request, or NULL if none is
  * @param user_data     The data to pass to the callback.
  * @param choices       The choices.  This argument list should be
  *                      terminated with a @c NULL parameter.
  *
  * @return A UI-specific handle.
- *
- * @deprecated Please use purple_request_choice_varg_with_hint() instead.
  */
 void *purple_request_choice_varg(void *handle, const char *title,
 							   const char *primary, const char *secondary,
@@ -1571,7 +1261,6 @@
 							   const char *cancel_text, GCallback cancel_cb,
 							   PurpleAccount *account, const char *who, PurpleConversation *conv,
 							   void *user_data, va_list choices);
-#endif
 
 /**
  * Prompts the user for an action.
@@ -1588,43 +1277,6 @@
  * @param account		 The PurpleAccount associated with this request, or NULL if none is
  * @param who			 The username of the buddy assocaited with this request, or NULL if none is
  * @param conv			 The PurpleConversation associated with this request, or NULL if none is
- * @param ui_hint        UI hint
- * @param user_data      The data to pass to the callback.
- * @param action_count   The number of actions.
- * @param ...            A list of actions.  These are pairs of
- *                       arguments.  The first of each pair is the
- *                       string that appears on the button.  It should
- *                       have an underscore before the letter you want
- *                       to use as the accelerator key for the button.
- *                       The second of each pair is the callback
- *                       function to use when the button is clicked.
- *
- * @return A UI-specific handle.
- *
- * @since 2.3.0
- */
-void *purple_request_action_with_hint(void *handle, const char *title,
-						  const char *primary, const char *secondary,
-						  int default_action,
-						  PurpleAccount *account, const char *who, PurpleConversation *conv,
-						  const char *ui_hint, void *user_data, size_t action_count, ...);
-
-#ifndef PURPLE_DISABLE_DEPRECATED
-/**
- * Prompts the user for an action.
- *
- * This is often represented as a dialog with a button for each action.
- *
- * @param handle         The plugin or connection handle.  For some
- *                       things this is EXTREMELY important.  See
- *                       the comments on purple_request_input.
- * @param title          The title of the message.
- * @param primary        The main point of the message.
- * @param secondary      The secondary information.
- * @param default_action The default value.
- * @param account		 The PurpleAccount associated with this request, or NULL if none is
- * @param who			 The username of the buddy assocaited with this request, or NULL if none is
- * @param conv			 The PurpleConversation associated with this request, or NULL if none is
  * @param user_data      The data to pass to the callback.
  * @param action_count   The number of actions.
  * @param ...            A list of actions.  These are pairs of
@@ -1636,15 +1288,12 @@
  *                       function to use when the button is clicked.
  *
  * @return A UI-specific handle.
- *
- * @deprecated Please use purple_request_action_with_hint() instead.
  */
 void *purple_request_action(void *handle, const char *title,
 						  const char *primary, const char *secondary,
 						  int default_action,
 						  PurpleAccount *account, const char *who, PurpleConversation *conv,
 						  void *user_data, size_t action_count, ...);
-#endif
 
 /**
  * Prompts the user for an action.
@@ -1661,45 +1310,11 @@
  * @param account		 The PurpleAccount associated with this request, or NULL if none is
  * @param who			 The username of the buddy assocaited with this request, or NULL if none is
  * @param conv			 The PurpleConversation associated with this request, or NULL if none is
- * @param ui_hint        UI hint
- * @param user_data      The data to pass to the callback.
- * @param action_count   The number of actions.
- * @param actions        A list of actions and callbacks.
- *
- * @return A UI-specific handle.
- *
- * @since 2.3.0
- */
-void *purple_request_action_varg_with_hint(void *handle, const char *title,
-							   const char *primary, const char *secondary,
-							   int default_action,
-							   PurpleAccount *account, const char *who, PurpleConversation *conv,
-							   const char *ui_hint, void *user_data, size_t action_count,
-							   va_list actions);
-
-#ifndef PURPLE_DISABLE_DEPRECATED
-/**
- * Prompts the user for an action.
- *
- * This is often represented as a dialog with a button for each action.
- *
- * @param handle         The plugin or connection handle.  For some
- *                       things this is EXTREMELY important.  See
- *                       the comments on purple_request_input.
- * @param title          The title of the message.
- * @param primary        The main point of the message.
- * @param secondary      The secondary information.
- * @param default_action The default value.
- * @param account		 The PurpleAccount associated with this request, or NULL if none is
- * @param who			 The username of the buddy assocaited with this request, or NULL if none is
- * @param conv			 The PurpleConversation associated with this request, or NULL if none is
  * @param user_data      The data to pass to the callback.
  * @param action_count   The number of actions.
  * @param actions        A list of actions and callbacks.
  *
  * @return A UI-specific handle.
- *
- * @deprecated Please use purple_request_action_varg_with_hint() instead.
  */
 void *purple_request_action_varg(void *handle, const char *title,
 							   const char *primary, const char *secondary,
@@ -1707,7 +1322,6 @@
 							   PurpleAccount *account, const char *who, PurpleConversation *conv,
 							   void *user_data, size_t action_count,
 							   va_list actions);
-#endif
 
 /**
  * Displays groups of fields for the user to fill in.
@@ -1726,44 +1340,9 @@
  * @param account	  The PurpleAccount associated with this request, or NULL if none is
  * @param who		  The username of the buddy associated with this request, or NULL if none is
  * @param conv		  The PurpleConversation associated with this request, or NULL if none is
- * @param ui_hint     UI hint
- * @param user_data   The data to pass to the callback.
- *
- * @return A UI-specific handle.
- *
- * @since 2.3.0
- */
-void *purple_request_fields_with_hint(void *handle, const char *title,
-						  const char *primary, const char *secondary,
-						  PurpleRequestFields *fields,
-						  const char *ok_text, GCallback ok_cb,
-						  const char *cancel_text, GCallback cancel_cb,
-						  PurpleAccount *account, const char *who, PurpleConversation *conv,
-						  const char *ui_hint, void *user_data);
-
-#ifndef PURPLE_DISABLE_DEPRECATED
-/**
- * Displays groups of fields for the user to fill in.
- *
- * @param handle      The plugin or connection handle.  For some
- *                    things this is EXTREMELY important.  See
- *                    the comments on purple_request_input.
- * @param title       The title of the message.
- * @param primary     The main point of the message.
- * @param secondary   The secondary information.
- * @param fields      The list of fields.
- * @param ok_text     The text for the @c OK button.
- * @param ok_cb       The callback for the @c OK button.
- * @param cancel_text The text for the @c Cancel button.
- * @param cancel_cb   The callback for the @c Cancel button.
- * @param account	  The PurpleAccount associated with this request, or NULL if none is
- * @param who		  The username of the buddy associated with this request, or NULL if none is
- * @param conv		  The PurpleConversation associated with this request, or NULL if none is
  * @param user_data   The data to pass to the callback.
  *
  * @return A UI-specific handle.
- *
- * @deprecated Please use purple_request_fields_with_hint() instead.
  */
 void *purple_request_fields(void *handle, const char *title,
 						  const char *primary, const char *secondary,
@@ -1772,7 +1351,6 @@
 						  const char *cancel_text, GCallback cancel_cb,
 						  PurpleAccount *account, const char *who, PurpleConversation *conv,
 						  void *user_data);
-#endif
 
 /**
  * Closes a request.
@@ -1791,21 +1369,6 @@
 
 /**
  * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
- *
- * @since 2.3.0
- */
-#define purple_request_yes_no_with_hint(handle, title, primary, secondary, \
-							default_action, account, who, conv, \
-							ui_hint, user_data, yes_cb, no_cb) \
-	purple_request_action_with_hint((handle), (title), (primary), (secondary), \
-						(default_action), account, who, conv, (ui_hint), (user_data), 2, \
-						_("_Yes"), (yes_cb), _("_No"), (no_cb))
-
-#ifndef PURPLE_DISABLE_DEPRECATED
-/**
- * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
- *
- * @deprecated Please use purple_request_yes_no_with_hint instead.
  */
 #define purple_request_yes_no(handle, title, primary, secondary, \
 							default_action, account, who, conv, \
@@ -1813,25 +1376,9 @@
 	purple_request_action((handle), (title), (primary), (secondary), \
 						(default_action), account, who, conv, (user_data), 2, \
 						_("_Yes"), (yes_cb), _("_No"), (no_cb))
-#endif
 
 /**
  * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
- *
- * @since 2.3.0
- */
-#define purple_request_ok_cancel_with_hint(handle, title, primary, secondary, \
-							default_action, account, who, conv, \
-						    ui_hint, user_data, ok_cb, cancel_cb) \
-	purple_request_action_with_hint((handle), (title), (primary), (secondary), \
-						(default_action), account, who, conv, (ui_hint), (user_data), 2, \
-						_("_OK"), (ok_cb), _("_Cancel"), (cancel_cb))
-
-#ifndef PURPLE_DISABLE_DEPRECATED
-/**
- * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
- *
- * @deprecated Please use purple_request_ok_cancel_with_hint instead.
  */
 #define purple_request_ok_cancel(handle, title, primary, secondary, \
 							default_action, account, who, conv, \
@@ -1839,25 +1386,9 @@
 	purple_request_action((handle), (title), (primary), (secondary), \
 						(default_action), account, who, conv, (user_data), 2, \
 						_("_OK"), (ok_cb), _("_Cancel"), (cancel_cb))
-#endif
 
 /**
  * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
- *
- * @since 2.3.0
- */
-#define purple_request_accept_cancel_with_hint(handle, title, primary, secondary, \
-								   default_action, account, who, conv, \
-								   ui_hint, user_data, accept_cb, cancel_cb) \
-	purple_request_action_with_hint((handle), (title), (primary), (secondary), \
-						(default_action), account, who, conv, (ui_hint), (user_data), 2, \
-						_("_Accept"), (accept_cb), _("_Cancel"), (cancel_cb))
-
-#ifndef PURPLE_DISABLE_DEPRECATED
-/**
- * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
- *
- * @deprecated Please use purple_request_accept_cancel_with_hint instead.
  */
 #define purple_request_accept_cancel(handle, title, primary, secondary, \
 								   default_action, account, who, conv, \
@@ -1865,7 +1396,6 @@
 	purple_request_action((handle), (title), (primary), (secondary), \
 						(default_action), account, who, conv, (user_data), 2, \
 						_("_Accept"), (accept_cb), _("_Cancel"), (cancel_cb))
-#endif
 
 /**
  * Displays a file selector request dialog.  Returns the selected filename to
@@ -1883,48 +1413,15 @@
  * @param account	  The PurpleAccount associated with this request, or NULL if none is
  * @param who		  The username of the buddy assocaited with this request, or NULL if none is
  * @param conv		  The PurpleConversation associated with this request, or NULL if none is
- * @param ui_hint     UI hint
- * @param user_data   The data to pass to the callback.
- *
- * @return A UI-specific handle.
- *
- * @since 2.3.0
- */
-void *purple_request_file_with_hint(void *handle, const char *title, const char *filename,
-						gboolean savedialog,
-						GCallback ok_cb, GCallback cancel_cb,
-						PurpleAccount *account, const char *who, PurpleConversation *conv,
-						const char *ui_hint, void *user_data);
-
-#ifndef PURPLE_DISABLE_DEPRECATED
-/**
- * Displays a file selector request dialog.  Returns the selected filename to
- * the callback.  Can be used for either opening a file or saving a file.
- *
- * @param handle      The plugin or connection handle.  For some
- *                    things this is EXTREMELY important.  See
- *                    the comments on purple_request_input.
- * @param title       The title for the dialog (may be @c NULL)
- * @param filename    The default filename (may be @c NULL)
- * @param savedialog  True if this dialog is being used to save a file.
- *                    False if it is being used to open a file.
- * @param ok_cb       The callback for the @c OK button.
- * @param cancel_cb   The callback for the @c Cancel button.
- * @param account	  The PurpleAccount associated with this request, or NULL if none is
- * @param who		  The username of the buddy assocaited with this request, or NULL if none is
- * @param conv		  The PurpleConversation associated with this request, or NULL if none is
  * @param user_data   The data to pass to the callback.
  *
  * @return A UI-specific handle.
- *
- * @deprecated Please use purple_request_file_with_hint() instead.
  */
 void *purple_request_file(void *handle, const char *title, const char *filename,
 						gboolean savedialog,
 						GCallback ok_cb, GCallback cancel_cb,
 						PurpleAccount *account, const char *who, PurpleConversation *conv,
 						void *user_data);
-#endif
 
 /**
  * Displays a folder select dialog. Returns the selected filename to
@@ -1940,44 +1437,14 @@
  * @param account	  The PurpleAccount associated with this request, or NULL if none is
  * @param who		  The username of the buddy assocaited with this request, or NULL if none is
  * @param conv		  The PurpleConversation associated with this request, or NULL if none is
- * @param ui_hint     UI hint
- * @param user_data   The data to pass to the callback.
- *
- * @return A UI-specific handle.
- *
- * @since 2.3.0
- */
-void *purple_request_folder_with_hint(void *handle, const char *title, const char *dirname,
-						GCallback ok_cb, GCallback cancel_cb,
-						PurpleAccount *account, const char *who, PurpleConversation *conv,
-						const char *ui_hint, void *user_data);
-
-#ifndef PURPLE_DISABLE_DEPRECATED
-/**
- * Displays a folder select dialog. Returns the selected filename to
- * the callback.
- *
- * @param handle      The plugin or connection handle.  For some
- *                    things this is EXTREMELY important.  See
- *                    the comments on purple_request_input.
- * @param title       The title for the dialog (may be @c NULL)
- * @param dirname     The default directory name (may be @c NULL)
- * @param ok_cb       The callback for the @c OK button.
- * @param cancel_cb   The callback for the @c Cancel button.
- * @param account	  The PurpleAccount associated with this request, or NULL if none is
- * @param who		  The username of the buddy assocaited with this request, or NULL if none is
- * @param conv		  The PurpleConversation associated with this request, or NULL if none is
  * @param user_data   The data to pass to the callback.
  *
  * @return A UI-specific handle.
- *
- * @deprecated Please use purple_request_folder_with_hint() instead.
  */
 void *purple_request_folder(void *handle, const char *title, const char *dirname,
 						GCallback ok_cb, GCallback cancel_cb,
 						PurpleAccount *account, const char *who, PurpleConversation *conv,
 						void *user_data);
-#endif
 
 /*@}*/
 
--- a/libpurple/server.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/server.c	Sat Nov 17 19:41:05 2007 +0000
@@ -799,9 +799,9 @@
 				   who, purple_account_get_username(account), name);
 
 
-		purple_request_accept_cancel_with_hint(gc, NULL, _("Accept chat invitation?"), buf2,
+		purple_request_accept_cancel(gc, NULL, _("Accept chat invitation?"), buf2,
 							   PURPLE_DEFAULT_ACTION_NONE, account, who, NULL,
-							   "chat", cid, G_CALLBACK(chat_invite_accept),
+							   cid, G_CALLBACK(chat_invite_accept),
 							   G_CALLBACK(chat_invite_reject));
 	}
 	else if (plugin_return > 0)
--- a/libpurple/signals.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/signals.c	Sat Nov 17 19:41:05 2007 +0000
@@ -450,6 +450,13 @@
 	instance_data =
 		(PurpleInstanceData *)g_hash_table_lookup(instance_table, instance);
 
+	if (instance_data == NULL)
+	{
+		purple_debug(PURPLE_DEBUG_ERROR, "signals",
+					 "Instance data for %s not found!\n", signal);
+		return;
+	}
+	
 	g_return_if_fail(instance_data != NULL);
 
 	signal_data =
--- a/libpurple/win32/libc_interface.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/win32/libc_interface.c	Sat Nov 17 19:41:05 2007 +0000
@@ -300,7 +300,9 @@
 		return errbuf;
 	}
 	else
-		return g_strerror( errornum );
+		/* Nothing is supposed to modify what is returned by strerror,
+		   but it isn't const for some reason */
+		return (char *)g_strerror( errornum );
 }
 
 /* unistd.h */
--- a/libpurple/win32/targets.mak	Sat Nov 17 18:26:03 2007 +0000
+++ b/libpurple/win32/targets.mak	Sat Nov 17 19:41:05 2007 +0000
@@ -9,7 +9,7 @@
 	sed -e 's/@VERSION@/$(PIDGIN_VERSION)/; s/@DISPLAY_VERSION@/$(DISPLAY_VERSION)/' $@.mingw > $@
 
 $(PURPLE_PURPLE_H): $(PURPLE_PURPLE_H).in
-	sed -e 's/@PLUGINS_DEFINE@/#define PURPLE_PLUGINS 1/; $@.in > $@
+	sed -e 's/@PLUGINS_DEFINE@/#define PURPLE_PLUGINS 1/' $@.in > $@
 
 $(PURPLE_VERSION_H): $(PURPLE_VERSION_H).in $(PIDGIN_TREE_TOP)/configure.ac
 	cp $@.in $@
--- a/pidgin/Makefile.am	Sat Nov 17 18:26:03 2007 +0000
+++ b/pidgin/Makefile.am	Sat Nov 17 19:41:05 2007 +0000
@@ -206,6 +206,7 @@
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
 	-I$(top_builddir)/libpurple \
 	-I$(top_srcdir)/libpurple/ \
+	-I$(top_builddir) \
 	-I$(top_srcdir) \
 	$(GLIB_CFLAGS) \
 	$(GSTREAMER_CFLAGS) \
--- a/pidgin/gtkaccount.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/pidgin/gtkaccount.c	Sat Nov 17 19:41:05 2007 +0000
@@ -1906,9 +1906,9 @@
 							  purple_account_get_username(account));
 
 		purple_request_close_with_handle(account);
-		purple_request_action_with_hint(account, NULL, buf, NULL, 0,
+		purple_request_action(account, NULL, buf, NULL, 0,
 							account, NULL, NULL,
-							PURPLE_REQUEST_UI_HINT_ACCOUNTMGR, account, 2,
+							account, 2,
 							_("Delete"), delete_account_cb,
 							_("Cancel"), NULL);
 		g_free(buf);
--- a/pidgin/gtkblist.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/pidgin/gtkblist.c	Sat Nov 17 19:41:05 2007 +0000
@@ -541,9 +541,9 @@
 	if (i > 1)
 	{
 		char *msg = g_strdup_printf(ngettext("You have %d contact named %s. Would you like to merge them?", "You currently have %d contacts named %s. Would you like to merge them?", i), i, alias);
-		purple_request_action_with_hint(NULL, NULL, msg, _("Merging these contacts will cause them to share a single entry on the buddy list and use a single conversation window. "
+		purple_request_action(NULL, NULL, msg, _("Merging these contacts will cause them to share a single entry on the buddy list and use a single conversation window. "
 							 "You can separate them again by choosing 'Expand' from the contact's context menu"), 0, NULL, NULL, NULL,
-				      PURPLE_REQUEST_UI_HINT_BLIST, merges, 2, _("_Merge"), PURPLE_CALLBACK(gtk_blist_do_personize), _("_Cancel"), PURPLE_CALLBACK(g_list_free));
+				      merges, 2, _("_Merge"), PURPLE_CALLBACK(gtk_blist_do_personize), _("_Cancel"), PURPLE_CALLBACK(g_list_free));
 		g_free(msg);
 	} else
 		g_list_free(merges);
@@ -638,7 +638,7 @@
 
 static void gtk_blist_menu_bp_cb(GtkWidget *w, PurpleBuddy *b)
 {
-	pidgin_pounce_editor_show_with_parent(GTK_WINDOW(gtkblist->window), b->account, b->name, NULL);
+	pidgin_pounce_editor_show(b->account, b->name, NULL);
 }
 
 static void gtk_blist_menu_showlog_cb(GtkWidget *w, PurpleBlistNode *node)
@@ -664,7 +664,7 @@
 			name = prpl_info->get_chat_name(c->components);
 		}
 	} else if (PURPLE_BLIST_NODE_IS_CONTACT(node)) {
-		pidgin_log_show_contact_with_parent(GTK_WINDOW(gtkblist->window), (PurpleContact *)node);
+		pidgin_log_show_contact((PurpleContact *)node);
 		pidgin_clear_cursor(gtkblist->window);
 		return;
 	} else {
@@ -676,7 +676,7 @@
 	}
 
 	if (name && account) {
-		pidgin_log_show_with_parent(GTK_WINDOW(gtkblist->window), type, name, account);
+		pidgin_log_show(type, name, account);
 		g_free(name);
 
 		pidgin_clear_cursor(gtkblist->window);
@@ -703,6 +703,11 @@
 	pidgin_blist_update(purple_get_blist(), node);
 }
 
+static void gtk_blist_show_systemlog_cb()
+{
+	pidgin_syslog_show();
+}
+
 static void gtk_blist_show_onlinehelp_cb()
 {
 	purple_notify_uri(NULL, PURPLE_WEBSITE "documentation");
@@ -3079,20 +3084,6 @@
 			!purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/debug/enabled"));
 }
 
-static void (*show_with_parent_funcs[5])(GtkWindow *parent) = 
-{
-	NULL,
-	pidgin_pounces_manager_show_with_parent,
-	pidgin_plugin_dialog_show_with_parent,
-	pidgin_syslog_show_with_parent,
-	pidgin_dialogs_about_with_parent
-};
-
-static void
-pidgin_blist_show_with_parent(gpointer data1, gint show_with_parent_idx, gpointer data3)
-{
-	show_with_parent_funcs[show_with_parent_idx](GTK_WINDOW(gtkblist->window));
-}
 
 /***************************************************
  *            Crap                                 *
@@ -3126,15 +3117,15 @@
 
 	/* Tools */
 	{ N_("/_Tools"), NULL, NULL, 0, "<Branch>", NULL },
-	{ N_("/Tools/Buddy _Pounces"), NULL, pidgin_blist_show_with_parent, 1, "<Item>", NULL },
+	{ N_("/Tools/Buddy _Pounces"), NULL, pidgin_pounces_manager_show, 1, "<Item>", NULL },
 	{ N_("/Tools/_Certificates"), NULL, pidgin_certmgr_show, 0, "<Item>", NULL },
-	{ N_("/Tools/Plu_gins"), "<CTL>U", pidgin_blist_show_with_parent, 2, "<StockItem>", PIDGIN_STOCK_TOOLBAR_PLUGINS },
+	{ N_("/Tools/Plu_gins"), "<CTL>U", pidgin_plugin_dialog_show, 2, "<StockItem>", PIDGIN_STOCK_TOOLBAR_PLUGINS },
 	{ N_("/Tools/Pr_eferences"), "<CTL>P", pidgin_prefs_show, 0, "<StockItem>", GTK_STOCK_PREFERENCES },
 	{ N_("/Tools/Pr_ivacy"), NULL, pidgin_privacy_dialog_show, 0, "<Item>", NULL },
 	{ "/Tools/sep2", NULL, NULL, 0, "<Separator>", NULL },
 	{ N_("/Tools/_File Transfers"), "<CTL>T", pidgin_xfer_dialog_show, 0, "<Item>", NULL },
 	{ N_("/Tools/R_oom List"), NULL, pidgin_roomlist_dialog_show, 0, "<Item>", NULL },
-	{ N_("/Tools/System _Log"), NULL, pidgin_blist_show_with_parent, 3, "<Item>", NULL },
+	{ N_("/Tools/System _Log"), NULL, gtk_blist_show_systemlog_cb, 3, "<Item>", NULL },
 	{ "/Tools/sep3", NULL, NULL, 0, "<Separator>", NULL },
 	{ N_("/Tools/Mute _Sounds"), "<CTL>S", pidgin_blist_mute_sounds_cb, 0, "<CheckItem>", NULL },
 	/* Help */
@@ -3142,9 +3133,9 @@
 	{ N_("/Help/Online _Help"), "F1", gtk_blist_show_onlinehelp_cb, 0, "<StockItem>", GTK_STOCK_HELP },
 	{ N_("/Help/_Debug Window"), NULL, toggle_debug, 0, "<Item>", NULL },
 #if GTK_CHECK_VERSION(2,6,0)
-	{ N_("/Help/_About"), NULL, pidgin_blist_show_with_parent, 4, "<StockItem>", GTK_STOCK_ABOUT },
+	{ N_("/Help/_About"), NULL, pidgin_dialogs_about, 4,  "<StockItem>", GTK_STOCK_ABOUT },
 #else
-	{ N_("/Help/_About"), NULL, pidgin_blist_show_with_parent, 4, "<Item>", NULL },
+	{ N_("/Help/_About"), NULL, pidgin_dialogs_about, 4,  "<Item>", NULL },
 #endif
 };
 
@@ -5315,7 +5306,6 @@
 	purple_prefs_connect_callback(handle, PIDGIN_PREFS_ROOT "/sound/method",
 			pidgin_blist_sound_method_pref_cb, NULL);
 
-
 	/* Setup some purple signal handlers. */
 
 	handle = purple_accounts_get_handle();
@@ -6671,13 +6661,13 @@
 static void
 pidgin_blist_request_add_group(void)
 {
-	purple_request_input_with_hint(NULL, _("Add Group"), NULL,
+	purple_request_input(NULL, _("Add Group"), NULL,
 					   _("Please enter the name of the group to be added."),
 					   NULL, FALSE, FALSE, NULL,
 					   _("Add"), G_CALLBACK(add_group_cb),
 					   _("Cancel"), NULL,
 					   NULL, NULL, NULL,
-					   PURPLE_REQUEST_UI_HINT_BLIST, NULL);
+					   NULL);
 }
 
 void
--- a/pidgin/gtkcertmgr.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/pidgin/gtkcertmgr.c	Sat Nov 17 19:41:05 2007 +0000
@@ -184,7 +184,7 @@
 		   if the window gets closed unusually, such as by handle
 		   deletion */
 		/* TODO: Display some more information on the certificate? */
-		purple_request_input_with_hint(tpm_dat,
+		purple_request_input(tpm_dat,
 				     _("Certificate Import"),
 				     _("Specify a hostname"),
 				     _("Type the host name this certificate is for."),
@@ -197,7 +197,7 @@
 				     _("Cancel"),
 				     G_CALLBACK(tls_peers_mgmt_import_cancel2_cb),
 				     NULL, NULL, NULL, /* No account/who/conv*/
-				     PURPLE_REQUEST_UI_HINT_CERTMGR, crt    /* Pass cert instance to callback*/
+				     crt    /* Pass cert instance to callback*/
 				     );
 		
 		g_free(default_hostname);
@@ -220,13 +220,13 @@
 tls_peers_mgmt_import_cb(GtkWidget *button, gpointer data)
 {
 	/* TODO: need to tell the user that we want a .PEM file! */
-	purple_request_file_with_hint(tpm_dat,
+	purple_request_file(tpm_dat,
 			    _("Select a PEM certificate"),
 			    "certificate.pem",
 			    FALSE, /* Not a save dialog */
 			    G_CALLBACK(tls_peers_mgmt_import_ok_cb),
 			    NULL,  /* Do nothing if cancelled */
-			    NULL, NULL, NULL, PURPLE_REQUEST_UI_HINT_CERTMGR, NULL );/* No account,conv,etc. */
+			    NULL, NULL, NULL, NULL );/* No account,conv,etc. */
 }
 
 static void
@@ -295,14 +295,14 @@
 
 	
 	/* TODO: inform user that it will be a PEM? */
-	purple_request_file_with_hint(tpm_dat,
+	purple_request_file(tpm_dat,
 			    _("PEM X.509 Certificate Export"),
 			    "certificate.pem",
 			    TRUE, /* Is a save dialog */
 			    G_CALLBACK(tls_peers_mgmt_export_ok_cb),
 			    G_CALLBACK(tls_peers_mgmt_export_cancel_cb),
 			    NULL, NULL, NULL, /* No account,conv,etc. */
-			    PURPLE_REQUEST_UI_HINT_CERTMGR, crt); /* Pass the certificate on to the callback */
+			    crt); /* Pass the certificate on to the callback */
 }
 
 static void
@@ -371,11 +371,10 @@
 		primary = g_strdup_printf(
 			_("Really delete certificate for %s?"), id );
 		
-		purple_request_yes_no_with_hint(tpm_dat, _("Confirm certificate delete"),
+		purple_request_yes_no(tpm_dat, _("Confirm certificate delete"),
 				      primary, NULL, /* Can this be NULL? */
 				      2, /* NO is default action */
 				      NULL, NULL, NULL,
-				      PURPLE_REQUEST_UI_HINT_CERTMGR,
 				      id, /* id ownership passed to callback */
 				      tls_peers_mgmt_delete_confirm_cb,
 				      tls_peers_mgmt_delete_confirm_cb );
--- a/pidgin/gtkconv.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/pidgin/gtkconv.c	Sat Nov 17 19:41:05 2007 +0000
@@ -1030,11 +1030,11 @@
 		if (*c == '/' || *c == '\\')
 			*c = ' ';
 	}
-	purple_request_file_with_hint(PIDGIN_CONVERSATION(conv), _("Save Conversation"),
+	purple_request_file(PIDGIN_CONVERSATION(conv), _("Save Conversation"),
 					  buf,
 					  TRUE, G_CALLBACK(savelog_writefile_cb), NULL,
 					  NULL, NULL, conv,
-					  PURPLE_REQUEST_UI_HINT_BLIST, conv);
+					  conv);
 
 	g_free(buf);
 }
@@ -1082,7 +1082,7 @@
 		PurpleBlistNode *node = cur->data;
 		if ((node != NULL) && ((node->prev != NULL) || (node->next != NULL)))
 		{
-			pidgin_log_show_contact_with_parent(GTK_WINDOW(win->window), (PurpleContact *)node->parent);
+			pidgin_log_show_contact((PurpleContact *)node->parent);
 			g_slist_free(buddies);
 			gdk_window_set_cursor(gtkblist->window->window, NULL);
 			gdk_window_set_cursor(win->window->window, NULL);
@@ -1091,7 +1091,7 @@
 	}
 	g_slist_free(buddies);
 
-	pidgin_log_show_with_parent(GTK_WINDOW(win->window), type, name, account);
+	pidgin_log_show(type, name, account);
 
 	gdk_window_set_cursor(gtkblist->window->window, NULL);
 	gdk_window_set_cursor(win->window->window, NULL);
@@ -1237,7 +1237,7 @@
 
 	conv = pidgin_conv_window_get_active_gtkconv(win)->active_conv;
 
-	pidgin_pounce_editor_show_with_parent(GTK_WINDOW(win->window), purple_conversation_get_account(conv),
+	pidgin_pounce_editor_show(purple_conversation_get_account(conv),
 								purple_conversation_get_name(conv), NULL);
 }
 
@@ -2719,10 +2719,10 @@
 
 	buf = g_strdup_printf("%s.%s", purple_normalize(conv->account, conv->name), ext);
 
-	purple_request_file_with_hint(gtkconv, _("Save Icon"), buf, TRUE,
+	purple_request_file(gtkconv, _("Save Icon"), buf, TRUE,
 					 G_CALLBACK(saveicon_writefile_cb), NULL,
 					conv->account, NULL, conv,
-					PURPLE_REQUEST_UI_HINT_BLIST, gtkconv);
+					gtkconv);
 
 	g_free(buf);
 }
@@ -7621,7 +7621,7 @@
 	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/conversations/im/show_buddy_icons", TRUE);
 
 	purple_prefs_add_string(PIDGIN_PREFS_ROOT "/conversations/im/hide_new", "never");
-	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/conversations/im/close_immediately", FALSE);
+	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/conversations/im/close_immediately", TRUE);
 
 #ifdef _WIN32
 	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/win32/minimize_new_convs", FALSE);
--- a/pidgin/gtkdebug.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/pidgin/gtkdebug.c	Sat Nov 17 19:41:05 2007 +0000
@@ -36,7 +36,6 @@
 #include "gtkimhtml.h"
 #include "gtkutils.h"
 #include "pidginstock.h"
-#include "gtkblist.h"
 
 #ifdef HAVE_REGEX_H
 # include <regex.h>
@@ -232,10 +231,10 @@
 static void
 save_cb(GtkWidget *w, DebugWindow *win)
 {
-	purple_request_file_with_hint(win, _("Save Debug Log"), "purple-debug.log", TRUE,
+	purple_request_file(win, _("Save Debug Log"), "purple-debug.log", TRUE,
 					  G_CALLBACK(save_writefile_cb), NULL,
 					  NULL, NULL, NULL,
-					  PURPLE_REQUEST_UI_HINT_BLIST, win);
+					  win);
 }
 
 static void
@@ -674,7 +673,6 @@
 static DebugWindow *
 debug_window_new(void)
 {
-	PidginBuddyList *blist;
 	DebugWindow *win;
 	GtkWidget *vbox;
 	GtkWidget *toolbar;
@@ -689,9 +687,6 @@
 	height = purple_prefs_get_int(PIDGIN_PREFS_ROOT "/debug/height");
 
 	PIDGIN_DIALOG(win->window);
-	if ((blist = pidgin_blist_get_default_gtk_blist()) != NULL)
-		if (blist->window)
-			gtk_window_set_transient_for(GTK_WINDOW(win->window), GTK_WINDOW(blist->window));
 	purple_debug_info("gtkdebug", "Setting dimensions to %d, %d\n",
 					width, height);
 
--- a/pidgin/gtkdialogs.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/pidgin/gtkdialogs.c	Sat Nov 17 19:41:05 2007 +0000
@@ -336,13 +336,6 @@
 
 void pidgin_dialogs_about()
 {
-	PidginBuddyList *blist = pidgin_blist_get_default_gtk_blist();
-
-	pidgin_dialogs_about_with_parent(blist ? GTK_WINDOW(blist->window) : NULL);
-}
-
-void pidgin_dialogs_about_with_parent(GtkWindow *parent)
-{
 	GtkWidget *hbox;
 	GtkWidget *vbox;
 	GtkWidget *logo;
@@ -358,15 +351,11 @@
 	GdkPixbuf *pixbuf;
 
 	if (about != NULL) {
-		if (parent)
-			gtk_window_set_transient_for(GTK_WINDOW(about), parent);
 		gtk_window_present(GTK_WINDOW(about));
 		return;
 	}
 
 	PIDGIN_DIALOG(about);
-	if (parent)
-		gtk_window_set_transient_for(GTK_WINDOW(about), parent);
 	tmp = g_strdup_printf(_("About %s"), PIDGIN_NAME);
 	gtk_window_set_title(GTK_WINDOW(about), tmp);
 	g_free(tmp);
@@ -768,10 +757,6 @@
 	purple_request_field_set_required(field, TRUE);
 	purple_request_field_group_add_field(group, field);
 
-	field = purple_request_field_blist_nodes_new("blistnodes", _("Buddy"),
-			PURPLE_REQUEST_BLIST_FLAG_BUDDY, NULL);
-	purple_request_field_group_add_field(group, field);
-
 	field = purple_request_field_account_new("account", _("_Account"), NULL);
 	purple_request_field_set_type_hint(field, "account");
 	purple_request_field_set_visible(field,
@@ -780,7 +765,7 @@
 	purple_request_field_set_required(field, TRUE);
 	purple_request_field_group_add_field(group, field);
 
-	purple_request_fields_with_hint(purple_get_blist(), _("New Instant Message"),
+	purple_request_fields(purple_get_blist(), _("New Instant Message"),
 						NULL,
 						_("Please enter the screen name or alias of the person "
 						  "you would like to IM."),
@@ -788,7 +773,7 @@
 						_("OK"), G_CALLBACK(pidgin_dialogs_im_cb),
 						_("Cancel"), NULL,
 						NULL, NULL, NULL,
-						PURPLE_REQUEST_UI_HINT_BLIST, NULL);
+						NULL);
 }
 
 void
@@ -919,7 +904,7 @@
 	purple_request_field_set_required(field, TRUE);
 	purple_request_field_group_add_field(group, field);
 
-	purple_request_fields_with_hint(purple_get_blist(), _("Get User Info"),
+	purple_request_fields(purple_get_blist(), _("Get User Info"),
 						NULL,
 						_("Please enter the screen name or alias of the person "
 						  "whose info you would like to view."),
@@ -927,7 +912,7 @@
 						_("OK"), G_CALLBACK(pidgin_dialogs_info_cb),
 						_("Cancel"), NULL,
 						NULL, NULL, NULL,
-						PURPLE_REQUEST_UI_HINT_BLIST, NULL);
+						NULL);
 }
 
 static void
@@ -955,7 +940,7 @@
 			PurpleBlistNode *node = cur->data;
 			if ((node != NULL) && ((node->prev != NULL) || (node->next != NULL)))
 			{
-				pidgin_log_show_contact_with_parent(GTK_WINDOW(gtkblist->window), (PurpleContact *)node->parent);
+				pidgin_log_show_contact((PurpleContact *)node->parent);
 				g_slist_free(buddies);
 				pidgin_clear_cursor(gtkblist->window);
 				g_free(username);
@@ -964,7 +949,7 @@
 		}
 		g_slist_free(buddies);
 
-		pidgin_log_show_with_parent(GTK_WINDOW(gtkblist->window), PURPLE_LOG_IM, username, account);
+		pidgin_log_show(PURPLE_LOG_IM, username, account);
 
 		pidgin_clear_cursor(gtkblist->window);
 	}
@@ -1011,7 +996,7 @@
 	purple_request_field_set_required(field, TRUE);
 	purple_request_field_group_add_field(group, field);
 
-	purple_request_fields_with_hint(purple_get_blist(), _("View User Log"),
+	purple_request_fields(purple_get_blist(), _("View User Log"),
 						NULL,
 						_("Please enter the screen name or alias of the person "
 						  "whose log you would like to view."),
@@ -1019,7 +1004,7 @@
 						_("OK"), G_CALLBACK(pidgin_dialogs_log_cb),
 						_("Cancel"), NULL,
 						NULL, NULL, NULL,
-						PURPLE_REQUEST_UI_HINT_BLIST, NULL);
+						NULL);
 }
 
 static void
@@ -1033,13 +1018,13 @@
 {
 	g_return_if_fail(contact != NULL);
 
-	purple_request_input_with_hint(NULL, _("Alias Contact"), NULL,
+	purple_request_input(NULL, _("Alias Contact"), NULL,
 					   _("Enter an alias for this contact."),
 					   contact->alias, FALSE, FALSE, NULL,
 					   _("Alias"), G_CALLBACK(pidgin_dialogs_alias_contact_cb),
 					   _("Cancel"), NULL,
 					   NULL, purple_contact_get_alias(contact), NULL,
-					   PURPLE_REQUEST_UI_HINT_BLIST, contact);
+					   contact);
 }
 
 static void
@@ -1058,12 +1043,12 @@
 
 	secondary = g_strdup_printf(_("Enter an alias for %s."), buddy->name);
 
-	purple_request_input_with_hint(NULL, _("Alias Buddy"), NULL,
+	purple_request_input(NULL, _("Alias Buddy"), NULL,
 					   secondary, buddy->alias, FALSE, FALSE, NULL,
 					   _("Alias"), G_CALLBACK(pidgin_dialogs_alias_buddy_cb),
 					   _("Cancel"), NULL,
 					   purple_buddy_get_account(buddy), purple_buddy_get_name(buddy), NULL,
-					   PURPLE_REQUEST_UI_HINT_BLIST, buddy);
+					   buddy);
 
 	g_free(secondary);
 }
@@ -1079,13 +1064,13 @@
 {
 	g_return_if_fail(chat != NULL);
 
-	purple_request_input_with_hint(NULL, _("Alias Chat"), NULL,
+	purple_request_input(NULL, _("Alias Chat"), NULL,
 					   _("Enter an alias for this chat."),
 					   chat->alias, FALSE, FALSE, NULL,
 					   _("Alias"), G_CALLBACK(pidgin_dialogs_alias_chat_cb),
 					   _("Cancel"), NULL,
 					   chat->account, NULL, NULL,
-					   PURPLE_REQUEST_UI_HINT_BLIST, chat);
+					   chat);
 }
 
 static void
@@ -1127,9 +1112,9 @@
 						"want to continue?", contact->totalsize - 1),
 					buddy->name, contact->totalsize - 1);
 
-		purple_request_action_with_hint(contact, NULL, _("Remove Contact"), text, 0,
+		purple_request_action(contact, NULL, _("Remove Contact"), text, 0,
 				NULL, purple_contact_get_alias(contact), NULL,
-				PURPLE_REQUEST_UI_HINT_BLIST, contact, 2,
+				contact, 2,
 				_("_Remove Contact"), G_CALLBACK(pidgin_dialogs_remove_contact_cb),
 				_("Cancel"),
 				NULL);
@@ -1168,9 +1153,9 @@
 	ggp->parent = source;
 	ggp->new_name = g_strdup(new_name);
 	
-	purple_request_action_with_hint(source, NULL, _("Merge Groups"), text, 0,
+	purple_request_action(source, NULL, _("Merge Groups"), text, 0,
 			NULL, NULL, NULL,
-			PURPLE_REQUEST_UI_HINT_BLIST, ggp, 2,
+			ggp, 2,
 			_("_Merge Groups"), G_CALLBACK(pidgin_dialogs_merge_groups_cb),
 			_("Cancel"), G_CALLBACK(free_ggmo));
 
@@ -1224,9 +1209,9 @@
 	text = g_strdup_printf(_("You are about to remove the group %s and all its members from your buddy list.  Do you want to continue?"),
 						   group->name);
 
-	purple_request_action_with_hint(group, NULL, _("Remove Group"), text, 0,
+	purple_request_action(group, NULL, _("Remove Group"), text, 0,
 						NULL, NULL, NULL,
-						PURPLE_REQUEST_UI_HINT_BLIST, group, 2,
+						group, 2,
 						_("_Remove Group"), G_CALLBACK(pidgin_dialogs_remove_group_cb),
 						_("Cancel"), NULL);
 
@@ -1263,9 +1248,9 @@
 	text = g_strdup_printf(_("You are about to remove %s from your buddy list.  Do you want to continue?"),
 						   buddy->name);
 
-	purple_request_action_with_hint(buddy, NULL, _("Remove Buddy"), text, 0,
+	purple_request_action(buddy, NULL, _("Remove Buddy"), text, 0,
 						purple_buddy_get_account(buddy), purple_buddy_get_name(buddy), NULL,
-						PURPLE_REQUEST_UI_HINT_BLIST, buddy, 2,
+						buddy, 2,
 						_("_Remove Buddy"), G_CALLBACK(pidgin_dialogs_remove_buddy_cb),
 						_("Cancel"), NULL);
 
@@ -1290,9 +1275,9 @@
 	text = g_strdup_printf(_("You are about to remove the chat %s from your buddy list.  Do you want to continue?"),
 			name ? name : "");
 
-	purple_request_action_with_hint(chat, NULL, _("Remove Chat"), text, 0,
+	purple_request_action(chat, NULL, _("Remove Chat"), text, 0,
 						chat->account, NULL, NULL,
-						PURPLE_REQUEST_UI_HINT_BLIST, chat, 2,
+						chat, 2,
 						_("_Remove Chat"), G_CALLBACK(pidgin_dialogs_remove_chat_cb),
 						_("Cancel"), NULL);
 
--- a/pidgin/gtkdialogs.h	Sat Nov 17 18:26:03 2007 +0000
+++ b/pidgin/gtkdialogs.h	Sat Nov 17 19:41:05 2007 +0000
@@ -31,33 +31,18 @@
 #include "conversation.h"
 
 /* Functions in gtkdialogs.c (these should actually stay in this file) */
-
 void pidgin_dialogs_destroy_all(void);
-
-#ifndef PURPLE_DISABLE_DEPRECATED
-/**
- * @deprecated Use pidgin_dialogs_about_with_parent() instead.
- */
 void pidgin_dialogs_about(void);
-#endif
-
-/**
- * @since 2.3.0
- */
-void pidgin_dialogs_about_with_parent(GtkWindow *parent);
-
 void pidgin_dialogs_im(void);
 void pidgin_dialogs_im_with_user(PurpleAccount *, const char *);
 void pidgin_dialogs_info(void);
 void pidgin_dialogs_log(void);
 
-#ifndef PURPLE_DISABLE_DEPRECATED
 /**
  * @deprecated This function is no longer used and will be removed in
  *             Pidgin 3.0.0 unless there is sufficient demand to keep it.
  */
 void pidgin_dialogs_alias_contact(PurpleContact *);
-#endif
 
 void pidgin_dialogs_alias_buddy(PurpleBuddy *);
 void pidgin_dialogs_alias_chat(PurpleChat *);
--- a/pidgin/gtkimhtml.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/pidgin/gtkimhtml.c	Sat Nov 17 19:41:05 2007 +0000
@@ -899,6 +899,9 @@
 
 	if (primary) {
 		GtkTextMark *sel = NULL, *ins = NULL;
+
+		g_return_if_fail(imhtml != NULL);
+
 		ins = gtk_text_buffer_get_insert(imhtml->text_buffer);
 		sel = gtk_text_buffer_get_selection_bound(imhtml->text_buffer);
 		gtk_text_buffer_get_iter_at_mark(imhtml->text_buffer, &start, sel);
@@ -957,7 +960,6 @@
 static void gtk_imhtml_clipboard_clear (GtkClipboard *clipboard, GtkSelectionData *sel_data,
 				 guint info, gpointer user_data_or_owner)
 {
-	clipboard_selection = NULL;
 }
 
 static void copy_clipboard_cb(GtkIMHtml *imhtml, gpointer unused)
--- a/pidgin/gtkimhtmltoolbar.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/pidgin/gtkimhtmltoolbar.c	Sat Nov 17 19:41:05 2007 +0000
@@ -184,8 +184,6 @@
 			g_signal_connect_after(G_OBJECT(toolbar->font_dialog), "realize",
 							 G_CALLBACK(realize_toolbar_font), toolbar);
 		}
-		gtk_window_set_transient_for(GTK_WINDOW(toolbar->font_dialog),
-		    GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(toolbar))));
 		gtk_window_present(GTK_WINDOW(toolbar->font_dialog));
 	} else {
 		cancel_toolbar_font(font, toolbar);
@@ -429,14 +427,14 @@
 		}
 
 		toolbar->link_dialog =
-			purple_request_fields_with_hint(toolbar, _("Insert Link"),
+			purple_request_fields(toolbar, _("Insert Link"),
 					    NULL,
-					    msg,
+						msg,
 					    fields,
 					    _("_Insert"), G_CALLBACK(do_insert_link_cb),
 					    _("Cancel"), G_CALLBACK(cancel_link_cb),
-					    NULL, NULL, NULL,
-					    PURPLE_REQUEST_UI_HINT_CONV, toolbar);
+						NULL, NULL, NULL,
+					    toolbar);
 		g_free(msg);
 		g_free(desc);
 	} else {
@@ -711,8 +709,6 @@
 	gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
 	gtk_window_set_role(GTK_WINDOW(dialog), "smiley_dialog");
 	gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_MOUSE);
-	gtk_window_set_transient_for(GTK_WINDOW(dialog),
-	    GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(toolbar))));
 
 	if (unique_smileys != NULL) {
 		struct smiley_button_list *ls, *it, *it_tmp;
--- a/pidgin/gtklog.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/pidgin/gtklog.c	Sat Nov 17 19:41:05 2007 +0000
@@ -321,9 +321,9 @@
 	data2[0] = lv->treestore;
 	data2[1] = data[3]; /* iter */
 	data2[2] = log;
-	purple_request_action_with_hint(lv, NULL, "Delete Log?", tmp, 0, 
+	purple_request_action(lv, NULL, "Delete Log?", tmp, 0, 
 						NULL, NULL, NULL,
-						"log_viewer", data2, 2,
+						data2, 2,
 						_("Delete"), delete_log_cb,
 						_("Cancel"), delete_log_cleanup_cb);
 	g_free(tmp);
@@ -523,7 +523,7 @@
 	}
 }
 
-static PidginLogViewer *display_log_viewer(GtkWindow *parent, struct log_viewer_hash_t *ht, GList *logs,
+static PidginLogViewer *display_log_viewer(struct log_viewer_hash_t *ht, GList *logs,
 						const char *title, GtkWidget *icon, int log_size)
 {
 	PidginLogViewer *lv;
@@ -569,7 +569,7 @@
 		g_hash_table_insert(log_viewers, ht, lv);
 
 	/* Window ***********/
-	lv->window = gtk_dialog_new_with_buttons(title, parent, 0,
+	lv->window = gtk_dialog_new_with_buttons(title, NULL, 0,
 					     GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL);
 #ifdef _WIN32
 	/* Steal the "HELP" response and use it to trigger browsing to the logs folder */
@@ -676,10 +676,6 @@
 }
 
 void pidgin_log_show(PurpleLogType type, const char *screenname, PurpleAccount *account) {
-	pidgin_log_show_with_parent(NULL, type, screenname, account);
-}
-
-void pidgin_log_show_with_parent(GtkWindow *parent, PurpleLogType type, const char *screenname, PurpleAccount *account) {
 	struct log_viewer_hash_t *ht;
 	PidginLogViewer *lv = NULL;
 	const char *name = screenname;
@@ -724,7 +720,7 @@
 
 	prpl_icon = pidgin_create_prpl_icon(account, PIDGIN_PRPL_ICON_MEDIUM);
 
-	display_log_viewer(parent, ht, purple_log_get_logs(type, screenname, account),
+	display_log_viewer(ht, purple_log_get_logs(type, screenname, account),
 			title, gtk_image_new_from_pixbuf(prpl_icon),
 			purple_log_get_total_size(type, screenname, account));
 
@@ -734,10 +730,6 @@
 }
 
 void pidgin_log_show_contact(PurpleContact *contact) {
-	pidgin_log_show_contact_with_parent(NULL, contact);
-}
-
-void pidgin_log_show_contact_with_parent(GtkWindow *parent, PurpleContact *contact) {
 	struct log_viewer_hash_t *ht = g_new0(struct log_viewer_hash_t, 1);
 	PurpleBlistNode *child;
 	PidginLogViewer *lv = NULL;
@@ -791,16 +783,11 @@
 	}
 
 	title = g_strdup_printf(_("Conversations with %s"), name);
-	display_log_viewer(parent, ht, logs, title, image, total_log_size);
+	display_log_viewer(ht, logs, title, image, total_log_size);
 	g_free(title);
 }
 
-void pidgin_syslog_show(void)
-{
-	pidgin_syslog_show_with_parent(NULL);
-}
-
-void pidgin_syslog_show_with_parent(GtkWindow *parent)
+void pidgin_syslog_show()
 {
 	GList *accounts = NULL;
 	GList *logs = NULL;
@@ -820,7 +807,7 @@
 	}
 	logs = g_list_sort(logs, purple_log_compare);
 
-	syslog_viewer = display_log_viewer(parent, NULL, logs, _("System Log"), NULL, 0);
+	syslog_viewer = display_log_viewer(NULL, logs, _("System Log"), NULL, 0);
 }
 
 /****************************************************************************
--- a/pidgin/gtklog.h	Sat Nov 17 18:26:03 2007 +0000
+++ b/pidgin/gtklog.h	Sat Nov 17 19:41:05 2007 +0000
@@ -52,41 +52,11 @@
 };
 
 
-#ifndef PURPLE_DISABLE_DEPRECATED
-/**
- * @deprecated Use pidgin_log_show_with_parent() instead.
- */
+
 void pidgin_log_show(PurpleLogType type, const char *screenname, PurpleAccount *account);
-#endif
-
-/**
- * @since 2.3.0
- */
-void pidgin_log_show_with_parent(GtkWindow *parent, PurpleLogType type, const char *screenname, PurpleAccount *account);
-
-#ifndef PURPLE_DISABLE_DEPRECATED
-/**
- * @deprecated pidgin_log_show_contact_with_parent() instead.
- */
 void pidgin_log_show_contact(PurpleContact *contact);
-#endif
 
-/**
- * @since 2.3.0
- */
-void pidgin_log_show_contact_with_parent(GtkWindow *parent, PurpleContact *contact);
-
-#ifndef PURPLE_DISABLE_DEPRECATED
-/**
- * @deprecated Use pidgin_syslog_show_with_parent() instead.
- */
 void pidgin_syslog_show(void);
-#endif
-
-/**
- * @since 2.3.0
- */
-void pidgin_syslog_show_with_parent(GtkWindow *parent);
 
 /**************************************************************************/
 /** @name GTK+ Log Subsystem                                              */
--- a/pidgin/gtkplugin.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/pidgin/gtkplugin.c	Sat Nov 17 19:41:05 2007 +0000
@@ -280,11 +280,11 @@
 			cb_data[1] = model;
 			cb_data[2] = iter;
 
-			purple_request_action_with_hint(plugin_dialog, NULL,
+			purple_request_action(plugin_dialog, NULL,
 			                    _("Multiple plugins will be unloaded."),
 			                    tmp->str, 0,
-			                    NULL, NULL, NULL,
-			                    PURPLE_REQUEST_UI_HINT_PLUGINMGR, cb_data, 2,
+								NULL, NULL, NULL,
+								cb_data, 2,
 			                    _("Unload Plugins"), G_CALLBACK(plugin_unload_confirm_cb),
 			                    _("Cancel"), g_free);
 			g_string_free(tmp, TRUE);
@@ -533,11 +533,6 @@
 
 void pidgin_plugin_dialog_show()
 {
-	pidgin_plugin_dialog_show_with_parent(NULL);
-}
-
-void pidgin_plugin_dialog_show_with_parent(GtkWindow *parent)
-{
 	GtkWidget *sw;
 	GtkWidget *event_view;
 	GtkListStore *ls;
@@ -546,8 +541,6 @@
 	GtkTreeSelection *sel;
 
 	if (plugin_dialog != NULL) {
-		if (parent)
-			gtk_window_set_transient_for(GTK_WINDOW(plugin_dialog), parent);
 		gtk_window_present(GTK_WINDOW(plugin_dialog));
 		return;
 	}
@@ -556,8 +549,6 @@
 						    NULL,
 						    GTK_DIALOG_NO_SEPARATOR,
 						    NULL);
-	if (parent)
-		gtk_window_set_transient_for(GTK_WINDOW(plugin_dialog), parent);
 	pref_button = gtk_dialog_add_button(GTK_DIALOG(plugin_dialog),
 						_("Configure Pl_ugin"), PIDGIN_RESPONSE_CONFIGURE);
 	gtk_dialog_add_button(GTK_DIALOG(plugin_dialog),
--- a/pidgin/gtkplugin.h	Sat Nov 17 18:26:03 2007 +0000
+++ b/pidgin/gtkplugin.h	Sat Nov 17 19:41:05 2007 +0000
@@ -72,20 +72,9 @@
  */
 void pidgin_plugins_save(void);
 
-#ifndef PURPLE_DISABLE_DEPRECATED
 /**
  * Shows the Plugins dialog
- *
- * @deprecated Use pidgin_plugin_dialog_show_with_parent() instead.
  */
 void pidgin_plugin_dialog_show(void);
-#endif
-
-/**
- * Shows the Plugins dialog, transient to a parent window
- *
- * @since 2.3.0
- */
-void pidgin_plugin_dialog_show_with_parent(GtkWindow *parent);
 
 #endif /* _PIDGINPLUGIN_H_ */
--- a/pidgin/gtkpounce.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/pidgin/gtkpounce.c	Sat Nov 17 19:41:05 2007 +0000
@@ -154,10 +154,10 @@
 	entry = (GtkWidget *)data;
 	name = gtk_entry_get_text(GTK_ENTRY(entry));
 
-	purple_request_file_with_hint(entry, _("Select a file"), name, FALSE,
+	purple_request_file(entry, _("Select a file"), name, FALSE,
 					  G_CALLBACK(pounce_update_entry_fields), NULL,
 					  NULL, NULL, NULL,
-					  "buddy_pounce", entry);
+					  entry);
 	g_signal_connect_swapped(G_OBJECT(entry), "destroy",
 			G_CALLBACK(purple_request_close_with_handle), entry);
 }
@@ -472,13 +472,6 @@
 pidgin_pounce_editor_show(PurpleAccount *account, const char *name,
 							PurplePounce *cur_pounce)
 {
-	pidgin_pounce_editor_show_with_parent(NULL, account, name, cur_pounce);
-}
-
-void
-pidgin_pounce_editor_show_with_parent(GtkWindow *parent, PurpleAccount *account, const char *name,
-							PurplePounce *cur_pounce)
-{
 	PidginPounceDialog *dialog;
 	GtkWidget *window;
 	GtkWidget *label;
@@ -531,7 +524,6 @@
 	gtk_window_set_title(GTK_WINDOW(window), (cur_pounce == NULL ? _("New Buddy Pounce") : _("Edit Buddy Pounce")));
 	gtk_window_set_role(GTK_WINDOW(window), "buddy_pounce");
 	gtk_container_set_border_width(GTK_CONTAINER(dialog->window), PIDGIN_HIG_BORDER);
-	gtk_window_set_transient_for(GTK_WINDOW(window), parent);
 
 	g_signal_connect(G_OBJECT(window), "delete_event",
 					 G_CALLBACK(delete_win_cb), dialog);
@@ -1063,7 +1055,7 @@
 static void
 pounces_manager_add_cb(GtkButton *button, gpointer user_data)
 {
-	pidgin_pounce_editor_show_with_parent(GTK_WINDOW(pounces_manager->window), NULL, NULL, NULL);
+	pidgin_pounce_editor_show(NULL, NULL, NULL);
 }
 
 static void
@@ -1073,7 +1065,7 @@
 	PurplePounce *pounce;
 
 	gtk_tree_model_get(model, iter, POUNCES_MANAGER_COLUMN_POUNCE, &pounce, -1);
-	pidgin_pounce_editor_show_with_parent(GTK_WINDOW(pounces_manager->window), NULL, NULL, pounce);
+	pidgin_pounce_editor_show(NULL, NULL, pounce);
 }
 
 static void
@@ -1114,9 +1106,9 @@
 	pouncee = purple_pounce_get_pouncee(pounce);
 
 	buf = g_strdup_printf(_("Are you sure you want to delete the pounce on %s for %s?"), pouncee, pouncer);
-	purple_request_action_with_hint(pounce, NULL, buf, NULL, 0,
+	purple_request_action(pounce, NULL, buf, NULL, 0,
 						account, pouncee, NULL,
-						PURPLE_REQUEST_UI_HINT_POUNCEMGR, pounce, 2,
+						pounce, 2,
 						_("Delete"), pounces_manager_delete_confirm_cb,
 						_("Cancel"), NULL);
 	g_free(buf);
@@ -1173,7 +1165,7 @@
 	if ((pounce != NULL) && (event->button == 1) &&
 		(event->type == GDK_2BUTTON_PRESS))
 	{
-		pidgin_pounce_editor_show_with_parent(GTK_WINDOW(pounces_manager->window), NULL, NULL, pounce);
+		pidgin_pounce_editor_show(NULL, NULL, pounce);
 		return TRUE;
 	}
 
@@ -1324,12 +1316,6 @@
 void
 pidgin_pounces_manager_show(void)
 {
-	pidgin_pounces_manager_show_with_parent(NULL);
-}
-
-void
-pidgin_pounces_manager_show_with_parent(GtkWindow *parent)
-{
 	PouncesManager *dialog;
 	GtkWidget *bbox;
 	GtkWidget *button;
@@ -1340,7 +1326,6 @@
 
 	if (pounces_manager != NULL) {
 		gtk_window_present(GTK_WINDOW(pounces_manager->window));
-		gtk_window_set_transient_for(GTK_WINDOW(pounces_manager->window), parent);
 		return;
 	}
 
@@ -1351,7 +1336,6 @@
 
 	dialog->window = win = pidgin_create_window(_("Buddy Pounces"), PIDGIN_HIG_BORDER, "pounces", TRUE);
 	gtk_window_set_default_size(GTK_WINDOW(win), width, height);
-	gtk_window_set_transient_for(GTK_WINDOW(win), parent);
 
 	g_signal_connect(G_OBJECT(win), "delete_event",
 					 G_CALLBACK(pounces_manager_destroy_cb), dialog);
--- a/pidgin/gtkpounce.h	Sat Nov 17 18:26:03 2007 +0000
+++ b/pidgin/gtkpounce.h	Sat Nov 17 19:41:05 2007 +0000
@@ -28,48 +28,20 @@
 
 #include "pounce.h"
 
-#ifndef PURPLE_DISABLE_DEPRECATED
 /**
  * Displays a New Buddy Pounce or Edit Buddy Pounce dialog.
  *
  * @param account    The optional account to use.
  * @param name       The optional name to pounce on.
  * @param cur_pounce The current buddy pounce, if editing an existing one.
- *
- * @deprecated Use pidgin_pounce_editor_show_with_parent() instead.
  */
 void pidgin_pounce_editor_show(PurpleAccount *account, const char *name,
 								PurplePounce *cur_pounce);
-#endif
-
-/**
- * Displays a New Buddy Pounce or Edit Buddy Pounce dialog.
- *
- * @param parent     The parent window.
- * @param account    The optional account to use.
- * @param name       The optional name to pounce on.
- * @param cur_pounce The current buddy pounce, if editing an existing one.
- *
- * @since 2.3.0
- */
-void pidgin_pounce_editor_show_with_parent(GtkWindow *parent, PurpleAccount *account, const char *name,
-								PurplePounce *cur_pounce);
-
-#ifndef PURPLE_DISABLE_DEPRECATED
-/**
- * Shows the pounces manager window.
- *
- * @deprecated Use pidgin_pounces_manager_show_with_parent() instead.
- */
-void pidgin_pounces_manager_show(void);
-#endif
 
 /**
  * Shows the pounces manager window.
- *
- * @since 2.3.0
  */
-void pidgin_pounces_manager_show_with_parent(GtkWindow *parent);
+void pidgin_pounces_manager_show(void);
 
 /**
  * Hides the pounces manager window.
--- a/pidgin/gtkprefs.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/pidgin/gtkprefs.c	Sat Nov 17 19:41:05 2007 +0000
@@ -641,8 +641,7 @@
 static void
 add_theme_button_clicked_cb(GtkWidget *widget, gpointer null)
 {
-	purple_request_file_with_hint(NULL, _("Install Theme"), NULL, FALSE,
-	    (GCallback)request_theme_file_name_cb, NULL, NULL, NULL, NULL, PURPLE_REQUEST_UI_HINT_PREFSMGR, NULL) ;
+	purple_request_file(NULL, _("Install Theme"), NULL, FALSE, (GCallback)request_theme_file_name_cb, NULL, NULL, NULL, NULL, NULL) ;
 }
 
 static void
@@ -1722,9 +1721,9 @@
 	if (*filename == '\0')
 		filename = NULL;
 
-	purple_request_file_with_hint(prefs, _("Sound Selection"), filename, FALSE,
+	purple_request_file(prefs, _("Sound Selection"), filename, FALSE,
 					  G_CALLBACK(sound_chosen_cb), NULL,
-					  NULL, NULL, NULL, PURPLE_REQUEST_UI_HINT_PREFSMGR,
+					  NULL, NULL, NULL,
 					  GINT_TO_POINTER(sound_row_sel));
 }
 
--- a/pidgin/gtkprivacy.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/pidgin/gtkprivacy.c	Sat Nov 17 19:41:05 2007 +0000
@@ -88,8 +88,6 @@
 
 static PidginPrivacyDialog *privacy_dialog = NULL;
 
-#define PIDGIN_REQUEST_HINT_PRIVACY "privacy"
-
 static void
 rebuild_allow_list(PidginPrivacyDialog *dialog)
 {
@@ -369,7 +367,7 @@
 
 	dialog = g_new0(PidginPrivacyDialog, 1);
 
-	dialog->win = pidgin_create_window(_("Privacy"), PIDGIN_HIG_BORDER, PIDGIN_REQUEST_HINT_PRIVACY, TRUE);
+	dialog->win = pidgin_create_window(_("Privacy"), PIDGIN_HIG_BORDER, "privacy", TRUE);
 
 	g_signal_connect(G_OBJECT(dialog->win), "delete_event",
 					 G_CALLBACK(destroy_cb), dialog);
@@ -556,7 +554,7 @@
 	data->block   = FALSE;
 
 	if (name == NULL) {
-		purple_request_input_with_hint(account, _("Permit User"),
+		purple_request_input(account, _("Permit User"),
 			_("Type a user you permit to contact you."),
 			_("Please enter the name of the user you wish to be "
 			  "able to contact you."),
@@ -564,7 +562,7 @@
 			_("_Permit"), G_CALLBACK(add_permit_block_cb),
 			_("Cancel"), G_CALLBACK(destroy_request_data),
 			account, name, NULL,
-			PIDGIN_REQUEST_HINT_PRIVACY, data);
+			data);
 	}
 	else {
 		char *primary = g_strdup_printf(_("Allow %s to contact you?"), name);
@@ -573,10 +571,10 @@
 							  "%s to contact you?"), name);
 
 
-		purple_request_action_with_hint(account, _("Permit User"), primary, secondary,
+		purple_request_action(account, _("Permit User"), primary, secondary,
 							0,
 							account, name, NULL,
-							PIDGIN_REQUEST_HINT_PRIVACY, data, 2,
+							data, 2,
 							_("_Permit"), G_CALLBACK(confirm_permit_block_cb),
 							_("Cancel"), G_CALLBACK(destroy_request_data));
 
@@ -598,24 +596,24 @@
 	data->block   = TRUE;
 
 	if (name == NULL) {
-		purple_request_input_with_hint(account, _("Block User"),
+		purple_request_input(account, _("Block User"),
 			_("Type a user to block."),
 			_("Please enter the name of the user you wish to block."),
 			NULL, FALSE, FALSE, NULL,
 			_("_Block"), G_CALLBACK(add_permit_block_cb),
 			_("Cancel"), G_CALLBACK(destroy_request_data),
 			account, name, NULL,
-			PIDGIN_REQUEST_HINT_PRIVACY, data);
+			data);
 	}
 	else {
 		char *primary = g_strdup_printf(_("Block %s?"), name);
 		char *secondary =
 			g_strdup_printf(_("Are you sure you want to block %s?"), name);
 
-		purple_request_action_with_hint(account, _("Block User"), primary, secondary,
+		purple_request_action(account, _("Block User"), primary, secondary,
 							0,
 							account, name, NULL,
-							PIDGIN_REQUEST_HINT_PRIVACY, data, 2,
+							data, 2,
 							_("_Block"), G_CALLBACK(confirm_permit_block_cb),
 							_("Cancel"), G_CALLBACK(destroy_request_data));
 
--- a/pidgin/gtkrequest.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/pidgin/gtkrequest.c	Sat Nov 17 19:41:05 2007 +0000
@@ -80,55 +80,6 @@
 
 } PidginRequestData;
 
-static GtkWindow *
-find_toplevel(GList *ll_toplevels, const char *role)
-{
-	const char *window_role = NULL;
-	GList *ll_itr = NULL;
-
-	for (ll_itr = ll_toplevels ; ll_itr ; ll_itr = ll_itr->next) {
-		if ((window_role = gtk_window_get_role(GTK_WINDOW(ll_itr->data))) != NULL) {
-			if (!strcmp(window_role, role))
-				return GTK_WINDOW(ll_itr->data);
-		}
-	}
-
-	return NULL;
-}
-
-static GtkWindow *
-get_request_parent(const char *ui_hint, PidginConversation *convo)
-{
-	GtkWindow *toplevel = NULL;
-	PidginBuddyList *blist = NULL;
-
-	if (convo)
-		return GTK_WINDOW(convo->win->window);
-
-	if (strcmp(ui_hint, PURPLE_REQUEST_UI_HINT_BLIST)) {
-		GList *ll_toplevels = NULL;
-
-		ll_toplevels = gtk_window_list_toplevels();
-
-		if (!(toplevel = find_toplevel(ll_toplevels, ui_hint))) {
-			if (!strcmp(ui_hint, PURPLE_REQUEST_UI_HINT_REGISTER))
-				toplevel = find_toplevel(ll_toplevels, "account");
-			else
-			if (!strcmp(ui_hint, PURPLE_REQUEST_UI_HINT_XFER))
-				toplevel = find_toplevel(ll_toplevels, "file transfer");
-		}
-		
-		g_list_free(ll_toplevels);
-	}
-
-	/* Takes care of "pidgin-statusbox" as well */
-	if (!toplevel)
-		if ((blist = pidgin_blist_get_default_gtk_blist()) != NULL)
-			return GTK_WINDOW(blist->window);
-
-	return toplevel;
-}
-
 static void
 generic_response_start(PidginRequestData *data)
 {
@@ -337,7 +288,7 @@
 					   const char *ok_text, GCallback ok_cb,
 					   const char *cancel_text, GCallback cancel_cb,
 					   PurpleAccount *account, const char *who, PurpleConversation *conv,
-					   const char *ui_hint, void *user_data)
+					   void *user_data)
 {
 	PidginRequestData *data;
 	GtkWidget *dialog;
@@ -362,7 +313,7 @@
 
 	/* Create the dialog. */
 	dialog = gtk_dialog_new_with_buttons(title ? title : PIDGIN_ALERT_TITLE,
-					     get_request_parent(ui_hint, conv ? PIDGIN_CONVERSATION(conv) : NULL), 0,
+					     NULL, 0,
 					     text_to_stock(cancel_text), 1,
 					     text_to_stock(ok_text),     0,
 					     NULL);
@@ -500,7 +451,7 @@
 			const char *ok_text, GCallback ok_cb,
 			const char *cancel_text, GCallback cancel_cb,
 			PurpleAccount *account, const char *who, PurpleConversation *conv,
-			const char *ui_hint, void *user_data, va_list args)
+			void *user_data, va_list args)
 {
 	PidginRequestData *data;
 	GtkWidget *dialog;
@@ -524,8 +475,6 @@
 
 	/* Create the dialog. */
 	data->dialog = dialog = gtk_dialog_new();
-	gtk_window_set_transient_for(GTK_WINDOW(dialog),
-		get_request_parent(ui_hint, conv ? PIDGIN_CONVERSATION(conv) : NULL));
 
 	if (title != NULL)
 		gtk_window_set_title(GTK_WINDOW(dialog), title);
@@ -606,7 +555,7 @@
 pidgin_request_action(const char *title, const char *primary,
 						const char *secondary, int default_action,
 					    PurpleAccount *account, const char *who, PurpleConversation *conv,
-						const char *ui_hint, void *user_data, size_t action_count, va_list actions)
+						void *user_data, size_t action_count, va_list actions)
 {
 	PidginRequestData *data;
 	GtkWidget *dialog;
@@ -636,8 +585,6 @@
 
 	/* Create the dialog. */
 	data->dialog = dialog = gtk_dialog_new();
-	gtk_window_set_transient_for(GTK_WINDOW(dialog),
-		get_request_parent(ui_hint, conv ? PIDGIN_CONVERSATION(conv) : NULL));
 
 #if GTK_CHECK_VERSION(2,10,0)
 	gtk_window_set_deletable(GTK_WINDOW(data->dialog), FALSE);
@@ -1006,92 +953,6 @@
 	return widget;
 }
 
-static GtkWidget *
-create_blist_field(PurpleRequestField *field)
-{
-	GtkTreeStore *model;
-	GtkWidget *tree, *sw;
-	PurpleBlistNode *node;
-	GtkCellRenderer *rend;
-	GtkTreeViewColumn *column;
-	GtkTreeIter parent = {0, NULL, NULL, NULL}, iter;
-	PurpleRequestBlistFlags flags = field->u.blist.flags;
-	gboolean offline = !!(field->u.blist.flags & PURPLE_REQUEST_BLIST_FLAG_ALLOW_OFFLINE);
-
-	/* Create the treeview. Populate the blistnodes.
-	 * Hook to signed-on, signed-off signals to update the list when account goes online/offline.
-	 * Hook to buddy-signed-on/off, -status-changed signals to update the status pixbuf.
-	 */
-
-	model = gtk_tree_store_new(3, GDK_TYPE_PIXBUF, G_TYPE_STRING, GDK_TYPE_PIXBUF);
-	node = purple_blist_get_root();
-	while (node) {
-		GdkPixbuf *status = NULL, *prpl = NULL;
-		const char *name = NULL;
-		if ((PURPLE_BLIST_NODE_IS_BUDDY(node) || PURPLE_BLIST_NODE_IS_CONTACT(node))
-				&& (flags & PURPLE_REQUEST_BLIST_FLAG_BUDDY)) {
-			PurpleBuddy *buddy; 
-			GtkTreeIter *p = NULL;
-			if (PURPLE_BLIST_NODE_IS_BUDDY(node)) {
-				buddy = (PurpleBuddy*)node;
-				p = &parent;
-			} else {
-				buddy = purple_contact_get_priority_buddy((PurpleContact*)node);
-				parent = iter;
-			}
-			if (PURPLE_BUDDY_IS_ONLINE(buddy)) {
-				gtk_tree_store_append(model, &iter, p);
-				name = purple_buddy_get_name(buddy);
-				status = pidgin_blist_get_status_icon(node, PIDGIN_STATUS_ICON_SMALL);
-			}
-		} else if (PURPLE_BLIST_NODE_IS_CHAT(node) && (flags & PURPLE_REQUEST_BLIST_FLAG_CHAT)) {
-			gtk_tree_store_append(model, &iter, NULL);
-			name = purple_chat_get_name((PurpleChat*)node);
-			status = pidgin_blist_get_status_icon(node, PIDGIN_STATUS_ICON_SMALL);
-		}
-		if (name)
-			gtk_tree_store_set(model, &iter,
-					0, status,
-					1, name,
-					2, prpl,
-					-1);
-		if (prpl)
-			gdk_pixbuf_unref(prpl);
-		if (status)
-			gdk_pixbuf_unref(status);
-		node = purple_blist_node_next(node, offline);
-	}
-
-	tree = gtk_tree_view_new_with_model(GTK_TREE_MODEL(model));
-	gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(tree), FALSE);
-	gtk_tree_view_set_search_column(GTK_TREE_VIEW(tree), 1);
-	gtk_tree_view_set_search_equal_func(GTK_TREE_VIEW(tree), pidgin_tree_view_search_equal_func, NULL, NULL);
-	gtk_widget_show(tree);
-
-	column = gtk_tree_view_column_new();
-	gtk_tree_view_append_column(GTK_TREE_VIEW(tree), column);
-
-	rend = gtk_cell_renderer_pixbuf_new();
-	gtk_tree_view_column_pack_start(column, rend, FALSE);
-	gtk_tree_view_column_set_attributes(column, rend, "pixbuf", 0, NULL);
-
-	rend = gtk_cell_renderer_text_new();
-	gtk_tree_view_column_pack_start(column, rend, TRUE);
-	gtk_tree_view_column_set_attributes(column, rend, "markup", 1, NULL);
-
-	rend = gtk_cell_renderer_pixbuf_new();
-	gtk_tree_view_column_pack_start(column, rend, FALSE);
-	gtk_tree_view_column_set_attributes(column, rend, "pixbuf", 2, NULL);
-
-	sw = gtk_scrolled_window_new(NULL,NULL);
-	gtk_widget_show(sw);
-	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW(sw), GTK_SHADOW_NONE);
-	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-	gtk_container_add(GTK_CONTAINER(sw), tree);
-
-	return sw;
-}
-
 static void
 select_field_list_item(GtkTreeModel *model, GtkTreePath *path,
 					   GtkTreeIter *iter, gpointer data)
@@ -1191,7 +1052,7 @@
 						const char *ok_text, GCallback ok_cb,
 						const char *cancel_text, GCallback cancel_cb,
 					    PurpleAccount *account, const char *who, PurpleConversation *conv,
-						const char *ui_hint, void *user_data)
+						void *user_data)
 {
 	PidginRequestData *data;
 	GtkWidget *win;
@@ -1232,8 +1093,6 @@
 #else /* !_WIN32 */
 	data->dialog = win = pidgin_create_window(title, PIDGIN_HIG_BORDER, "multifield", TRUE) ;
 #endif /* _WIN32 */
-	gtk_window_set_transient_for(GTK_WINDOW(win),
-		get_request_parent(ui_hint, conv ? PIDGIN_CONVERSATION(conv) : NULL));
 
 	g_signal_connect(G_OBJECT(win), "delete_event",
 					 G_CALLBACK(destroy_multifield_cb), data);
@@ -1470,8 +1329,6 @@
 					widget = create_image_field(field);
 				else if (type == PURPLE_REQUEST_FIELD_ACCOUNT)
 					widget = create_account_field(field);
-				else if (type == PURPLE_REQUEST_FIELD_BLIST)
-					widget = create_blist_field(field);
 				else
 					continue;
 
@@ -1648,10 +1505,10 @@
 
 	if ((data->u.file.savedialog == TRUE) &&
 		(g_file_test(data->u.file.name, G_FILE_TEST_EXISTS))) {
-		purple_request_action_with_hint(data, NULL, _("That file already exists"),
+		purple_request_action(data, NULL, _("That file already exists"),
 							_("Would you like to overwrite it?"), 0,
 							NULL, NULL, NULL,
-							"pidgin-request-file", data, 2,
+							data, 2,
 							_("Overwrite"), G_CALLBACK(file_yes_no_cb),
 							_("Choose New Name"), G_CALLBACK(file_yes_no_cb));
 	} else
@@ -1676,7 +1533,7 @@
 					  gboolean savedialog,
 					  GCallback ok_cb, GCallback cancel_cb,
 					  PurpleAccount *account, const char *who, PurpleConversation *conv,
-					  const char *ui_hint, void *user_data)
+					  void *user_data)
 {
 	PidginRequestData *data;
 	GtkWidget *filesel;
@@ -1764,9 +1621,6 @@
 	g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(filesel)->ok_button), "clicked",
 					 G_CALLBACK(file_ok_check_if_exists_cb), data);
 #endif /* FILECHOOSER */
-	gtk_window_set_role(GTK_WINDOW(filesel), "pidgin-request-file");
-	gtk_window_set_transient_for(GTK_WINDOW(filesel),
-		get_request_parent(ui_hint, conv ? PIDGIN_CONVERSATION(conv) : NULL));
 
 	data->dialog = filesel;
 	gtk_widget_show(filesel);
@@ -1778,7 +1632,7 @@
 pidgin_request_folder(const char *title, const char *dirname,
 					  GCallback ok_cb, GCallback cancel_cb,
 					  PurpleAccount *account, const char *who, PurpleConversation *conv,
-					  const char *ui_hint, void *user_data)
+					  void *user_data)
 {
 	PidginRequestData *data;
 	GtkWidget *dirsel;
@@ -1817,9 +1671,6 @@
 	g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(dirsel)->ok_button), "clicked",
 					 G_CALLBACK(file_ok_check_if_exists_cb), data);
 #endif
-	gtk_window_set_role(GTK_WINDOW(dirsel), "pidgin-request-dir");
-	gtk_window_set_transient_for(GTK_WINDOW(dirsel),
-		get_request_parent(ui_hint, conv ? PIDGIN_CONVERSATION(conv) : NULL));
 
 	data->dialog = dirsel;
 	gtk_widget_show(dirsel);
--- a/pidgin/gtksavedstatuses.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/pidgin/gtksavedstatuses.c	Sat Nov 17 19:41:05 2007 +0000
@@ -338,9 +338,9 @@
 		handle = dialog;
 	}
 
-	purple_request_action_with_hint(handle, NULL, title, NULL, 0,
+	purple_request_action(handle, NULL, title, NULL, 0,
 		 NULL, NULL, NULL,
-		 PURPLE_REQUEST_UI_HINT_STATUSMGR, sel_titles, 2,
+		 sel_titles, 2,
 		_("Delete"), status_window_delete_confirm_cb,
 		_("Cancel"), status_window_delete_cancel_cb);
 
--- a/pidgin/gtkstatusbox.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/pidgin/gtkstatusbox.c	Sat Nov 17 19:41:05 2007 +0000
@@ -1586,9 +1586,9 @@
 
 	msg = g_strdup_printf(_("Are you sure you want to delete %s?"), purple_savedstatus_get_title(saved));
 
-	purple_request_action_with_hint(saved, NULL, msg, NULL, 0,
+	purple_request_action(saved, NULL, msg, NULL, 0,
 		NULL, NULL, NULL,
-		"pidgin-statusbox", data, 2,
+		data, 2,
 		_("Delete"), tree_view_delete_current_selection_cb,
 		_("Cancel"), NULL);
 
--- a/pidgin/gtkutils.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/pidgin/gtkutils.c	Sat Nov 17 19:41:05 2007 +0000
@@ -1531,26 +1531,26 @@
 				ft = TRUE;
 
 			if (im && ft)
-				purple_request_choice_with_hint(NULL, NULL,
+				purple_request_choice(NULL, NULL,
 						    _("You have dragged an image"),
 						    _("You can send this image as a file transfer, "
 						      "embed it into this message, or use it as the buddy icon for this user."),
 						    DND_FILE_TRANSFER, "OK", (GCallback)dnd_image_ok_callback,
 						    "Cancel", (GCallback)dnd_image_cancel_callback,
 							account, who, NULL,
-							PURPLE_REQUEST_UI_HINT_CONV, data,
+							data,
 							_("Set as buddy icon"), DND_BUDDY_ICON,
 						    _("Send image file"), DND_FILE_TRANSFER,
 						    _("Insert in message"), DND_IM_IMAGE,
 							NULL);
 			else if (!(im || ft))
-				purple_request_yes_no_with_hint(NULL, NULL, _("You have dragged an image"),
+				purple_request_yes_no(NULL, NULL, _("You have dragged an image"),
 							_("Would you like to set it as the buddy icon for this user?"),
 							0,
 							account, who, NULL,
-							PURPLE_REQUEST_UI_HINT_CONV, data, (GCallback)dnd_set_icon_ok_cb, (GCallback)dnd_set_icon_cancel_cb);
+							data, (GCallback)dnd_set_icon_ok_cb, (GCallback)dnd_set_icon_cancel_cb);
 			else
-				purple_request_choice_with_hint(NULL, NULL,
+				purple_request_choice(NULL, NULL,
 						    _("You have dragged an image"),
 						    (ft ? _("You can send this image as a file transfer, or use it as the buddy icon for this user.") :
 						    _("You can insert this image into this message, or use it as the buddy icon for this user")),
@@ -1558,7 +1558,7 @@
 							"OK", (GCallback)dnd_image_ok_callback,
 						    "Cancel", (GCallback)dnd_image_cancel_callback,
 							account, who, NULL,
-							PURPLE_REQUEST_UI_HINT_CONV, data,
+							data,
 						    _("Set as buddy icon"), DND_BUDDY_ICON,
 						    (ft ? _("Send image file") : _("Insert in message")), (ft ? DND_FILE_TRANSFER : DND_IM_IMAGE),
 							NULL);
--- a/pidgin/plugins/perl/common/GtkDialogs.xs	Sat Nov 17 18:26:03 2007 +0000
+++ b/pidgin/plugins/perl/common/GtkDialogs.xs	Sat Nov 17 19:41:05 2007 +0000
@@ -10,10 +10,6 @@
 pidgin_dialogs_about()
 
 void
-pidgin_dialogs_about_with_parent(parent)
-	void * parent
-
-void
 pidgin_dialogs_im()
 
 void
--- a/pidgin/plugins/perl/common/GtkLog.xs	Sat Nov 17 18:26:03 2007 +0000
+++ b/pidgin/plugins/perl/common/GtkLog.xs	Sat Nov 17 19:41:05 2007 +0000
@@ -13,27 +13,11 @@
 	Purple::Account account
 
 void
-pidgin_log_show_with_parent(parent, type, screenname, account)
-	void * parent
-	Purple::LogType type
-	const char * screenname
-	Purple::Account account
-
-void
 pidgin_log_show_contact(contact)
 	Purple::BuddyList::Contact contact
 
-void
-pidgin_log_show_contact_with_parent(parent, contact)
-	void * parent
-	Purple::BuddyList::Contact contact
-
 MODULE = Pidgin::Log  PACKAGE = Pidgin::SysLog  PREFIX = pidgin_syslog_
 PROTOTYPES: ENABLE
 
 void
 pidgin_syslog_show()
-
-void
-pidgin_syslog_show_with_parent(parent)
-	void * parent
--- a/pidgin/plugins/perl/common/GtkPlugin.xs	Sat Nov 17 18:26:03 2007 +0000
+++ b/pidgin/plugins/perl/common/GtkPlugin.xs	Sat Nov 17 19:41:05 2007 +0000
@@ -11,7 +11,3 @@
 
 void
 pidgin_plugin_dialog_show()
-
-void
-pidgin_plugin_dialog_show_with_parent(parent)
-	void * parent
--- a/pidgin/plugins/perl/common/GtkPounce.xs	Sat Nov 17 18:26:03 2007 +0000
+++ b/pidgin/plugins/perl/common/GtkPounce.xs	Sat Nov 17 19:41:05 2007 +0000
@@ -9,13 +9,6 @@
 	const char * name
 	Purple::Pounce cur_pounce
 
-void
-pidgin_pounce_editor_show_with_parent(parent, account, name, cur_pounce)
-	void * parent
-	Purple::Account account
-	const char * name
-	Purple::Pounce cur_pounce
-
 MODULE = Pidgin::Pounce  PACKAGE = Pidgin::Pounces  PREFIX = pidgin_pounces_
 PROTOTYPES: ENABLE
 
@@ -29,8 +22,4 @@
 pidgin_pounces_manager_show()
 
 void
-pidgin_pounces_manager_show_with_parent(parent)
-	void * parent
-
-void
 pidgin_pounces_manager_hide()
--- a/pidgin/win32/gtkwin32dep.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/pidgin/win32/gtkwin32dep.c	Sat Nov 17 19:41:05 2007 +0000
@@ -242,7 +242,7 @@
 
 	/* Create the window */
 	if(!(win_hwnd = CreateWindow(wname, TEXT("WinpidginMsgWin"), 0, 0, 0, 0, 0,
-			NULL, NULL, winpidgin_exe_hinstance(), 0))) {
+			HWND_MESSAGE, NULL, winpidgin_exe_hinstance(), 0))) {
 		purple_debug_error("winpidgin",
 			"Unable to create message window.\n");
 		return NULL;
--- a/pidgin/win32/winpidgin.c	Sat Nov 17 18:26:03 2007 +0000
+++ b/pidgin/win32/winpidgin.c	Sat Nov 17 19:41:05 2007 +0000
@@ -454,7 +454,7 @@
 
 			printf("An instance of Pidgin is already running.\n");
 
-			if((msg_win = FindWindow(TEXT("WinpidginMsgWinCls"), NULL)))
+			if((msg_win = FindWindowEx(HWND_MESSAGE, NULL, TEXT("WinpidginMsgWinCls"), NULL)))
 				if(SendMessage(msg_win, PIDGIN_WM_FOCUS_REQUEST, (WPARAM) NULL, (LPARAM) NULL))
 					return FALSE;
 
@@ -494,7 +494,7 @@
 		return;
 	}
 
-	if (!(msg_win = FindWindow(TEXT("WinpidginMsgWinCls"), NULL))) {
+	if (!(msg_win = FindWindowEx(HWND_MESSAGE, NULL, TEXT("WinpidginMsgWinCls"), NULL))) {
 		printf("Unable to find an instance of Pidgin to handle protocol message.\n");
 		return;
 	}
--- a/po/ChangeLog	Sat Nov 17 18:26:03 2007 +0000
+++ b/po/ChangeLog	Sat Nov 17 19:41:05 2007 +0000
@@ -4,6 +4,7 @@
 	* Afrikaans translation added (Friedel Wolff)
 	* Belarusian Latin translation updated (Ihar Hrachyshka)
 	* Catalan translation updated (Josep Puigdemont)
+	* Chinese (Hong Kong) translation updated (Ambrose C. Li)
 	* Chinese (Simplified) translation updated (Funda Wang)
 	* Chinese (Traditional) translation updated (Ambrose C. Li)
 	* Estonian translation updated (Ivar Smolin)
@@ -16,11 +17,15 @@
 	* Italian translation updated (Claudio Satriano)
 	* Korean translation updated (Sushizang)
 	* Norwegian Bokmål translation updated (Hallvard Glad)
+	* Portuguese (Brazilian) translation updated (Mauricio de
+	  L R Collares Neto)
 	* Punjabi translation updated (Amanpreet Singh Alam)
+	* Romanian translation updated (Mişu Moldovan)
 	* Russian translation updated (Dmitry Beloglazov)
 	* Slovak translation updated (loptosko)
 	* Slovenian translation updated (Martin Srebotnjak)
 	* Swedish translation updated (Peter Hjalmarsson)
+	* Telugu translation updated (RKVS Raman)
 	* Urdu translation added (RKVS Raman)
 
 version 2.2.1
--- a/po/de.po	Sat Nov 17 18:26:03 2007 +0000
+++ b/po/de.po	Sat Nov 17 19:41:05 2007 +0000
@@ -11,8 +11,8 @@
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-11-15 10:37+0100\n"
-"PO-Revision-Date: 2007-11-15 10:36+0100\n"
+"POT-Creation-Date: 2007-11-17 16:16+0100\n"
+"PO-Revision-Date: 2007-11-17 16:14+0100\n"
 "Last-Translator: Bjoern Voigt <bjoern@cs.tu-berlin.de>\n"
 "Language-Team: Deutsch <de@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -1458,7 +1458,7 @@
 msgstr "SSL-Zertifikatfehler"
 
 msgid "Invalid certificate chain"
-msgstr "Ungültige Zertifizierungskette"
+msgstr "Ungültige Zertifikationskette"
 
 #. vrq will be completed by user_auth
 msgid ""
@@ -1962,7 +1962,7 @@
 "Automatisch akzeptierte Übertragung der Datei „%s“ von „%s“ abgeschlossen."
 
 msgid "Autoaccept complete"
-msgstr "Auto-Akzeptieren fertig"
+msgstr "Autoaccept fertig"
 
 #, c-format
 msgid "When a file-transfer request arrives from %s"
@@ -3495,7 +3495,7 @@
 msgstr "Mehrbenutzer-Chat"
 
 msgid "Multi-User Chat Extended Presence Information"
-msgstr "Erweiterte Anwesenheitsinformation im Mehrbenutzer-Chat "
+msgstr "Erweiterte Anwesenheitsinformation im Mehrbenutzer-Chat"
 
 msgid "In-Band Bytestreams"
 msgstr "Bandinterner Bytestrom("
@@ -6095,13 +6095,6 @@
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#. *
-#. * @since 2.3.0
-#.
-#. *
-#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#. *
-#. * @deprecated Please use purple_request_ok_cancel_with_hint instead.
 #.
 msgid "_OK"
 msgstr "_OK"
@@ -8889,7 +8882,7 @@
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
 msgstr ""
-"%s hat Ihnen eine Webcam-Einladung gesendet, die noch nicht unterstützt wird."
+"%s hat Ihnen eine Webcam-Einladung gesenden, die noch nicht unterstützt wird."
 
 msgid "Your Yahoo! message did not get sent."
 msgstr "Ihre Yahoo!-Nachricht wurde nicht verschickt."
@@ -9035,7 +9028,7 @@
 msgid "Activate which ID?"
 msgstr "Welche ID aktivieren?"
 
-msgid "Join who in chat?"
+msgid "Join whom in chat?"
 msgstr "Wen wollen Sie zum Chat einladen?"
 
 msgid "Activate ID..."
@@ -9419,13 +9412,6 @@
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
-#. *
-#. * @since 2.3.0
-#.
-#. *
-#. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
-#. *
-#. * @deprecated Please use purple_request_yes_no_with_hint instead.
 #.
 msgid "_Yes"
 msgstr "_Ja"
@@ -9435,13 +9421,6 @@
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
-#. *
-#. * @since 2.3.0
-#.
-#. *
-#. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
-#. *
-#. * @deprecated Please use purple_request_accept_cancel_with_hint instead.
 #.
 msgid "_Accept"
 msgstr "_Akzeptieren"
@@ -10183,7 +10162,7 @@
 msgstr "Bitte geben Sie den Namen der Gruppe ein, die hinzugefügt werden soll."
 
 msgid "<PurpleMain>/Accounts/"
-msgstr "<PurpleMain>/Konten"
+msgstr "<PurpleMain>/Konten/"
 
 msgid "_Edit Account"
 msgstr "Konto _bearbeiten"
@@ -10654,7 +10633,7 @@
 msgstr "Galizisch"
 
 msgid "Gujarati"
-msgstr "Gujaratisch"
+msgstr "Gujarati"
 
 msgid "Gujarati Language Team"
 msgstr "Gujaratisch-Team"
@@ -10717,7 +10696,7 @@
 msgstr "Norwegisch (Nynorsk)"
 
 msgid "Punjabi"
-msgstr "Punjabi"
+msgstr "Pandschabi"
 
 msgid "Polish"
 msgstr "Polnisch"
@@ -10753,7 +10732,7 @@
 msgstr "Schwedisch"
 
 msgid "Tamil"
-msgstr "Tamil"
+msgstr "Tamilisch"
 
 msgid "Telugu"
 msgstr "Telugu"
@@ -10841,9 +10820,6 @@
 msgid "_Name"
 msgstr "_Name"
 
-msgid "Buddy"
-msgstr "Buddy"
-
 msgid "_Account"
 msgstr "_Konto"
 
@@ -13140,3 +13116,6 @@
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 "Dieses Plugin ist nützlich zur Fehlersuche in XMPP-Servern oder -Clients."
+
+msgid "Buddy"
+msgstr "Buddy"
--- a/po/pt_BR.po	Sat Nov 17 18:26:03 2007 +0000
+++ b/po/pt_BR.po	Sat Nov 17 19:41:05 2007 +0000
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-28 15:32-0500\n"
-"PO-Revision-Date: 2007-09-14 00:00-0300\n"
+"POT-Creation-Date: 2007-11-15 12:04-0300\n"
+"PO-Revision-Date: 2007-11-15 12:04-0300\n"
 "Last-Translator: Maurício de Lemos Rodrigues Collares Neto <mauricioc@gmail."
 "com>\n"
 "Language-Team: Maurício de Lemos Rodrigues Collares Neto <mauricioc@gmail."
@@ -49,7 +49,7 @@
 "  -n, --nologin       não conecte automaticamente\n"
 "  -v, --version       exiba a versão atual e saia\n"
 
-#: ../finch/finch.c:328 ../pidgin/gtkmain.c:711
+#: ../finch/finch.c:328 ../pidgin/gtkmain.c:730
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -61,17 +61,17 @@
 "relate este erro em http://developer.pidgin.im"
 
 #: ../finch/gntaccount.c:124 ../finch/gntaccount.c:484 ../finch/gntblist.c:300
-#: ../finch/gntblist.c:433 ../finch/gntblist.c:446 ../finch/gntplugin.c:186
-#: ../finch/gntplugin.c:234 ../finch/gntstatus.c:301 ../finch/gntstatus.c:310
+#: ../finch/gntblist.c:433 ../finch/gntblist.c:446 ../finch/gntplugin.c:189
+#: ../finch/gntplugin.c:237 ../finch/gntstatus.c:301 ../finch/gntstatus.c:310
 #: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
 #: ../finch/plugins/gntclipboard.c:128
-#: ../libpurple/protocols/jabber/buddy.c:2029
+#: ../libpurple/protocols/jabber/buddy.c:2032
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1515
+#: ../libpurple/protocols/jabber/jabber.c:1553
 #: ../libpurple/protocols/qq/group_join.c:328
 #: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:57
-#: ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/silc/ops.c:1460
 #: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "Erro"
@@ -100,8 +100,8 @@
 msgid "(You probably forgot to 'make install'.)"
 msgstr "(Provavelmente você esqueceu de digitar 'make install')"
 
-#: ../finch/gntaccount.c:496 ../finch/gntconn.c:136
-#: ../pidgin/gtkaccount.c:1473 ../pidgin/gtkblist.c:4040
+#: ../finch/gntaccount.c:496 ../finch/gntconn.c:137
+#: ../pidgin/gtkaccount.c:1478 ../pidgin/gtkblist.c:4501
 msgid "Modify Account"
 msgstr "Modificar conta"
 
@@ -131,32 +131,36 @@
 #: ../finch/gntaccount.c:575 ../finch/gntaccount.c:638
 #: ../finch/gntaccount.c:889 ../finch/gntblist.c:344 ../finch/gntblist.c:421
 #: ../finch/gntblist.c:456 ../finch/gntblist.c:803 ../finch/gntblist.c:1005
-#: ../finch/gntblist.c:1101 ../finch/gntblist.c:2222 ../finch/gntcertmgr.c:91
-#: ../finch/gntplugin.c:379 ../finch/gntpounce.c:459 ../finch/gntpounce.c:667
-#: ../finch/gntprefs.c:265 ../finch/gntsound.c:1058 ../finch/gntstatus.c:145
-#: ../finch/gntstatus.c:485 ../finch/gntstatus.c:610
-#: ../libpurple/account.c:1013 ../libpurple/account.c:1263
-#: ../libpurple/account.c:1298 ../libpurple/conversation.c:1215
-#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:507
-#: ../libpurple/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803
-#: ../libpurple/protocols/gg/gg.c:884
+#: ../finch/gntblist.c:1101 ../finch/gntblist.c:2226 ../finch/gntblist.c:2289
+#: ../finch/gntcertmgr.c:91 ../finch/gntplugin.c:475 ../finch/gntpounce.c:472
+#: ../finch/gntpounce.c:680 ../finch/gntprefs.c:265 ../finch/gntsound.c:1058
+#: ../finch/gntstatus.c:145 ../finch/gntstatus.c:485 ../finch/gntstatus.c:610
+#: ../finch/plugins/gnthistory.c:181 ../libpurple/account.c:1105
+#: ../libpurple/account.c:1394 ../libpurple/account.c:1429
+#: ../libpurple/conversation.c:1215 ../libpurple/plugins/buddynote.c:51
+#: ../libpurple/protocols/gg/gg.c:508 ../libpurple/protocols/gg/gg.c:667
+#: ../libpurple/protocols/gg/gg.c:804 ../libpurple/protocols/gg/gg.c:886
 #: ../libpurple/protocols/jabber/buddy.c:728
-#: ../libpurple/protocols/jabber/buddy.c:2413
-#: ../libpurple/protocols/jabber/buddy.c:2449
+#: ../libpurple/protocols/jabber/buddy.c:2426
+#: ../libpurple/protocols/jabber/buddy.c:2462
 #: ../libpurple/protocols/jabber/chat.c:786
-#: ../libpurple/protocols/jabber/jabber.c:1008
-#: ../libpurple/protocols/jabber/jabber.c:1017
-#: ../libpurple/protocols/jabber/jabber.c:1737
+#: ../libpurple/protocols/jabber/jabber.c:1035
+#: ../libpurple/protocols/jabber/jabber.c:1044
+#: ../libpurple/protocols/jabber/jabber.c:1746
 #: ../libpurple/protocols/jabber/si.c:874
-#: ../libpurple/protocols/jabber/usermood.c:184
+#: ../libpurple/protocols/jabber/usermood.c:202
 #: ../libpurple/protocols/jabber/usernick.c:78
 #: ../libpurple/protocols/jabber/xdata.c:400
-#: ../libpurple/protocols/msn/msn.c:287 ../libpurple/protocols/msn/msn.c:304
-#: ../libpurple/protocols/msn/msn.c:321 ../libpurple/protocols/msn/msn.c:338
-#: ../libpurple/protocols/msn/msn.c:359
-#: ../libpurple/protocols/oscar/oscar.c:6094
-#: ../libpurple/protocols/oscar/peer.c:1046
-#: ../libpurple/protocols/qq/buddy_info.c:484
+#: ../libpurple/protocols/msn/msn.c:291 ../libpurple/protocols/msn/msn.c:308
+#: ../libpurple/protocols/msn/msn.c:325 ../libpurple/protocols/msn/msn.c:342
+#: ../libpurple/protocols/msn/msn.c:363 ../libpurple/protocols/msnp9/msn.c:287
+#: ../libpurple/protocols/msnp9/msn.c:304
+#: ../libpurple/protocols/msnp9/msn.c:321
+#: ../libpurple/protocols/msnp9/msn.c:338
+#: ../libpurple/protocols/msnp9/msn.c:359
+#: ../libpurple/protocols/oscar/oscar.c:6144
+#: ../libpurple/protocols/oscar/peer.c:1048
+#: ../libpurple/protocols/qq/buddy_info.c:525
 #: ../libpurple/protocols/qq/buddy_opt.c:214
 #: ../libpurple/protocols/qq/buddy_opt.c:411
 #: ../libpurple/protocols/qq/group.c:124
@@ -167,60 +171,60 @@
 #: ../libpurple/protocols/qq/sys_msg.c:113
 #: ../libpurple/protocols/qq/sys_msg.c:172
 #: ../libpurple/protocols/qq/sys_msg.c:266
-#: ../libpurple/protocols/sametime/sametime.c:3388
-#: ../libpurple/protocols/sametime/sametime.c:3474
-#: ../libpurple/protocols/sametime/sametime.c:3645
-#: ../libpurple/protocols/sametime/sametime.c:5397
-#: ../libpurple/protocols/sametime/sametime.c:5487
-#: ../libpurple/protocols/sametime/sametime.c:5612
+#: ../libpurple/protocols/sametime/sametime.c:3430
+#: ../libpurple/protocols/sametime/sametime.c:3516
+#: ../libpurple/protocols/sametime/sametime.c:3690
+#: ../libpurple/protocols/sametime/sametime.c:5443
+#: ../libpurple/protocols/sametime/sametime.c:5533
+#: ../libpurple/protocols/sametime/sametime.c:5658
 #: ../libpurple/protocols/silc/buddy.c:455
-#: ../libpurple/protocols/silc/buddy.c:1076
-#: ../libpurple/protocols/silc/buddy.c:1191
-#: ../libpurple/protocols/silc/chat.c:616
-#: ../libpurple/protocols/silc/chat.c:746
-#: ../libpurple/protocols/silc/ops.c:1816
-#: ../libpurple/protocols/silc/silc.c:823
-#: ../libpurple/protocols/silc/silc.c:1031
+#: ../libpurple/protocols/silc/buddy.c:1079
+#: ../libpurple/protocols/silc/buddy.c:1194
+#: ../libpurple/protocols/silc/chat.c:620
+#: ../libpurple/protocols/silc/chat.c:750
+#: ../libpurple/protocols/silc/ops.c:1820
+#: ../libpurple/protocols/silc/silc.c:966
+#: ../libpurple/protocols/silc/silc.c:1174
 #: ../libpurple/protocols/silc10/buddy.c:468
-#: ../libpurple/protocols/silc10/buddy.c:1084
-#: ../libpurple/protocols/silc10/buddy.c:1189
+#: ../libpurple/protocols/silc10/buddy.c:1087
+#: ../libpurple/protocols/silc10/buddy.c:1192
 #: ../libpurple/protocols/silc10/chat.c:600
 #: ../libpurple/protocols/silc10/chat.c:730
 #: ../libpurple/protocols/silc10/ops.c:1904
 #: ../libpurple/protocols/silc10/silc.c:736
-#: ../libpurple/protocols/silc10/silc.c:942
-#: ../libpurple/protocols/yahoo/yahoo.c:1032
-#: ../libpurple/protocols/yahoo/yahoo.c:3498
-#: ../libpurple/protocols/yahoo/yahoo.c:3509 ../pidgin/gtkaccount.c:1908
-#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:5967
-#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:773
-#: ../pidgin/gtkdialogs.c:912 ../pidgin/gtkdialogs.c:1004
-#: ../pidgin/gtkdialogs.c:1024 ../pidgin/gtkdialogs.c:1048
-#: ../pidgin/gtkdialogs.c:1070 ../pidgin/gtkdialogs.c:1118
-#: ../pidgin/gtkdialogs.c:1159 ../pidgin/gtkdialogs.c:1215
-#: ../pidgin/gtkdialogs.c:1254 ../pidgin/gtkdialogs.c:1281
-#: ../pidgin/gtkimhtmltoolbar.c:435 ../pidgin/gtklog.c:328
-#: ../pidgin/gtkplugin.c:289 ../pidgin/gtkpounce.c:1101
-#: ../pidgin/gtkprivacy.c:563 ../pidgin/gtkprivacy.c:579
-#: ../pidgin/gtkprivacy.c:604 ../pidgin/gtkprivacy.c:618
-#: ../pidgin/gtkrequest.c:271 ../pidgin/gtksavedstatuses.c:345
-#: ../pidgin/gtkstatusbox.c:1574
+#: ../libpurple/protocols/silc10/silc.c:943
+#: ../libpurple/protocols/yahoo/yahoo.c:1034
+#: ../libpurple/protocols/yahoo/yahoo.c:3509
+#: ../libpurple/protocols/yahoo/yahoo.c:3520 ../pidgin/gtkaccount.c:1913
+#: ../pidgin/gtkaccount.c:2501 ../pidgin/gtkblist.c:6678
+#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:789
+#: ../pidgin/gtkdialogs.c:928 ../pidgin/gtkdialogs.c:1020
+#: ../pidgin/gtkdialogs.c:1040 ../pidgin/gtkdialogs.c:1064
+#: ../pidgin/gtkdialogs.c:1086 ../pidgin/gtkdialogs.c:1134
+#: ../pidgin/gtkdialogs.c:1175 ../pidgin/gtkdialogs.c:1231
+#: ../pidgin/gtkdialogs.c:1270 ../pidgin/gtkdialogs.c:1297
+#: ../pidgin/gtkimhtmltoolbar.c:437 ../pidgin/gtklog.c:328
+#: ../pidgin/gtkplugin.c:289 ../pidgin/gtkpounce.c:1121
+#: ../pidgin/gtkprivacy.c:565 ../pidgin/gtkprivacy.c:581
+#: ../pidgin/gtkprivacy.c:606 ../pidgin/gtkprivacy.c:620
+#: ../pidgin/gtkrequest.c:321 ../pidgin/gtksavedstatuses.c:345
+#: ../pidgin/gtkstatusbox.c:1593
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:311
-#: ../finch/gntplugin.c:379 ../finch/gntpounce.c:465 ../finch/gntprefs.c:265
+#: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:311 ../finch/gntdebug.c:297
+#: ../finch/gntplugin.c:475 ../finch/gntpounce.c:478 ../finch/gntprefs.c:265
 #: ../finch/gntsound.c:1055 ../finch/gntstatus.c:488 ../finch/gntstatus.c:598
-#: ../libpurple/account.c:1297 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:727 ../pidgin/gtkdebug.c:749
-#: ../pidgin/gtkrequest.c:277
+#: ../libpurple/account.c:1428 ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:727 ../pidgin/gtkdebug.c:754
+#: ../pidgin/gtkrequest.c:327
 msgid "Save"
 msgstr "Salvar"
 
-#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1900
-#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1568
+#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1905
+#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1587
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Você tem certeza de que deseja remover %s?"
@@ -231,16 +235,16 @@
 
 #. Delete button
 #: ../finch/gntaccount.c:637 ../finch/gntaccount.c:707
-#: ../finch/gntcertmgr.c:319 ../finch/gntpounce.c:666 ../finch/gntpounce.c:729
+#: ../finch/gntcertmgr.c:319 ../finch/gntpounce.c:679 ../finch/gntpounce.c:742
 #: ../finch/gntstatus.c:144 ../finch/gntstatus.c:210
-#: ../pidgin/gtkaccount.c:1907 ../pidgin/gtklog.c:327
-#: ../pidgin/gtkpounce.c:1100 ../pidgin/gtkrequest.c:274
-#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1573
+#: ../pidgin/gtkaccount.c:1912 ../pidgin/gtklog.c:327
+#: ../pidgin/gtkpounce.c:1120 ../pidgin/gtkrequest.c:324
+#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1592
 msgid "Delete"
 msgstr "Remover"
 
-#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2119 ../finch/gntui.c:82
-#: ../pidgin/gtkaccount.c:2325 ../pidgin/gtkdocklet.c:522
+#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2123 ../finch/gntui.c:82
+#: ../pidgin/gtkaccount.c:2331 ../pidgin/gtkdocklet.c:715
 msgid "Accounts"
 msgstr "Contas"
 
@@ -250,51 +254,52 @@
 
 #. Add button
 #: ../finch/gntaccount.c:698 ../finch/gntaccount.c:888 ../finch/gntblist.c:343
-#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntcertmgr.c:306
-#: ../finch/gntnotify.c:380 ../finch/gntpounce.c:713 ../finch/gntstatus.c:199
-#: ../libpurple/protocols/gg/gg.c:883 ../libpurple/protocols/qq/sys_msg.c:114
+#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntblist.c:2381
+#: ../finch/gntcertmgr.c:306 ../finch/gntnotify.c:385 ../finch/gntpounce.c:726
+#: ../finch/gntstatus.c:199 ../libpurple/protocols/gg/gg.c:885
+#: ../libpurple/protocols/qq/sys_msg.c:114
 #: ../libpurple/protocols/qq/sys_msg.c:173
 #: ../libpurple/protocols/qq/sys_msg.c:267
-#: ../libpurple/protocols/sametime/sametime.c:5486
-#: ../libpurple/protocols/silc/chat.c:615
-#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2494
-#: ../pidgin/gtkblist.c:5966 ../pidgin/gtkconv.c:1659
-#: ../pidgin/gtkrequest.c:275
+#: ../libpurple/protocols/sametime/sametime.c:5532
+#: ../libpurple/protocols/silc/chat.c:619
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2500
+#: ../pidgin/gtkblist.c:6677 ../pidgin/gtkconv.c:1713
+#: ../pidgin/gtkrequest.c:325
 msgid "Add"
 msgstr "Adicionar"
 
 #. Modify button
-#: ../finch/gntaccount.c:703 ../finch/gntpounce.c:721
+#: ../finch/gntaccount.c:703 ../finch/gntpounce.c:734
 msgid "Modify"
 msgstr "Modificar"
 
-#: ../finch/gntaccount.c:811 ../pidgin/gtkaccount.c:2441
+#: ../finch/gntaccount.c:811 ../pidgin/gtkaccount.c:2447
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s fez de %s seu amigo(a)%s%s"
 
-#: ../finch/gntaccount.c:884 ../pidgin/gtkaccount.c:2493
+#: ../finch/gntaccount.c:884 ../pidgin/gtkaccount.c:2499
 msgid "Add buddy to your list?"
 msgstr "Adicionar amigo à sua lista?"
 
-#: ../finch/gntaccount.c:944 ../pidgin/gtkaccount.c:2551
+#: ../finch/gntaccount.c:944 ../pidgin/gtkaccount.c:2557
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "%s%s%s%s quer adicionar %s a lista de amigos dele(a)%s%s"
 
 #: ../finch/gntaccount.c:969 ../finch/gntaccount.c:972
-#: ../finch/gntaccount.c:999 ../pidgin/gtkaccount.c:2574
-#: ../pidgin/gtkaccount.c:2580
+#: ../finch/gntaccount.c:999 ../pidgin/gtkaccount.c:2580
+#: ../pidgin/gtkaccount.c:2586
 msgid "Authorize buddy?"
 msgstr "Autorizar amigo?"
 
 #: ../finch/gntaccount.c:976 ../finch/gntaccount.c:1003
-#: ../pidgin/gtkaccount.c:2575 ../pidgin/gtkaccount.c:2581
+#: ../pidgin/gtkaccount.c:2581 ../pidgin/gtkaccount.c:2587
 msgid "Authorize"
 msgstr "Autorizar"
 
 #: ../finch/gntaccount.c:977 ../finch/gntaccount.c:1004
-#: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
+#: ../pidgin/gtkaccount.c:2582 ../pidgin/gtkaccount.c:2588
 msgid "Deny"
 msgstr "Negar"
 
@@ -318,20 +323,21 @@
 msgid "Error adding buddy"
 msgstr "Erro ao adicionar amigo"
 
-#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2888
-#: ../pidgin/gtkaccount.c:1981 ../pidgin/gtksavedstatuses.c:980
+#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2898
+#: ../pidgin/gtkaccount.c:1986 ../pidgin/gtksavedstatuses.c:986
 msgid "Screen Name"
 msgstr "Nome de usuário"
 
 #: ../finch/gntblist.c:328 ../finch/gntblist.c:410 ../finch/gntblist.c:1250
-#: ../libpurple/protocols/msn/msn.c:1395
-#: ../libpurple/protocols/silc/chat.c:606
+#: ../libpurple/protocols/msn/msn.c:1551
+#: ../libpurple/protocols/msnp9/msn.c:1402
+#: ../libpurple/protocols/silc/chat.c:610
 #: ../libpurple/protocols/silc10/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:704
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1023
-#: ../pidgin/gtkdialogs.c:1047 ../pidgin/gtkdialogs.c:1069
-#: ../pidgin/gtkrequest.c:278
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1039
+#: ../pidgin/gtkdialogs.c:1063 ../pidgin/gtkdialogs.c:1085
+#: ../pidgin/gtkrequest.c:328
 msgid "Alias"
 msgstr "Apelido"
 
@@ -340,23 +346,24 @@
 msgstr "Grupo"
 
 #: ../finch/gntblist.c:335 ../finch/gntblist.c:401 ../finch/gntblist.c:1305
-#: ../finch/gntnotify.c:174 ../finch/gntstatus.c:576
-#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:3008 ../pidgin/gtknotify.c:506
-#: ../pidgin/gtkpounce.c:1268 ../pidgin/plugins/gevolution/gevolution.c:445
+#: ../finch/gntblist.c:2212 ../finch/gntblist.c:2276 ../finch/gntnotify.c:174
+#: ../finch/gntstatus.c:576 ../libpurple/plugins/idle.c:153
+#: ../libpurple/plugins/idle.c:190 ../pidgin/gtkblist.c:3242
+#: ../pidgin/gtknotify.c:512 ../pidgin/gtkpounce.c:1288
+#: ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "Conta"
 
 #: ../finch/gntblist.c:341 ../finch/gntblist.c:852
 #: ../libpurple/protocols/silc/buddy.c:725
-#: ../libpurple/protocols/silc/buddy.c:1027
-#: ../libpurple/protocols/silc/buddy.c:1072
-#: ../libpurple/protocols/silc/buddy.c:1182
+#: ../libpurple/protocols/silc/buddy.c:1030
+#: ../libpurple/protocols/silc/buddy.c:1075
+#: ../libpurple/protocols/silc/buddy.c:1185
 #: ../libpurple/protocols/silc10/buddy.c:737
-#: ../libpurple/protocols/silc10/buddy.c:1033
-#: ../libpurple/protocols/silc10/buddy.c:1080
-#: ../libpurple/protocols/silc10/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3343 ../pidgin/gtkblist.c:5483
+#: ../libpurple/protocols/silc10/buddy.c:1036
+#: ../libpurple/protocols/silc10/buddy.c:1083
+#: ../libpurple/protocols/silc10/buddy.c:1183
+#: ../libpurple/protocols/yahoo/yahoo.c:3354 ../pidgin/gtkblist.c:6179
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "Adicionar amigo"
@@ -365,17 +372,21 @@
 msgid "Please enter buddy information."
 msgstr "Favor digitar as informações do amigo."
 
-#: ../finch/gntblist.c:370 ../libpurple/blist.c:1209
+#: ../finch/gntblist.c:370 ../libpurple/blist.c:1210
 msgid "Chats"
 msgstr "Bate-papos"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:407 ../libpurple/protocols/jabber/jabber.c:924
-#: ../libpurple/protocols/jabber/jabber.c:927
-#: ../libpurple/protocols/msn/msn.c:1584 ../libpurple/protocols/msn/msn.c:1649
-#: ../libpurple/protocols/msn/msn.c:1676
-#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:582
-#: ../pidgin/gtkroomlist.c:618
+#: ../finch/gntblist.c:407 ../finch/gntblist.c:2207
+#: ../libpurple/protocols/jabber/jabber.c:951
+#: ../libpurple/protocols/jabber/jabber.c:954
+#: ../libpurple/protocols/msn/msn.c:1732 ../libpurple/protocols/msn/msn.c:1797
+#: ../libpurple/protocols/msn/msn.c:1824
+#: ../libpurple/protocols/msnp9/msn.c:1585
+#: ../libpurple/protocols/msnp9/msn.c:1650
+#: ../libpurple/protocols/msnp9/msn.c:1677
+#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:608
+#: ../pidgin/gtkroomlist.c:931
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
@@ -385,7 +396,7 @@
 msgid "Auto-join"
 msgstr "Entrar automaticamente"
 
-#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:5859
+#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:6563
 msgid "Add Chat"
 msgstr "Adicionar bate-papo"
 
@@ -408,8 +419,8 @@
 msgstr "Um grupo com este nome já existe."
 
 #: ../finch/gntblist.c:454 ../finch/gntblist.c:856
-#: ../libpurple/protocols/sametime/sametime.c:5396
-#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5963
+#: ../libpurple/protocols/sametime/sametime.c:5442
+#: ../libpurple/protocols/sametime/sametime.c:5530 ../pidgin/gtkblist.c:6674
 msgid "Add Group"
 msgstr "Criar grupo"
 
@@ -441,8 +452,8 @@
 msgid "Retrieving..."
 msgstr "Obtendo..."
 
-#: ../finch/gntblist.c:904 ../finch/gntconv.c:507
-#: ../libpurple/protocols/silc/chat.c:899
+#: ../finch/gntblist.c:904 ../finch/gntconv.c:528
+#: ../libpurple/protocols/silc/chat.c:903
 #: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "Ver info"
@@ -452,16 +463,16 @@
 msgstr "Adicionar ação de usuário"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:915 ../finch/gntconv.c:519
+#: ../finch/gntblist.c:915 ../finch/gntconv.c:540
 #: ../libpurple/protocols/jabber/si.c:874
-#: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:587
-#: ../pidgin/gtkconv.c:1607
+#: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:588
+#: ../pidgin/gtkconv.c:1661
 msgid "Send File"
 msgstr "Enviar arquivo"
 
 #: ../finch/gntblist.c:919
 msgid "View Log"
-msgstr "Ver log"
+msgstr "Ver histórico"
 
 #: ../finch/gntblist.c:1000
 #, c-format
@@ -499,14 +510,14 @@
 msgstr "Confirmar remoção"
 
 #: ../finch/gntblist.c:1100 ../finch/gntblist.c:1252 ../finch/gntft.c:227
-#: ../pidgin/gtkconv.c:1656 ../pidgin/gtkrequest.c:276
+#: ../pidgin/gtkconv.c:1710 ../pidgin/gtkrequest.c:326
 #: ../pidgin/gtkstatusbox.c:264
 msgid "Remove"
 msgstr "Remover"
 
 #. Buddy List
-#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2307 ../finch/gntprefs.c:258
-#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2688 ../pidgin/gtkblist.c:4284
+#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2434 ../finch/gntprefs.c:258
+#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2908 ../pidgin/gtkblist.c:4937
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "Lista de amigos"
@@ -520,44 +531,49 @@
 msgstr "(Des)ativar marca"
 
 #. General
-#: ../finch/gntblist.c:1298 ../libpurple/protocols/gg/gg.c:637
-#: ../libpurple/protocols/gg/gg.c:1050 ../libpurple/protocols/gg/gg.c:1123
-#: ../libpurple/protocols/gg/gg.c:2207
+#: ../finch/gntblist.c:1298 ../libpurple/protocols/gg/gg.c:638
+#: ../libpurple/protocols/gg/gg.c:1052 ../libpurple/protocols/gg/gg.c:1125
+#: ../libpurple/protocols/gg/gg.c:2228
 #: ../libpurple/protocols/jabber/buddy.c:286
 #: ../libpurple/protocols/jabber/buddy.c:1247
-#: ../libpurple/protocols/jabber/buddy.c:2214
-#: ../libpurple/protocols/jabber/buddy.c:2396
-#: ../libpurple/protocols/jabber/jabber.c:937
-#: ../libpurple/protocols/jabber/jabber.c:1544
-#: ../libpurple/protocols/jabber/jabber.c:1567
-#: ../libpurple/protocols/jabber/jabber.c:1590
-#: ../libpurple/protocols/jabber/jabber.c:1613
-#: ../libpurple/protocols/jabber/jabber.c:1636
-#: ../libpurple/protocols/msn/msn.c:1403 ../libpurple/protocols/msn/msn.c:1587
+#: ../libpurple/protocols/jabber/buddy.c:2217
+#: ../libpurple/protocols/jabber/buddy.c:2409
+#: ../libpurple/protocols/jabber/jabber.c:964
+#: ../libpurple/protocols/jabber/jabber.c:1573
+#: ../libpurple/protocols/jabber/jabber.c:1587
+#: ../libpurple/protocols/jabber/jabber.c:1601
+#: ../libpurple/protocols/jabber/jabber.c:1615
+#: ../libpurple/protocols/jabber/jabber.c:1629
+#: ../libpurple/protocols/msn/msn.c:1559 ../libpurple/protocols/msn/msn.c:1735
+#: ../libpurple/protocols/msnp9/msn.c:1410
+#: ../libpurple/protocols/msnp9/msn.c:1588
 #: ../libpurple/protocols/qq/buddy_info.c:43
-#: ../libpurple/protocols/silc/buddy.c:1535
+#: ../libpurple/protocols/silc/buddy.c:1538
 #: ../libpurple/protocols/silc/ops.c:1002
 #: ../libpurple/protocols/silc/ops.c:1186
-#: ../libpurple/protocols/silc/ops.c:1322
-#: ../libpurple/protocols/silc10/buddy.c:1535
+#: ../libpurple/protocols/silc/ops.c:1324
+#: ../libpurple/protocols/silc10/buddy.c:1538
 #: ../libpurple/protocols/silc10/ops.c:1036
 #: ../libpurple/protocols/silc10/ops.c:1179
 #: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3032
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3266
 msgid "Nickname"
 msgstr "Apelido"
 
 #. Idle stuff
 #: ../finch/gntblist.c:1320 ../finch/gntprefs.c:261
-#: ../libpurple/protocols/bonjour/bonjour.c:340
+#: ../libpurple/protocols/bonjour/bonjour.c:359
 #: ../libpurple/protocols/jabber/buddy.c:787
 #: ../libpurple/protocols/jabber/buddy.c:951
-#: ../libpurple/protocols/msn/msn.c:544 ../libpurple/protocols/msn/state.c:32
-#: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2912
-#: ../libpurple/protocols/yahoo/yahoo.c:3097
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3060
-#: ../pidgin/gtkblist.c:3460 ../pidgin/gtkprefs.c:1925
+#: ../libpurple/protocols/msn/msn.c:611 ../libpurple/protocols/msn/msn.c:629
+#: ../libpurple/protocols/msn/msn.c:637 ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/msnp9/msn.c:544
+#: ../libpurple/protocols/msnp9/state.c:32
+#: ../libpurple/protocols/novell/novell.c:2842
+#: ../libpurple/protocols/oscar/oscar.c:2922
+#: ../libpurple/protocols/yahoo/yahoo.c:3108
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3294
+#: ../pidgin/gtkblist.c:3700 ../pidgin/gtkprefs.c:2026
 msgid "Idle"
 msgstr "Inativo"
 
@@ -588,36 +604,24 @@
 "\n"
 "Visto pela última vez: %s atrás"
 
-#: ../finch/gntblist.c:1702 ../pidgin/gtkdocklet.c:470
-#: ../pidgin/gtkstatusbox.c:1072
+#: ../finch/gntblist.c:1706 ../pidgin/gtkdocklet.c:582
 msgid "New..."
 msgstr "Novo..."
 
-#: ../finch/gntblist.c:1709 ../pidgin/gtkdocklet.c:471
-#: ../pidgin/gtkstatusbox.c:1073
+#: ../finch/gntblist.c:1713 ../pidgin/gtkdocklet.c:583
 msgid "Saved..."
 msgstr "Salvo..."
 
-#: ../finch/gntblist.c:2087 ../finch/gntplugin.c:255 ../finch/gntui.c:88
-#: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:531
+#: ../finch/gntblist.c:2091 ../finch/gntplugin.c:345 ../finch/gntui.c:88
+#: ../pidgin/gtkdocklet.c:716 ../pidgin/gtkplugin.c:555
 msgid "Plugins"
 msgstr "Plugins"
 
-#: ../finch/gntblist.c:2203 ../pidgin/gtkdialogs.c:754
-#: ../pidgin/gtkdialogs.c:893 ../pidgin/gtkdialogs.c:974
-msgid "_Name"
-msgstr "_Nome"
-
-#: ../finch/gntblist.c:2208 ../pidgin/gtkdialogs.c:759
-#: ../pidgin/gtkdialogs.c:898 ../pidgin/gtkdialogs.c:979
-msgid "_Account"
-msgstr "_Conta"
-
-#: ../finch/gntblist.c:2216 ../pidgin/gtkdialogs.c:767
+#: ../finch/gntblist.c:2220 ../pidgin/gtkdialogs.c:783
 msgid "New Instant Message"
 msgstr "Nova mensagem instantânea"
 
-#: ../finch/gntblist.c:2218 ../pidgin/gtkdialogs.c:769
+#: ../finch/gntblist.c:2222 ../pidgin/gtkdialogs.c:785
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr ""
@@ -627,70 +631,101 @@
 #. Not multiline
 #. Not masked?
 #. No hints?
-#: ../finch/gntblist.c:2221 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:135
-#: ../finch/gntnotify.c:80 ../libpurple/account.c:1012
-#: ../libpurple/account.c:1262 ../libpurple/protocols/gg/gg.c:506
-#: ../libpurple/protocols/gg/gg.c:665 ../libpurple/protocols/gg/gg.c:802
-#: ../libpurple/protocols/jabber/jabber.c:1736
+#: ../finch/gntblist.c:2225 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:136
+#: ../finch/gntnotify.c:80 ../finch/plugins/gnthistory.c:180
+#: ../libpurple/account.c:1104 ../libpurple/account.c:1393
+#: ../libpurple/protocols/gg/gg.c:507 ../libpurple/protocols/gg/gg.c:666
+#: ../libpurple/protocols/gg/gg.c:803
+#: ../libpurple/protocols/jabber/jabber.c:1745
 #: ../libpurple/protocols/jabber/xdata.c:399
-#: ../libpurple/protocols/msn/msn.c:286 ../libpurple/protocols/msn/msn.c:303
-#: ../libpurple/protocols/msn/msn.c:320 ../libpurple/protocols/msn/msn.c:337
-#: ../libpurple/protocols/oscar/oscar.c:6093
+#: ../libpurple/protocols/msn/msn.c:290 ../libpurple/protocols/msn/msn.c:307
+#: ../libpurple/protocols/msn/msn.c:324 ../libpurple/protocols/msn/msn.c:341
+#: ../libpurple/protocols/msnp9/msn.c:286
+#: ../libpurple/protocols/msnp9/msn.c:303
+#: ../libpurple/protocols/msnp9/msn.c:320
+#: ../libpurple/protocols/msnp9/msn.c:337
+#: ../libpurple/protocols/oscar/oscar.c:6143
 #: ../libpurple/protocols/silc/buddy.c:454
-#: ../libpurple/protocols/silc/buddy.c:1190
-#: ../libpurple/protocols/silc/chat.c:447
-#: ../libpurple/protocols/silc/chat.c:482
-#: ../libpurple/protocols/silc/chat.c:745
-#: ../libpurple/protocols/silc/ops.c:1291
-#: ../libpurple/protocols/silc/ops.c:1815
-#: ../libpurple/protocols/silc/silc.c:822
+#: ../libpurple/protocols/silc/buddy.c:1193
+#: ../libpurple/protocols/silc/chat.c:449
+#: ../libpurple/protocols/silc/chat.c:486
+#: ../libpurple/protocols/silc/chat.c:749
+#: ../libpurple/protocols/silc/ops.c:1293
+#: ../libpurple/protocols/silc/ops.c:1819
+#: ../libpurple/protocols/silc/silc.c:965
 #: ../libpurple/protocols/silc10/buddy.c:467
-#: ../libpurple/protocols/silc10/buddy.c:1188
+#: ../libpurple/protocols/silc10/buddy.c:1191
 #: ../libpurple/protocols/silc10/chat.c:425
 #: ../libpurple/protocols/silc10/chat.c:464
 #: ../libpurple/protocols/silc10/chat.c:729
 #: ../libpurple/protocols/silc10/ops.c:1297
 #: ../libpurple/protocols/silc10/ops.c:1903
 #: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/yahoo/yahoo.c:1031
-#: ../libpurple/protocols/yahoo/yahoo.c:3497
-#: ../libpurple/protocols/yahoo/yahoo.c:3508 ../pidgin/gtkblist.c:4039
-#: ../pidgin/gtkcertmgr.c:195 ../pidgin/gtkdialogs.c:772
-#: ../pidgin/gtkdialogs.c:911 ../pidgin/gtkdialogs.c:1003
-#: ../pidgin/gtkrequest.c:270
+#: ../libpurple/protocols/yahoo/yahoo.c:1033
+#: ../libpurple/protocols/yahoo/yahoo.c:3508
+#: ../libpurple/protocols/yahoo/yahoo.c:3519 ../pidgin/gtkcertmgr.c:195
+#: ../pidgin/gtkdialogs.c:788 ../pidgin/gtkdialogs.c:927
+#: ../pidgin/gtkdialogs.c:1019 ../pidgin/gtkrequest.c:320
 msgid "OK"
 msgstr "OK"
 
+#: ../finch/gntblist.c:2272
+msgid "Channel"
+msgstr "Canal"
+
+#: ../finch/gntblist.c:2284 ../pidgin/gtkblist.c:940
+msgid "Join a Chat"
+msgstr "Entrar em um bate-papo"
+
+#: ../finch/gntblist.c:2286
+msgid "Please enter the name of the chat you want to join."
+msgstr ""
+"Por favor digite a URL do bate-papo no qual você gostaria de ingressar."
+
+#: ../finch/gntblist.c:2288 ../finch/gntnotify.c:394
+msgid "Join"
+msgstr "Entrar"
+
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2241 ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:790
+#: ../finch/gntblist.c:2326 ../finch/gntpounce.c:460 ../pidgin/gtkpounce.c:810
 msgid "Options"
 msgstr "Opções"
 
-#: ../finch/gntblist.c:2247
+#: ../finch/gntblist.c:2332
 msgid "Send IM..."
 msgstr "Enviar MI..."
 
-#: ../finch/gntblist.c:2251
-#, fuzzy
-msgid "Show empty groups"
-msgstr "Exibir grupos vazios"
-
-#: ../finch/gntblist.c:2257
-#, fuzzy
-msgid "Show offline buddies"
-msgstr "Exibir amigos desconectados"
-
-#: ../finch/gntblist.c:2263
-msgid "Sort by status"
-msgstr "Ordenar por status"
-
-#: ../finch/gntblist.c:2267
-msgid "Sort alphabetically"
-msgstr "Ordenar alfabeticamente"
-
-#: ../finch/gntblist.c:2271
-msgid "Sort by log size"
-msgstr "Ordenar por tamanho do log"
+#: ../finch/gntblist.c:2337
+msgid "Join Chat..."
+msgstr "Entrar em um bate-papo..."
+
+#: ../finch/gntblist.c:2342
+msgid "Show"
+msgstr "Mostrar"
+
+#: ../finch/gntblist.c:2347
+msgid "Empty groups"
+msgstr "Grupos vazios"
+
+#: ../finch/gntblist.c:2354
+msgid "Offline buddies"
+msgstr "Amigos desconectados"
+
+#: ../finch/gntblist.c:2361
+msgid "Sort"
+msgstr "Ordenar"
+
+#: ../finch/gntblist.c:2366
+msgid "By Status"
+msgstr "Por status"
+
+#: ../finch/gntblist.c:2371 ../pidgin/gtkblist.c:4191
+msgid "Alphabetically"
+msgstr "Alfabeticamente"
+
+#: ../finch/gntblist.c:2376
+msgid "By Log Size"
+msgstr "Por tamanho do histórico"
 
 #: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:188
 msgid "Certificate Import"
@@ -777,43 +812,44 @@
 msgid "Confirm certificate delete"
 msgstr "Confirmação de remoção de certificado"
 
-#: ../finch/gntcertmgr.c:293 ../pidgin/gtkcertmgr.c:602
+#: ../finch/gntcertmgr.c:293 ../pidgin/gtkcertmgr.c:603
 msgid "Certificate Manager"
 msgstr "Gerenciador de certificados"
 
 #. Creating the user splits
-#: ../finch/gntcertmgr.c:298 ../libpurple/protocols/bonjour/bonjour.c:652
-#: ../libpurple/protocols/silc/silc.c:1007
+#: ../finch/gntcertmgr.c:298 ../libpurple/protocols/bonjour/bonjour.c:671
+#: ../libpurple/protocols/silc/silc.c:1150
 #: ../libpurple/protocols/silc10/silc.c:918
 msgid "Hostname"
 msgstr "Nome do host"
 
-#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:383 ../pidgin/gtkconv.c:1635
-#: ../pidgin/gtkdebug.c:835
+#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:388 ../pidgin/gtkconv.c:1689
+#: ../pidgin/gtkdebug.c:840
 msgid "Info"
 msgstr "Info"
 
 #. Close button
 #: ../finch/gntcertmgr.c:324 ../finch/gntft.c:237 ../finch/gntnotify.c:182
-#: ../finch/gntplugin.c:210 ../finch/gntplugin.c:310 ../finch/gntpounce.c:738
-#: ../finch/gntstatus.c:216 ../libpurple/protocols/msn/msn.c:403
-#: ../libpurple/protocols/silc/util.c:382
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2468
-#: ../pidgin/gtkrequest.c:273
+#: ../finch/gntplugin.c:213 ../finch/gntplugin.c:406 ../finch/gntpounce.c:751
+#: ../finch/gntstatus.c:216 ../libpurple/protocols/msn/msn.c:407
+#: ../libpurple/protocols/msnp9/msn.c:403
+#: ../libpurple/protocols/silc/util.c:388
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2474
+#: ../pidgin/gtkrequest.c:323
 msgid "Close"
 msgstr "Fechar"
 
-#: ../finch/gntconn.c:124
+#: ../finch/gntconn.c:125
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:127
+#: ../finch/gntconn.c:128
 #, c-format
 msgid "%s disconnected."
 msgstr "%s desconectado."
 
-#: ../finch/gntconn.c:128
+#: ../finch/gntconn.c:129
 #, c-format
 msgid ""
 "%s\n"
@@ -826,51 +862,51 @@
 "O Finch não tentará reconectar esta conta até que você corrija o erro e "
 "reative a mesma."
 
-#: ../finch/gntconn.c:137 ../pidgin/gtkblist.c:4041
+#: ../finch/gntconn.c:138
 msgid "Re-enable Account"
 msgstr "Re-ativar conta"
 
-#: ../finch/gntconv.c:139
+#: ../finch/gntconv.c:137
 msgid "No such command."
 msgstr "Comando inexistente."
 
-#: ../finch/gntconv.c:143 ../pidgin/gtkconv.c:489
+#: ../finch/gntconv.c:141 ../pidgin/gtkconv.c:531
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
 "Erro de sintaxe:  Você digitou um número incorreto de argumentos para este "
 "comando."
 
-#: ../finch/gntconv.c:148 ../pidgin/gtkconv.c:495
+#: ../finch/gntconv.c:146 ../pidgin/gtkconv.c:537
 msgid "Your command failed for an unknown reason."
 msgstr "Seu comando falhou por um motivo desconhecido."
 
-#: ../finch/gntconv.c:153 ../pidgin/gtkconv.c:502
+#: ../finch/gntconv.c:151 ../pidgin/gtkconv.c:544
 msgid "That command only works in chats, not IMs."
 msgstr "Este comando só funciona em bate-papos, não em conversas."
 
-#: ../finch/gntconv.c:156 ../pidgin/gtkconv.c:505
+#: ../finch/gntconv.c:154 ../pidgin/gtkconv.c:547
 msgid "That command only works in IMs, not chats."
 msgstr "Este comando só funciona em conversas, não em bate-papos."
 
-#: ../finch/gntconv.c:160 ../pidgin/gtkconv.c:510
+#: ../finch/gntconv.c:158 ../pidgin/gtkconv.c:552
 msgid "That command doesn't work on this protocol."
 msgstr "Este comando não funciona neste protocolo."
 
-#: ../finch/gntconv.c:168
+#: ../finch/gntconv.c:166
 msgid "Message was not sent, because you are not signed on."
 msgstr "A mensagem não pôde ser enviada porque você não está conectado."
 
-#: ../finch/gntconv.c:251
+#: ../finch/gntconv.c:245
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:274
+#: ../finch/gntconv.c:268
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:279 ../finch/gntconv.c:773
+#: ../finch/gntconv.c:273 ../finch/gntconv.c:795
 #, c-format
 msgid ""
 "\n"
@@ -879,69 +915,69 @@
 "\n"
 "%s está digitando..."
 
-#: ../finch/gntconv.c:298
+#: ../finch/gntconv.c:292
 msgid "You have left this chat."
 msgstr "Você saiu deste bate-papo."
 
-#: ../finch/gntconv.c:387 ../pidgin/gtkconv.c:1362
+#: ../finch/gntconv.c:408 ../pidgin/gtkconv.c:1416
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
-"Gravação iniciada. A partir de agora, as mensagens desta conversa serão "
-"gravadas."
-
-#: ../finch/gntconv.c:393 ../pidgin/gtkconv.c:1370
+"Gravação de histórico iniciada. A partir de agora, as mensagens desta "
+"conversa serão gravadas."
+
+#: ../finch/gntconv.c:414 ../pidgin/gtkconv.c:1424
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
-"Gravação parada. A partir de agora, as mensagens dessa conversa não serão "
-"gravadas."
-
-#: ../finch/gntconv.c:442
+"Gravação de histórico parada. A partir de agora, as mensagens dessa conversa "
+"não serão gravadas."
+
+#: ../finch/gntconv.c:463
 msgid "Send To"
 msgstr "Enviar para"
 
-#: ../finch/gntconv.c:486
+#: ../finch/gntconv.c:507
 msgid "Conversation"
 msgstr "Conversa"
 
-#: ../finch/gntconv.c:492
+#: ../finch/gntconv.c:513
 msgid "Clear Scrollback"
 msgstr "Limpar tela"
 
-#: ../finch/gntconv.c:496 ../finch/gntprefs.c:191
+#: ../finch/gntconv.c:517 ../finch/gntprefs.c:191
 msgid "Show Timestamps"
 msgstr "Exibir marcações de tempo"
 
-#: ../finch/gntconv.c:512
+#: ../finch/gntconv.c:533
 msgid "Add Buddy Pounce..."
 msgstr "Adicionar ação de usuário..."
 
-#: ../finch/gntconv.c:527
+#: ../finch/gntconv.c:548
 msgid "Enable Logging"
-msgstr "Ativar gravação de conversas"
-
-#: ../finch/gntconv.c:533
+msgstr "Ativar histórico"
+
+#: ../finch/gntconv.c:554
 msgid "Enable Sounds"
 msgstr "Ativar sons"
 
-#: ../finch/gntconv.c:739
+#: ../finch/gntconv.c:760
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-RESPOSTA> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:861
+#: ../finch/gntconv.c:883
 msgid "List of users:\n"
 msgstr "Lista de usuários:\n"
 
-#: ../finch/gntconv.c:1023 ../pidgin/gtkconv.c:331
+#: ../finch/gntconv.c:1045 ../pidgin/gtkconv.c:371
 msgid "Supported debug options are:  version"
 msgstr "As opções de depuração suportadas são:  version"
 
-#: ../finch/gntconv.c:1059 ../pidgin/gtkconv.c:381
+#: ../finch/gntconv.c:1081 ../pidgin/gtkconv.c:423
 msgid "No such command (in this context)."
 msgstr "Comando inexistente (neste contexto)."
 
-#: ../finch/gntconv.c:1062 ../pidgin/gtkconv.c:384
+#: ../finch/gntconv.c:1084 ../pidgin/gtkconv.c:426
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -949,7 +985,7 @@
 "Use \"/help &lt;comando&gt;\" para ajuda com um comando específico.\n"
 "Os seguintes comandos estão disponíveis neste contexto:\n"
 
-#: ../finch/gntconv.c:1120 ../pidgin/gtkconv.c:7560
+#: ../finch/gntconv.c:1142 ../pidgin/gtkconv.c:7755
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -957,12 +993,12 @@
 "say &lt;mensagem&gt;:  Envia uma mensagem normalmente, como se você não "
 "estivesse usando um comando."
 
-#: ../finch/gntconv.c:1123 ../pidgin/gtkconv.c:7563
+#: ../finch/gntconv.c:1145 ../pidgin/gtkconv.c:7758
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;ação&gt;:  Envia uma ação do tipo do IRC para um amigo ou bate-papo."
 
-#: ../finch/gntconv.c:1126 ../pidgin/gtkconv.c:7566
+#: ../finch/gntconv.c:1148 ../pidgin/gtkconv.c:7761
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -970,43 +1006,48 @@
 "debug &lt;opção&gt;:  Envia várias informações de depuração para a conversa "
 "atual."
 
-#: ../finch/gntconv.c:1129 ../pidgin/gtkconv.c:7569
+#: ../finch/gntconv.c:1151 ../pidgin/gtkconv.c:7764
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Limpa a janela de conversa."
 
-#: ../finch/gntconv.c:1132 ../pidgin/gtkconv.c:7575
+#: ../finch/gntconv.c:1154 ../pidgin/gtkconv.c:7770
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;comando&gt;:  Ajuda num comando específico."
 
-#: ../finch/gntconv.c:1135
+#: ../finch/gntconv.c:1157
 msgid "users:  Show the list of users in the chat."
 msgstr "users:  Exibe a lista dos usuários que estão no bate-papo."
 
-#: ../finch/gntconv.c:1140
+#: ../finch/gntconv.c:1162
 msgid "plugins: Show the plugins window."
 msgstr "plugins: Mostra a janela de plugins."
 
-#: ../finch/gntconv.c:1143
+#: ../finch/gntconv.c:1165
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: Mostra a lista de amigos."
 
-#: ../finch/gntconv.c:1146
+#: ../finch/gntconv.c:1168
 msgid "accounts: Show the accounts window."
 msgstr "accounts: Mostra a janela de contas."
 
-#: ../finch/gntconv.c:1149
+#: ../finch/gntconv.c:1171
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: Mostra a janela de depuração."
 
-#: ../finch/gntconv.c:1152
+#: ../finch/gntconv.c:1174
 msgid "prefs: Show the preference window."
 msgstr "prefs: Mostra a janela de preferências"
 
-#: ../finch/gntconv.c:1155
+#: ../finch/gntconv.c:1177
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: Mostra a janela de status salvos."
 
-#: ../finch/gntdebug.c:235 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:695
+#: ../finch/gntdebug.c:231 ../pidgin/gtkconv.c:989 ../pidgin/gtkconv.c:2663
+#: ../pidgin/gtkdebug.c:220 ../pidgin/gtkft.c:543
+msgid "Unable to open file."
+msgstr "Não foi possível abrir arquivo."
+
+#: ../finch/gntdebug.c:271 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:700
 msgid "Debug Window"
 msgstr "Janela de depuração"
 
@@ -1014,15 +1055,15 @@
 #. * it's necessary to make the width of the debug window resizable ... like I said,
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #.
-#: ../finch/gntdebug.c:256 ../pidgin/gtkdebug.c:754
+#: ../finch/gntdebug.c:292 ../pidgin/gtkdebug.c:759
 msgid "Clear"
 msgstr "Limpar"
 
-#: ../finch/gntdebug.c:262
-msgid "Filter: "
-msgstr "Filtrar: "
-
-#: ../finch/gntdebug.c:266 ../pidgin/gtkdebug.c:763
+#: ../finch/gntdebug.c:303
+msgid "Filter:"
+msgstr "Filtrar:"
+
+#: ../finch/gntdebug.c:309 ../pidgin/gtkdebug.c:768
 msgid "Pause"
 msgstr "Pausar"
 
@@ -1059,25 +1100,27 @@
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
 #: ../finch/gntft.c:201 ../finch/gntstatus.c:547 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:344
-#: ../libpurple/protocols/gg/gg.c:1039 ../libpurple/protocols/gg/gg.c:1576
-#: ../libpurple/protocols/gg/gg.c:1584
+#: ../libpurple/protocols/bonjour/bonjour.c:363
+#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1584
+#: ../libpurple/protocols/gg/gg.c:1592
 #: ../libpurple/protocols/jabber/buddy.c:778
 #: ../libpurple/protocols/jabber/buddy.c:782
 #: ../libpurple/protocols/jabber/buddy.c:941
-#: ../libpurple/protocols/jabber/jabber.c:1500
-#: ../libpurple/protocols/msn/msn.c:543
-#: ../libpurple/protocols/novell/novell.c:2835
+#: ../libpurple/protocols/jabber/jabber.c:1538
+#: ../libpurple/protocols/msn/msn.c:621 ../libpurple/protocols/msn/msn.c:631
+#: ../libpurple/protocols/msn/msn.c:636 ../libpurple/protocols/msn/msn.c:639
+#: ../libpurple/protocols/msnp9/msn.c:543
+#: ../libpurple/protocols/novell/novell.c:2852
 #: ../libpurple/protocols/oscar/oscar.c:821
 #: ../libpurple/protocols/oscar/oscar.c:826
 #: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:2700
-#: ../libpurple/protocols/oscar/oscar.c:3780
-#: ../libpurple/protocols/sametime/sametime.c:3263
-#: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3248 ../pidgin/gtkblist.c:3104
-#: ../pidgin/gtkblist.c:3118 ../pidgin/gtkblist.c:3120
-#: ../pidgin/gtksavedstatuses.c:999 ../pidgin/gtksavedstatuses.c:1144
+#: ../libpurple/protocols/oscar/oscar.c:2710
+#: ../libpurple/protocols/oscar/oscar.c:3790
+#: ../libpurple/protocols/sametime/sametime.c:3305
+#: ../libpurple/protocols/sametime/sametime.c:4196
+#: ../libpurple/protocols/yahoo/yahoo.c:3259 ../pidgin/gtkblist.c:3338
+#: ../pidgin/gtkblist.c:3352 ../pidgin/gtkblist.c:3354
+#: ../pidgin/gtksavedstatuses.c:1005 ../pidgin/gtksavedstatuses.c:1150
 msgid "Status"
 msgstr "Status"
 
@@ -1120,7 +1163,8 @@
 msgid "Finished"
 msgstr "Concluída"
 
-#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:347
+#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:404
+#: ../libpurple/protocols/msnp9/session.c:357
 msgid "Transferring"
 msgstr "Transferindo"
 
@@ -1128,72 +1172,68 @@
 msgid "Emails"
 msgstr "Emails"
 
-#: ../finch/gntnotify.c:171 ../finch/gntnotify.c:225
+#: ../finch/gntnotify.c:171 ../finch/gntnotify.c:226
 msgid "You have mail!"
 msgstr "Você tem email!"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:513
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:519
 msgid "Sender"
 msgstr "Remetente"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:520
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:526
 msgid "Subject"
 msgstr "Assunto"
 
-#: ../finch/gntnotify.c:201
+#: ../finch/gntnotify.c:202
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s (%s) tem %d nova mensagem."
 msgstr[1] "%s (%s) tem %d novas mensagens."
 
-#: ../finch/gntnotify.c:225 ../pidgin/gtknotify.c:341
+#: ../finch/gntnotify.c:226 ../pidgin/gtknotify.c:342
 msgid "New Mail"
 msgstr "Novo e-mail"
 
-#: ../finch/gntnotify.c:290 ../pidgin/gtknotify.c:940
+#: ../finch/gntnotify.c:291 ../pidgin/gtknotify.c:949
 #, c-format
 msgid "Info for %s"
 msgstr "Informações de %s:"
 
-#: ../finch/gntnotify.c:291 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:941
+#: ../finch/gntnotify.c:292 ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:950
 msgid "Buddy Information"
 msgstr "Informações do amigo"
 
-#: ../finch/gntnotify.c:377 ../libpurple/protocols/qq/group_join.c:367
+#: ../finch/gntnotify.c:382 ../libpurple/protocols/qq/group_join.c:367
 msgid "Continue"
 msgstr "Continuar"
 
-#: ../finch/gntnotify.c:386 ../pidgin/gtkconv.c:1596
+#: ../finch/gntnotify.c:391 ../pidgin/gtkconv.c:1650
 msgid "IM"
 msgstr "MI"
 
-#: ../finch/gntnotify.c:389
-msgid "Join"
-msgstr "Entrar"
-
-#: ../finch/gntnotify.c:392 ../libpurple/protocols/sametime/sametime.c:3473
+#: ../finch/gntnotify.c:397 ../libpurple/protocols/sametime/sametime.c:3515
 msgid "Invite"
 msgstr "Convidar"
 
-#: ../finch/gntnotify.c:395
+#: ../finch/gntnotify.c:400
 msgid "(none)"
 msgstr "(nome)"
 
-#: ../finch/gntplugin.c:75 ../finch/gntplugin.c:84
+#: ../finch/gntplugin.c:77 ../finch/gntplugin.c:86
 msgid "ERROR"
 msgstr "ERRO"
 
-#: ../finch/gntplugin.c:75
+#: ../finch/gntplugin.c:77
 msgid "loading plugin failed"
 msgstr "falha ao carregar o plugin"
 
-#: ../finch/gntplugin.c:84
+#: ../finch/gntplugin.c:86
 msgid "unloading plugin failed"
 msgstr "falha ao descarregar o plugin"
 
-#: ../finch/gntplugin.c:129
+#: ../finch/gntplugin.c:132
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1210,19 +1250,42 @@
 "Site da web: %s\n"
 "Nome do arquivo: %s\n"
 
-#: ../finch/gntplugin.c:187
+#: ../finch/gntplugin.c:190
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "O plugin precisa estar carregado antes que você possa configurá-lo."
 
-#: ../finch/gntplugin.c:235
+#: ../finch/gntplugin.c:238
 msgid "No configuration options for this plugin."
 msgstr "Não há nenhuma opção de configuração para este plugin"
 
+#: ../finch/gntplugin.c:259
+msgid "Error loading plugin"
+msgstr "Erro ao carregar o plugin"
+
 #: ../finch/gntplugin.c:260
+msgid "The selected file is not a valid plugin."
+msgstr "O arquivo selecionado não é um plugin válido."
+
+#: ../finch/gntplugin.c:261
+msgid ""
+"Please open the debug window and try again to see the exact error message."
+msgstr ""
+"Favor abrir a janela de depuração e tentar novamente para ver a mensagem de "
+"erro exata."
+
+#: ../finch/gntplugin.c:324
+msgid "Select plugin to install"
+msgstr "Selecione um plugin para instalar"
+
+#: ../finch/gntplugin.c:350
 msgid "You can (un)load plugins from the following list."
 msgstr "Você pode (des)ativar plugins a partir da lista abaixo."
 
-#: ../finch/gntplugin.c:315
+#: ../finch/gntplugin.c:401
+msgid "Install Plugin..."
+msgstr "Instalar plugin..."
+
+#: ../finch/gntplugin.c:411
 msgid "Configure Plugin"
 msgstr "Configurar plugin"
 
@@ -1231,186 +1294,186 @@
 #. (that should have been "effect," right?)
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
-#: ../finch/gntplugin.c:371 ../finch/gntplugin.c:378 ../finch/gntprefs.c:264
-#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2067
+#: ../finch/gntplugin.c:467 ../finch/gntplugin.c:474 ../finch/gntprefs.c:264
+#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:717 ../pidgin/gtkprefs.c:2169
 msgid "Preferences"
 msgstr "Preferências"
 
-#: ../finch/gntpounce.c:183 ../pidgin/gtkpounce.c:256
+#: ../finch/gntpounce.c:194 ../pidgin/gtkpounce.c:256
 msgid "Please enter a buddy to pounce."
 msgstr "Favor digitar o amigo que terá a ação."
 
-#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:517
+#: ../finch/gntpounce.c:339 ../pidgin/gtkpounce.c:531
 msgid "New Buddy Pounce"
 msgstr "Nova ação de usuário"
 
-#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:517
+#: ../finch/gntpounce.c:339 ../pidgin/gtkpounce.c:531
 msgid "Edit Buddy Pounce"
 msgstr "Editar ação de usuário"
 
-#: ../finch/gntpounce.c:333
+#: ../finch/gntpounce.c:344
 msgid "Pounce Who"
 msgstr "Quem terá a ação"
 
 #. Account:
-#: ../finch/gntpounce.c:336 ../finch/gntstatus.c:456
+#: ../finch/gntpounce.c:347 ../finch/gntstatus.c:456
 msgid "Account:"
 msgstr "Conta:"
 
-#: ../finch/gntpounce.c:358
+#: ../finch/gntpounce.c:369
 msgid "Buddy name:"
 msgstr "Nome do amigo:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:374 ../pidgin/gtkpounce.c:585
+#: ../finch/gntpounce.c:387 ../pidgin/gtkpounce.c:600
 msgid "Pounce When Buddy..."
 msgstr "Executar quando o amigo..."
 
-#: ../finch/gntpounce.c:376
+#: ../finch/gntpounce.c:389
 msgid "Signs on"
 msgstr "Conectar"
 
-#: ../finch/gntpounce.c:377
+#: ../finch/gntpounce.c:390
 msgid "Signs off"
 msgstr "Desconectar"
 
-#: ../finch/gntpounce.c:378
+#: ../finch/gntpounce.c:391
 msgid "Goes away"
 msgstr "Ficar ausente"
 
-#: ../finch/gntpounce.c:379
+#: ../finch/gntpounce.c:392
 msgid "Returns from away"
 msgstr "Voltar da ausência"
 
-#: ../finch/gntpounce.c:380
+#: ../finch/gntpounce.c:393
 msgid "Becomes idle"
 msgstr "Tornar-se inativo"
 
-#: ../finch/gntpounce.c:381
+#: ../finch/gntpounce.c:394
 msgid "Is no longer idle"
 msgstr "Não estiver mais inativo"
 
-#: ../finch/gntpounce.c:382
+#: ../finch/gntpounce.c:395
 msgid "Starts typing"
 msgstr "Começar a digitar"
 
-#: ../finch/gntpounce.c:383
+#: ../finch/gntpounce.c:396
 msgid "Pauses while typing"
 msgstr "Pausar ao digitar"
 
-#: ../finch/gntpounce.c:384
+#: ../finch/gntpounce.c:397
 msgid "Stops typing"
 msgstr "Parar de digitar"
 
-#: ../finch/gntpounce.c:385
+#: ../finch/gntpounce.c:398
 msgid "Sends a message"
 msgstr "Enviar uma mensagem"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:414 ../pidgin/gtkpounce.c:646
+#: ../finch/gntpounce.c:427 ../pidgin/gtkpounce.c:661
 msgid "Action"
 msgstr "Ação"
 
-#: ../finch/gntpounce.c:416
+#: ../finch/gntpounce.c:429
 msgid "Open an IM window"
 msgstr "Abrir uma janela de MI"
 
-#: ../finch/gntpounce.c:417
+#: ../finch/gntpounce.c:430
 msgid "Pop up a notification"
 msgstr "Exibir notificação popup"
 
-#: ../finch/gntpounce.c:418
+#: ../finch/gntpounce.c:431
 msgid "Send a message"
 msgstr "Enviar uma mensagem"
 
-#: ../finch/gntpounce.c:419
+#: ../finch/gntpounce.c:432
 msgid "Execute a command"
 msgstr "Executar um comando"
 
-#: ../finch/gntpounce.c:420
+#: ../finch/gntpounce.c:433
 msgid "Play a sound"
 msgstr "Tocar um som"
 
-#: ../finch/gntpounce.c:448
+#: ../finch/gntpounce.c:461
 msgid "Pounce only when my status is not available"
 msgstr "Executar apenas quando meu status for indisponível"
 
-#: ../finch/gntpounce.c:450 ../pidgin/gtkpounce.c:1281
+#: ../finch/gntpounce.c:463 ../pidgin/gtkpounce.c:1301
 msgid "Recurring"
 msgstr "Recorrente"
 
-#: ../finch/gntpounce.c:618
+#: ../finch/gntpounce.c:631
 msgid "Cannot create pounce"
 msgstr "Não foi possível criar ação de usuário"
 
-#: ../finch/gntpounce.c:619
+#: ../finch/gntpounce.c:632
 msgid "You do not have any accounts."
 msgstr "Você não tem nenhuma conta."
 
-#: ../finch/gntpounce.c:620
+#: ../finch/gntpounce.c:633
 msgid "You must create an account first before you can create a pounce."
 msgstr "Você precisa criar uma conta antes de poder criar uma ação de usuário."
 
-#: ../finch/gntpounce.c:662 ../pidgin/gtkpounce.c:1096
+#: ../finch/gntpounce.c:675 ../pidgin/gtkpounce.c:1116
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "Você tem certeza de que deseja remover a ação sobre %s de %s?"
 
-#: ../finch/gntpounce.c:696 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1325
+#: ../finch/gntpounce.c:709 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1352
 msgid "Buddy Pounces"
 msgstr "Ações de usuário"
 
-#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1452
+#: ../finch/gntpounce.c:823 ../pidgin/gtkpounce.c:1480
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s começou a digitar para você (%s)"
 
-#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1454
+#: ../finch/gntpounce.c:825 ../pidgin/gtkpounce.c:1482
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s pausou ao digitar para você (%s)"
 
-#: ../finch/gntpounce.c:814 ../pidgin/gtkpounce.c:1456
+#: ../finch/gntpounce.c:827 ../pidgin/gtkpounce.c:1484
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s conectou (%s)"
 
-#: ../finch/gntpounce.c:816 ../pidgin/gtkpounce.c:1458
+#: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1486
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s voltou do estado 'Inativo' (%s)"
 
-#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1460
+#: ../finch/gntpounce.c:831 ../pidgin/gtkpounce.c:1488
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s voltou do estado 'Ausente' (%s)"
 
-#: ../finch/gntpounce.c:820 ../pidgin/gtkpounce.c:1462
+#: ../finch/gntpounce.c:833 ../pidgin/gtkpounce.c:1490
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s parou de digitar para você (%s)"
 
-#: ../finch/gntpounce.c:822 ../pidgin/gtkpounce.c:1464
+#: ../finch/gntpounce.c:835 ../pidgin/gtkpounce.c:1492
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s desconectou (%s)"
 
-#: ../finch/gntpounce.c:824 ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:837 ../pidgin/gtkpounce.c:1494
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s se tornou inativo (%s)"
 
-#: ../finch/gntpounce.c:826 ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:839 ../pidgin/gtkpounce.c:1496
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s se tornou ausente. (%s)"
 
-#: ../finch/gntpounce.c:828 ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:841 ../pidgin/gtkpounce.c:1498
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s te enviou uma mensagem. (%s)"
 
-#: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1471
+#: ../finch/gntpounce.c:842 ../pidgin/gtkpounce.c:1499
 #, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Evento de ação desconhecido. Por favor reporte isso!"
@@ -1419,12 +1482,12 @@
 msgid "Based on keyboard use"
 msgstr "A partir do uso do teclado"
 
-#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1930
+#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:2031
 msgid "From last sent message"
 msgstr "A partir da última mensagem enviada"
 
-#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:907
-#: ../pidgin/gtkprefs.c:1929 ../pidgin/gtkprefs.c:1943
+#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:900 ../pidgin/gtkprefs.c:908
+#: ../pidgin/gtkprefs.c:2030 ../pidgin/gtkprefs.c:2044
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "Nunca"
@@ -1441,21 +1504,21 @@
 msgid "Notify buddies when you are typing"
 msgstr "Notificar amigos de que você está digitando"
 
-#: ../finch/gntprefs.c:198
+#: ../finch/gntprefs.c:198 ../finch/plugins/gnthistory.c:156
 msgid "Log format"
-msgstr "Formato do log:"
-
-#: ../finch/gntprefs.c:199
+msgstr "Formato do histórico:"
+
+#: ../finch/gntprefs.c:199 ../finch/plugins/gnthistory.c:146
 msgid "Log IMs"
 msgstr "Gravar MIs"
 
-#: ../finch/gntprefs.c:200
+#: ../finch/gntprefs.c:200 ../finch/plugins/gnthistory.c:147
 msgid "Log chats"
 msgstr "Gravar bate-papos"
 
 #: ../finch/gntprefs.c:201
 msgid "Log status change events"
-msgstr "Gravar mudanças de status no log do sistema"
+msgstr "Gravar mudanças de status no histórico do sistema"
 
 #: ../finch/gntprefs.c:207
 msgid "Report Idle time"
@@ -1474,79 +1537,80 @@
 msgstr "Mudar status para"
 
 #. Conversations
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:993 ../pidgin/gtkprefs.c:2033
+#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:995 ../pidgin/gtkprefs.c:2135
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "Conversas"
 
-#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1467 ../pidgin/gtkprefs.c:2044
+#: ../finch/gntprefs.c:260 ../finch/plugins/gnthistory.c:154
+#: ../pidgin/gtkprefs.c:1563 ../pidgin/gtkprefs.c:2146
 msgid "Logging"
-msgstr "Logs"
-
-#: ../finch/gntrequest.c:583
+msgstr "Históricos"
+
+#: ../finch/gntrequest.c:585
 msgid "Not implemented yet."
 msgstr "Ainda não implementado."
 
-#: ../finch/gntrequest.c:659 ../pidgin/gtkrequest.c:1555
-#: ../pidgin/gtkrequest.c:1601
+#: ../finch/gntrequest.c:661 ../pidgin/gtkrequest.c:1699
+#: ../pidgin/gtkrequest.c:1745
 msgid "Save File..."
 msgstr "Salvar arquivo..."
 
-#: ../finch/gntrequest.c:659 ../pidgin/gtkrequest.c:1556
-#: ../pidgin/gtkrequest.c:1602
+#: ../finch/gntrequest.c:661 ../pidgin/gtkrequest.c:1700
+#: ../pidgin/gtkrequest.c:1746
 msgid "Open File..."
 msgstr "Abrir arquivo..."
 
-#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:64
+#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:62
 msgid "Buddy logs in"
 msgstr "Amigo conecta"
 
-#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:65
+#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:63
 msgid "Buddy logs out"
 msgstr "Amigo desconecta"
 
-#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:66
+#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:64
 msgid "Message received"
 msgstr "Mensagem recebida"
 
-#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:67
+#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:65
 msgid "Message received begins conversation"
 msgstr "Mensagem recebida inicia conversa"
 
-#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:68
+#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:66
 msgid "Message sent"
 msgstr "Mensagem enviada"
 
-#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:69
+#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:67
 msgid "Person enters chat"
 msgstr "Pessoa entra no bate-papo"
 
-#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:70
+#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:68
 msgid "Person leaves chat"
 msgstr "Pessoa sai do bate-papo"
 
-#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:71
+#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:69
 msgid "You talk in chat"
 msgstr "Você fala no bate-papo"
 
-#: ../finch/gntsound.c:105 ../pidgin/gtksound.c:72
+#: ../finch/gntsound.c:105 ../pidgin/gtksound.c:70
 msgid "Others talk in chat"
 msgstr "Outros falam no bate-papo"
 
-#: ../finch/gntsound.c:107 ../pidgin/gtksound.c:75
+#: ../finch/gntsound.c:107 ../pidgin/gtksound.c:73
 msgid "Someone says your screen name in chat"
 msgstr "Alguém diz seu nome no bate-papo"
 
-#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:311
+#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:306
 msgid "GStreamer Failure"
 msgstr "Falha no GStreamer"
 
-#: ../finch/gntsound.c:362 ../pidgin/gtksound.c:312
+#: ../finch/gntsound.c:362 ../pidgin/gtksound.c:307
 msgid "GStreamer failed to initialize."
 msgstr "O GStreamer não pôde ser inicializado."
 
-#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1587
-#: ../pidgin/gtkprefs.c:1676 ../pidgin/gtkprefs.c:1872
+#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1687
+#: ../pidgin/gtkprefs.c:1776 ../pidgin/gtkprefs.c:1972
 msgid "(default)"
 msgstr "(padrão)"
 
@@ -1562,7 +1626,7 @@
 msgid "Profiles"
 msgstr "Perfis"
 
-#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1717
+#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1817
 msgid "Automatic"
 msgstr "Automático"
 
@@ -1570,7 +1634,7 @@
 msgid "Console Beep"
 msgstr "Bipe do console"
 
-#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1721
+#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1821
 msgid "Command"
 msgstr "Comando"
 
@@ -1578,7 +1642,7 @@
 msgid "No Sound"
 msgstr "Sem sons"
 
-#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1712
+#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1812
 msgid "Sound Method"
 msgstr "Método para reproduzir o som"
 
@@ -1596,7 +1660,7 @@
 "(%s para nome do arquivo)"
 
 #. Sound options
-#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1756
+#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1856
 msgid "Sound Options"
 msgstr "Opções de som"
 
@@ -1604,18 +1668,18 @@
 msgid "Sounds when conversation has focus"
 msgstr "Emitir sons quando a janela da conversa ganhar foco"
 
-#: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:909
-#: ../pidgin/gtkprefs.c:1763 ../pidgin/plugins/timestamp_format.c:42
+#: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:910
+#: ../pidgin/gtkprefs.c:1863 ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:334
 msgid "Always"
 msgstr "Sempre"
 
-#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1761
+#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1861
 msgid "Only when available"
 msgstr "Somente quando disponível"
 
-#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1762
+#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1862
 msgid "Only when not available"
 msgstr "Somente quando não disponível"
 
@@ -1624,11 +1688,11 @@
 msgstr "Volume(0-100):"
 
 #. Sound events
-#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1798
+#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1898
 msgid "Sound Events"
 msgstr "Eventos de som"
 
-#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1857
+#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1957
 msgid "Event"
 msgstr "Evento"
 
@@ -1636,15 +1700,15 @@
 msgid "File"
 msgstr "Arquivo"
 
-#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1876
+#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1976
 msgid "Test"
 msgstr "Testar"
 
-#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1880
+#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1980
 msgid "Reset"
 msgstr "Redefinir"
 
-#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1884
+#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1984
 msgid "Choose..."
 msgstr "Escolher..."
 
@@ -1664,7 +1728,8 @@
 #: ../finch/gntstatus.c:183 ../finch/gntstatus.c:539
 #: ../libpurple/protocols/jabber/buddy.c:298
 #: ../libpurple/protocols/jabber/buddy.c:1359
-#: ../libpurple/protocols/novell/novell.c:1484
+#: ../libpurple/protocols/msn/msn.c:725
+#: ../libpurple/protocols/novell/novell.c:1493
 #: ../pidgin/gtksavedstatuses.c:500
 msgid "Title"
 msgstr "Título"
@@ -1682,41 +1747,44 @@
 #. not independent
 #. Attributes - each status can have a message.
 #: ../finch/gntstatus.c:183 ../finch/gntstatus.c:564 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:256
-#: ../libpurple/protocols/bonjour/bonjour.c:263
-#: ../libpurple/protocols/bonjour/bonjour.c:346
-#: ../libpurple/protocols/gg/gg.c:1077 ../libpurple/protocols/gg/gg.c:1579
-#: ../libpurple/protocols/gg/gg.c:1597 ../libpurple/protocols/gg/gg.c:1607
-#: ../libpurple/protocols/gg/gg.c:1613 ../libpurple/protocols/gg/gg.c:1622
-#: ../libpurple/protocols/gg/gg.c:1627 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1532
-#: ../libpurple/protocols/jabber/jabber.c:1555
-#: ../libpurple/protocols/jabber/jabber.c:1578
-#: ../libpurple/protocols/jabber/jabber.c:1601
-#: ../libpurple/protocols/jabber/jabber.c:1624
-#: ../libpurple/protocols/jabber/jabber.c:1649
+#: ../libpurple/protocols/bonjour/bonjour.c:275
+#: ../libpurple/protocols/bonjour/bonjour.c:282
+#: ../libpurple/protocols/bonjour/bonjour.c:365
+#: ../libpurple/protocols/gg/gg.c:1079 ../libpurple/protocols/gg/gg.c:1587
+#: ../libpurple/protocols/gg/gg.c:1605 ../libpurple/protocols/gg/gg.c:1615
+#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/gg/gg.c:1630
+#: ../libpurple/protocols/gg/gg.c:1635 ../libpurple/protocols/irc/irc.c:238
+#: ../libpurple/protocols/jabber/jabber.c:1570
+#: ../libpurple/protocols/jabber/jabber.c:1584
+#: ../libpurple/protocols/jabber/jabber.c:1598
+#: ../libpurple/protocols/jabber/jabber.c:1612
+#: ../libpurple/protocols/jabber/jabber.c:1626
+#: ../libpurple/protocols/jabber/jabber.c:1642
+#: ../libpurple/protocols/msn/msn.c:677 ../libpurple/protocols/msn/msn.c:683
+#: ../libpurple/protocols/msn/msn.c:689 ../libpurple/protocols/msn/msn.c:695
+#: ../libpurple/protocols/msn/msn.c:700 ../libpurple/protocols/msn/msn.c:705
 #: ../libpurple/protocols/myspace/myspace.c:148
-#: ../libpurple/protocols/novell/novell.c:2838
-#: ../libpurple/protocols/novell/novell.c:2941
-#: ../libpurple/protocols/novell/novell.c:2947
-#: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/oscar/oscar.c:5554
-#: ../libpurple/protocols/oscar/oscar.c:5772
-#: ../libpurple/protocols/oscar/oscar.c:5786
-#: ../libpurple/protocols/oscar/oscar.c:5802
-#: ../libpurple/protocols/oscar/oscar.c:5809
-#: ../libpurple/protocols/oscar/oscar.c:5816
-#: ../libpurple/protocols/sametime/sametime.c:3286
-#: ../libpurple/protocols/sametime/sametime.c:3292
-#: ../libpurple/protocols/sametime/sametime.c:3298
-#: ../libpurple/protocols/sametime/sametime.c:3377
-#: ../libpurple/protocols/silc/buddy.c:1551
-#: ../libpurple/protocols/silc10/buddy.c:1551
-#: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3751
-#: ../libpurple/protocols/yahoo/yahoo.c:3757
+#: ../libpurple/protocols/novell/novell.c:2855
+#: ../libpurple/protocols/novell/novell.c:2958
+#: ../libpurple/protocols/novell/novell.c:2964
+#: ../libpurple/protocols/novell/novell.c:2970
+#: ../libpurple/protocols/oscar/oscar.c:5604
+#: ../libpurple/protocols/oscar/oscar.c:5822
+#: ../libpurple/protocols/oscar/oscar.c:5836
+#: ../libpurple/protocols/oscar/oscar.c:5852
+#: ../libpurple/protocols/oscar/oscar.c:5859
+#: ../libpurple/protocols/oscar/oscar.c:5866
+#: ../libpurple/protocols/sametime/sametime.c:3328
+#: ../libpurple/protocols/sametime/sametime.c:3334
+#: ../libpurple/protocols/sametime/sametime.c:3340
+#: ../libpurple/protocols/sametime/sametime.c:3419
+#: ../libpurple/protocols/silc/buddy.c:1554
+#: ../libpurple/protocols/silc10/buddy.c:1554
+#: ../libpurple/protocols/simple/simple.c:247
+#: ../libpurple/protocols/yahoo/yahoo.c:3762
+#: ../libpurple/protocols/yahoo/yahoo.c:3768
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
-#: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1010
+#: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1016
 msgid "Message"
 msgstr "Mensagem:"
 
@@ -1770,7 +1838,7 @@
 msgid "Certificates"
 msgstr "Certificados"
 
-#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2035
+#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2137
 msgid "Sounds"
 msgstr "Sons"
 
@@ -1874,36 +1942,37 @@
 msgid "Toaster plugin"
 msgstr "Plugin para notificações do tipo \"torradeira\""
 
-#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:120
+#: ../finch/plugins/gnthistory.c:117 ../pidgin/plugins/history.c:125
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>Conversas com %s em %s:</b><br>"
 
-#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:147
+#: ../finch/plugins/gnthistory.c:175 ../pidgin/plugins/history.c:153
 msgid "History Plugin Requires Logging"
-msgstr "O plugin histórico requer que os logs estejam ativados"
-
-#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:148
+msgstr "O plugin mensagens recentes requer que os históricos estejam ativados"
+
+#: ../finch/plugins/gnthistory.c:176 ../pidgin/plugins/history.c:154
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
 "Enabling logs for instant messages and/or chats will activate history for "
 "the same conversation type(s)."
 msgstr ""
-"Os logs podem ser ativados em Ferramentas -> Preferências -> Logs.\n"
-"\n"
-"Ativar logs para mensagens instantâneas e/ou bate-papos irá ativar o "
-"histórico para os mesmos tipos de conversa."
-
-#: ../finch/plugins/gnthistory.c:179
+"Os históricos podem ser ativados em Ferramentas -> Preferências -> "
+"Históricos.\n"
+"\n"
+"Ativar históricos para mensagens instantâneas e/ou bate-papos irá ativar as "
+"mensagens recentes para os mesmos tipos de conversa."
+
+#: ../finch/plugins/gnthistory.c:221
 msgid "GntHistory"
-msgstr "GntHistórico"
-
-#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:190
+msgstr "GntMensagens recentes"
+
+#: ../finch/plugins/gnthistory.c:223 ../pidgin/plugins/history.c:197
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Mostra conversas gravadas recentemente em novas conversas."
 
-#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:191
+#: ../finch/plugins/gnthistory.c:224 ../pidgin/plugins/history.c:198
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -1928,89 +1997,88 @@
 msgid "Lastlog plugin."
 msgstr "Plugin de busca de mensagens"
 
-#: ../libpurple/account.c:791
+#: ../libpurple/account.c:875
 msgid "accounts"
 msgstr "contas"
 
-#: ../libpurple/account.c:958 ../libpurple/protocols/jabber/auth.c:195
+#: ../libpurple/account.c:1050 ../libpurple/protocols/jabber/auth.c:199
 msgid "Password is required to sign on."
 msgstr "Uma senha é necessária para conectar-se."
 
-#: ../libpurple/account.c:992
+#: ../libpurple/account.c:1084
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Digite a senha para %s (%s)"
 
-#: ../libpurple/account.c:999
+#: ../libpurple/account.c:1091
 msgid "Enter Password"
 msgstr "Digite a senha"
 
-#: ../libpurple/account.c:1004
+#: ../libpurple/account.c:1096
 msgid "Save password"
 msgstr "Salvar senha"
 
-#: ../libpurple/account.c:1039 ../libpurple/connection.c:105
+#: ../libpurple/account.c:1131 ../libpurple/connection.c:105
 #: ../libpurple/connection.c:178
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Plugin de protocolo faltando para %s"
 
-#: ../libpurple/account.c:1041 ../libpurple/connection.c:108
-#: ../pidgin/gtkblist.c:4036
+#: ../libpurple/account.c:1133 ../libpurple/connection.c:108
 msgid "Connection Error"
 msgstr "Erro de conexão"
 
-#: ../libpurple/account.c:1199 ../libpurple/protocols/gg/gg.c:707
-#: ../libpurple/protocols/jabber/jabber.c:1687
+#: ../libpurple/account.c:1330 ../libpurple/protocols/gg/gg.c:708
+#: ../libpurple/protocols/jabber/jabber.c:1698
 msgid "New passwords do not match."
 msgstr "Senhas novas não conferem."
 
-#: ../libpurple/account.c:1208
+#: ../libpurple/account.c:1339
 msgid "Fill out all fields completely."
 msgstr "Preencha todos os campos completamente."
 
-#: ../libpurple/account.c:1231
+#: ../libpurple/account.c:1362
 msgid "Original password"
 msgstr "Senha original"
 
-#: ../libpurple/account.c:1238
+#: ../libpurple/account.c:1369
 msgid "New password"
 msgstr "Nova senha"
 
-#: ../libpurple/account.c:1245
+#: ../libpurple/account.c:1376
 msgid "New password (again)"
 msgstr "Nova senha (novamente)"
 
-#: ../libpurple/account.c:1251
+#: ../libpurple/account.c:1382
 #, c-format
 msgid "Change password for %s"
 msgstr "Mudar senha para %s"
 
-#: ../libpurple/account.c:1259
+#: ../libpurple/account.c:1390
 msgid "Please enter your current password and your new password."
 msgstr "Favor digitar sua senha atual e sua nova senha."
 
-#: ../libpurple/account.c:1290
+#: ../libpurple/account.c:1421
 #, c-format
 msgid "Change user information for %s"
 msgstr "Modificar informações do usuário para %s"
 
-#: ../libpurple/account.c:1293 ../libpurple/protocols/toc/toc.c:1670
+#: ../libpurple/account.c:1424 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "Definir informações de usuário"
 
-#: ../libpurple/account.c:1764 ../libpurple/protocols/gg/gg.c:1017
+#: ../libpurple/account.c:1895 ../libpurple/protocols/gg/gg.c:1019
 #: ../libpurple/protocols/jabber/buddy.c:782
-#: ../libpurple/protocols/jabber/buddy.c:2027
-#: ../libpurple/protocols/jabber/buddy.c:2044
-#: ../libpurple/protocols/novell/novell.c:2831
-#: ../libpurple/protocols/qq/qq.c:232 ../pidgin/gtkft.c:160
+#: ../libpurple/protocols/jabber/buddy.c:2030
+#: ../libpurple/protocols/jabber/buddy.c:2047
+#: ../libpurple/protocols/novell/novell.c:2848
+#: ../libpurple/protocols/qq/qq.c:233 ../pidgin/gtkft.c:160
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: ../libpurple/blist.c:521 ../libpurple/blist.c:1320
-#: ../libpurple/blist.c:1552 ../libpurple/protocols/jabber/roster.c:69
-#: ../libpurple/protocols/myspace/myspace.c:3244 ../pidgin/gtkblist.c:5373
+#: ../libpurple/blist.c:521 ../libpurple/blist.c:1321
+#: ../libpurple/blist.c:1531 ../libpurple/protocols/jabber/roster.c:69
+#: ../libpurple/protocols/myspace/myspace.c:3272 ../pidgin/gtkblist.c:6069
 #: ../pidgin/plugins/gevolution/gevo-util.c:67
 #: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
@@ -2020,17 +2088,17 @@
 msgid "buddy list"
 msgstr "lista de amigos"
 
-#: ../libpurple/certificate.c:545
+#: ../libpurple/certificate.c:558
 msgid "(DOES NOT MATCH)"
 msgstr "(NÃO COINCIDE)"
 
 #. Make messages
-#: ../libpurple/certificate.c:549
+#: ../libpurple/certificate.c:562
 #, c-format
 msgid "%s has presented the following certificate for just-this-once use:"
 msgstr "%s enviou este certificado de uso único:"
 
-#: ../libpurple/certificate.c:550
+#: ../libpurple/certificate.c:563
 #, c-format
 msgid ""
 "Common name: %s %s\n"
@@ -2040,39 +2108,39 @@
 "Impressão digital (SHA1): %s"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:555
+#: ../libpurple/certificate.c:568
 msgid "Single-use Certificate Verification"
 msgstr "Verificação de certificado de uso único"
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:872
+#: ../libpurple/certificate.c:886
 msgid "Certificate Authorities"
 msgstr "Autoridades de certificação"
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:1040
+#: ../libpurple/certificate.c:1054
 msgid "SSL Peers Cache"
 msgstr "Cache dos pares SSL"
 
 #. Make messages
-#: ../libpurple/certificate.c:1171
+#: ../libpurple/certificate.c:1185
 #, c-format
 msgid "Accept certificate for %s?"
 msgstr "Aceitar certificado de %s?"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1177
+#: ../libpurple/certificate.c:1191
 msgid "SSL Certificate Verification"
 msgstr "Verificação do certificado SSL"
 
 #. Number of actions
-#: ../libpurple/certificate.c:1186
+#: ../libpurple/certificate.c:1201
 msgid "Accept"
 msgstr "Aceitar"
 
-#: ../libpurple/certificate.c:1187 ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/certificate.c:1202 ../libpurple/protocols/qq/buddy_opt.c:214
 #: ../libpurple/protocols/qq/group_im.c:144
 #: ../libpurple/protocols/qq/group_opt.c:127
 #: ../libpurple/protocols/qq/sys_msg.c:90
@@ -2080,7 +2148,7 @@
 msgid "Reject"
 msgstr "Rejeitar"
 
-#: ../libpurple/certificate.c:1188
+#: ../libpurple/certificate.c:1203
 msgid "_View Certificate..."
 msgstr "_Ver certificado..."
 
@@ -2088,7 +2156,7 @@
 #. TODO: Provide the user with more guidance about why he is
 #. being prompted
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1288
+#: ../libpurple/certificate.c:1303
 #, c-format
 msgid ""
 "The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
@@ -2099,7 +2167,7 @@
 
 #. Prompt the user to authenticate the certificate
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1313
+#: ../libpurple/certificate.c:1328
 #, c-format
 msgid ""
 "The certificate presented by \"%s\" is self-signed. It cannot be "
@@ -2108,7 +2176,7 @@
 "O certificado enviado por \"%s\" é auto-assinado. Ele não pode ser "
 "verificado automaticamente."
 
-#: ../libpurple/certificate.c:1331
+#: ../libpurple/certificate.c:1346
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
 msgstr "A cadeia de certificados enviada para %s não é válida."
@@ -2118,16 +2186,16 @@
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
-#: ../libpurple/certificate.c:1339 ../libpurple/certificate.c:1416
+#: ../libpurple/certificate.c:1354 ../libpurple/certificate.c:1423
 msgid "SSL Certificate Error"
 msgstr "Erro no certificado SSL"
 
-#: ../libpurple/certificate.c:1340
+#: ../libpurple/certificate.c:1355
 msgid "Invalid certificate chain"
 msgstr "Cadeia de certificado inválida"
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1360
+#: ../libpurple/certificate.c:1375
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
 "validated."
@@ -2136,13 +2204,13 @@
 "não pode ser validado."
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1382
+#: ../libpurple/certificate.c:1398
 msgid ""
 "The root certificate this one claims to be issued by is unknown to Pidgin."
 msgstr ""
 "O certificado raiz que expediu este certificado não é conhecido pelo Pidgin."
 
-#: ../libpurple/certificate.c:1408
+#: ../libpurple/certificate.c:1415
 #, c-format
 msgid ""
 "The certificate chain presented by %s does not have a valid digital "
@@ -2153,12 +2221,12 @@
 "válida vinda da Autoridade de Certificação do qual ele diz ter uma "
 "assinatura."
 
-#: ../libpurple/certificate.c:1417
+#: ../libpurple/certificate.c:1424
 msgid "Invalid certificate authority signature"
 msgstr "Assinatura de autoridade de certificação inválida"
 
 #. Make messages
-#: ../libpurple/certificate.c:1881
+#: ../libpurple/certificate.c:1888
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -2176,7 +2244,7 @@
 "Data de expiração: %s\n"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1890
+#: ../libpurple/certificate.c:1897
 msgid "Certificate Information"
 msgstr "Informações do certificado"
 
@@ -2198,10 +2266,12 @@
 msgid "+++ %s signed off"
 msgstr "+++ %s desconectou"
 
-#: ../libpurple/connection.c:497 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:2337
+#: ../libpurple/connection.c:525 ../libpurple/plugin.c:277
+#: ../libpurple/protocols/jabber/buddy.c:2350
 #: ../libpurple/protocols/msn/servconn.c:141
-#: ../libpurple/protocols/msn/session.c:322
+#: ../libpurple/protocols/msn/session.c:377
+#: ../libpurple/protocols/msnp9/servconn.c:139
+#: ../libpurple/protocols/msnp9/session.c:330
 msgid "Unknown error"
 msgstr "Erro desconhecido"
 
@@ -2218,8 +2288,8 @@
 msgid "The message is too large."
 msgstr "A mensagem é muito extensa."
 
-#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:255
-#: ../libpurple/protocols/bonjour/jabber.c:298
+#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:267
+#: ../libpurple/protocols/bonjour/jabber.c:310
 msgid "Unable to send message."
 msgstr "Não foi possível enviar mensagem."
 
@@ -2276,7 +2346,7 @@
 msgid "Failed to get serv name: %s"
 msgstr "Não foi possível obter nome do serv: %s"
 
-#: ../libpurple/dbus-server.h:85
+#: ../libpurple/dbus-server.h:84
 msgid "Purple's D-BUS server is not running for the reason listed below"
 msgstr "O servidor D-BUS do Purple não está rodando pelo motivo listado abaixo"
 
@@ -2292,7 +2362,7 @@
 msgid "Unable to send request to resolver process\n"
 msgstr "Não foi possível enviar pedido para o processo de resolução\n"
 
-#: ../libpurple/dnsquery.c:549 ../libpurple/dnsquery.c:697
+#: ../libpurple/dnsquery.c:549 ../libpurple/dnsquery.c:698
 #, c-format
 msgid ""
 "Error resolving %s:\n"
@@ -2301,8 +2371,8 @@
 "Erro ao resolver %s:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:552 ../libpurple/dnsquery.c:711
-#: ../libpurple/dnsquery.c:831
+#: ../libpurple/dnsquery.c:552 ../libpurple/dnsquery.c:712
+#: ../libpurple/dnsquery.c:830
 #, c-format
 msgid "Error resolving %s: %d"
 msgstr "Erro ao resolver %s: %d"
@@ -2321,12 +2391,12 @@
 msgid "EOF while reading from resolver process"
 msgstr "Fim de arquivo ao ler resposta do processo de resolução"
 
-#: ../libpurple/dnsquery.c:761
+#: ../libpurple/dnsquery.c:762
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "Falha ao criar thread: %s"
 
-#: ../libpurple/dnsquery.c:762
+#: ../libpurple/dnsquery.c:763
 msgid "Unknown reason"
 msgstr "Motivo desconhecido"
 
@@ -2635,7 +2705,8 @@
 #: ../libpurple/log.c:183
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr ""
-"<b><font color=\"red\">O gerador de log não tem funções de leitura</font></b>"
+"<b><font color=\"red\">O gerador de histórico não tem funções de leitura</"
+"font></b>"
 
 #: ../libpurple/log.c:598
 msgid "HTML"
@@ -2678,8 +2749,8 @@
 #: ../libpurple/log.c:1426 ../libpurple/log.c:1559
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr ""
-"<font color=\"red\"><b>Não foi possível encontrar o caminho do log!</b></"
-"font>"
+"<font color=\"red\"><b>Não foi possível encontrar o caminho do histórico!</"
+"b></font>"
 
 #: ../libpurple/log.c:1438 ../libpurple/log.c:1568
 #, c-format
@@ -2691,31 +2762,31 @@
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-RESPOSTA>: %s\n"
 
-#: ../libpurple/plugin.c:365
+#: ../libpurple/plugin.c:360
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Você está usando %s, mas este plugin requer %s."
 
-#: ../libpurple/plugin.c:380
+#: ../libpurple/plugin.c:375
 #, c-format
 msgid "This plugin has not defined an ID."
 msgstr "Este plugin não definiu um ID."
 
-#: ../libpurple/plugin.c:448
+#: ../libpurple/plugin.c:443
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
 msgstr "Versão incompatível do plugin %d (era esperado %d)"
 
-#: ../libpurple/plugin.c:465
+#: ../libpurple/plugin.c:460
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr "Versão errada da interface binária %d.%d.x (era esperado %d.%d.x)"
 
-#: ../libpurple/plugin.c:482
+#: ../libpurple/plugin.c:477
 msgid "Plugin does not implement all required functions"
 msgstr "O plugin não implementa todas as funções requeridas"
 
-#: ../libpurple/plugin.c:547
+#: ../libpurple/plugin.c:542
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -2724,27 +2795,23 @@
 "O plugin requerido %s não foi encontrado. Por favor instale esse plugin e "
 "tente novamente."
 
-#: ../libpurple/plugin.c:552
+#: ../libpurple/plugin.c:547
 msgid "Unable to load the plugin"
 msgstr "Não foi possível carregar o plugin."
 
-#: ../libpurple/plugin.c:574
+#: ../libpurple/plugin.c:569
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "O plugin requerido %s não pôde ser carregado."
 
-#: ../libpurple/plugin.c:578
+#: ../libpurple/plugin.c:573
 msgid "Unable to load your plugin."
 msgstr "Não foi possível carregar seu plugin."
 
-#: ../libpurple/plugin.c:677
-#, c-format
-msgid "The dependent plugin %s failed to unload."
-msgstr "Falha ao descarregar o plugin dependente %s."
-
-#: ../libpurple/plugin.c:681
-msgid "There were errors unloading the plugin."
-msgstr "Houve erros ao descarregar o plugin."
+#: ../libpurple/plugin.c:663
+#, c-format
+msgid "%s requires %s, but it failed to unload."
+msgstr "%s requer %s, mas este não foi descarregado com sucesso."
 
 #: ../libpurple/plugins/autoaccept.c:23
 msgid "Autoaccept"
@@ -2782,14 +2849,15 @@
 
 #: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
 #: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
-#: ../libpurple/protocols/oscar/oscar.c:1453
-#: ../libpurple/protocols/oscar/oscar.c:2233
-#: ../libpurple/protocols/oscar/oscar.c:2282
-#: ../libpurple/protocols/oscar/oscar.c:5886
-#: ../libpurple/protocols/oscar/oscar.c:5941
-#: ../libpurple/protocols/oscar/oscar.c:6167
-#: ../libpurple/protocols/oscar/oscar.c:6237 ../libpurple/request.h:1388
-#: ../libpurple/request.h:1398
+#: ../libpurple/protocols/oscar/oscar.c:1451
+#: ../libpurple/protocols/oscar/oscar.c:2243
+#: ../libpurple/protocols/oscar/oscar.c:2292
+#: ../libpurple/protocols/oscar/oscar.c:5936
+#: ../libpurple/protocols/oscar/oscar.c:5991
+#: ../libpurple/protocols/oscar/oscar.c:6217
+#: ../libpurple/protocols/oscar/oscar.c:6287 ../libpurple/request.h:1828
+#: ../libpurple/request.h:1841 ../libpurple/request.h:1854
+#: ../libpurple/request.h:1867 ../pidgin/gtkblist.c:546
 msgid "_Cancel"
 msgstr "_Cancelar"
 
@@ -2833,8 +2901,10 @@
 "automaticamente for concluída\n"
 "(apenas quando não há conversa com o remetente)"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1660
-#: ../libpurple/protocols/msn/msn.c:1690
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1808
+#: ../libpurple/protocols/msn/msn.c:1838
+#: ../libpurple/protocols/msnp9/msn.c:1661
+#: ../libpurple/protocols/msnp9/msn.c:1691
 msgid "Notes"
 msgstr "Anotações"
 
@@ -3061,34 +3131,34 @@
 #. * offset is way off.  The user should never really see it, but
 #. * it's here just in case.  The parens are to make it clear it's
 #. * not a real timezone.
-#: ../libpurple/plugins/log_reader.c:493
+#: ../libpurple/plugins/log_reader.c:499
 msgid "(UTC)"
 msgstr "(Greenwich)"
 
-#: ../libpurple/plugins/log_reader.c:1577
+#: ../libpurple/plugins/log_reader.c:1554
 msgid "User is offline."
 msgstr "O usuário está desconectado."
 
-#: ../libpurple/plugins/log_reader.c:1583
+#: ../libpurple/plugins/log_reader.c:1560
 msgid "Auto-response sent:"
 msgstr "Auto-resposta enviada:"
 
-#: ../libpurple/plugins/log_reader.c:1593
-#: ../libpurple/plugins/log_reader.c:1596
+#: ../libpurple/plugins/log_reader.c:1570
+#: ../libpurple/plugins/log_reader.c:1573
 #: ../libpurple/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s desconectou."
 
-#: ../libpurple/plugins/log_reader.c:1610
+#: ../libpurple/plugins/log_reader.c:1587
 msgid "One or more messages may have been undeliverable."
 msgstr "Uma ou mais mensagens pode(m) não ter sido enviada(s)."
 
-#: ../libpurple/plugins/log_reader.c:1620
+#: ../libpurple/plugins/log_reader.c:1597
 msgid "You were disconnected from the server."
 msgstr "Você foi desconectado do servidor."
 
-#: ../libpurple/plugins/log_reader.c:1628
+#: ../libpurple/plugins/log_reader.c:1605
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
@@ -3096,80 +3166,88 @@
 "Atualmente, você está desconectado. Nenhuma mensagem será recebida até que "
 "você conecte-se."
 
-#: ../libpurple/plugins/log_reader.c:1643
+#: ../libpurple/plugins/log_reader.c:1620
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr ""
 "A mensagem não pôde ser enviada porque o limite de tamanho foi excedido."
 
-#: ../libpurple/plugins/log_reader.c:1648
+#: ../libpurple/plugins/log_reader.c:1625
 msgid "Message could not be sent."
 msgstr "A mensagem não pôde ser enviada."
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2349
-#: ../libpurple/plugins/log_reader.c:2472
+#: ../libpurple/plugins/log_reader.c:2699
+#: ../libpurple/plugins/log_reader.c:2835
 msgid "Adium"
 msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2362
-#: ../libpurple/plugins/log_reader.c:2477
+#: ../libpurple/plugins/log_reader.c:2712
+#: ../libpurple/plugins/log_reader.c:2840
 msgid "Fire"
 msgstr "Fire"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2374
-#: ../libpurple/plugins/log_reader.c:2481
+#: ../libpurple/plugins/log_reader.c:2724
+#: ../libpurple/plugins/log_reader.c:2844
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2388
-#: ../libpurple/plugins/log_reader.c:2486
+#: ../libpurple/plugins/log_reader.c:2738
+#: ../libpurple/plugins/log_reader.c:2849
 msgid "QIP"
 msgstr "QIP"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2400
-#: ../libpurple/plugins/log_reader.c:2490
+#: ../libpurple/plugins/log_reader.c:2750
+#: ../libpurple/plugins/log_reader.c:2853
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2412
-#: ../libpurple/plugins/log_reader.c:2494
+#: ../libpurple/plugins/log_reader.c:2762
+#: ../libpurple/plugins/log_reader.c:2857
 msgid "Trillian"
 msgstr "Trillian"
 
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libpurple/plugins/log_reader.c:2774
+#: ../libpurple/plugins/log_reader.c:2861
+msgid "aMSN"
+msgstr "aMSN"
+
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2454
+#: ../libpurple/plugins/log_reader.c:2817
 msgid "General Log Reading Configuration"
-msgstr "Configuração geral da leitura de logs"
-
-#: ../libpurple/plugins/log_reader.c:2458
+msgstr "Configuração geral da leitura de históricos"
+
+#: ../libpurple/plugins/log_reader.c:2821
 msgid "Fast size calculations"
 msgstr "Cálculos rápidos de tamanho"
 
-#: ../libpurple/plugins/log_reader.c:2462
+#: ../libpurple/plugins/log_reader.c:2825
 msgid "Use name heuristics"
 msgstr "Utilizar heurística de nome"
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2468
+#: ../libpurple/plugins/log_reader.c:2831
 msgid "Log Directory"
-msgstr "Diretório de logs"
+msgstr "Diretório dos históricos"
 
 #. *< type
 #. *< ui_requirement
@@ -3177,20 +3255,21 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2523
+#: ../libpurple/plugins/log_reader.c:2890
 msgid "Log Reader"
-msgstr "Leitor de logs"
+msgstr "Leitor de históricos"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2527
+#: ../libpurple/plugins/log_reader.c:2894
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr ""
-"Inclui o log de outros clientes de mensagem instantânea no leitor de logs."
+"Inclui o histórico de outros clientes de mensagem instantânea no leitor de "
+"históricos."
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2531
+#: ../libpurple/plugins/log_reader.c:2898
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -3198,9 +3277,9 @@
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
 msgstr ""
-"Ao exibir os logs, este plugin incluirá logs de outros clientes de mensagens "
-"instantâneas. Atualmente, isto inclui o Adium, o MSN Messenger e o "
-"Trillian.\n"
+"Ao exibir os históricos, este plugin incluirá históricos de outros clientes "
+"de mensagens instantâneas. Atualmente, isto inclui o Adium, o MSN Messenger "
+"e o Trillian.\n"
 "\n"
 "AVISO: Este plugin ainda está em testes e pode travar freqüentemente. Use-o "
 "por sua conta e risco!"
@@ -3278,26 +3357,32 @@
 "usuário'"
 
 #: ../libpurple/plugins/offlinemsg.c:165
-#: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
-#: ../libpurple/protocols/novell/novell.c:1917
+#: ../libpurple/protocols/msn/dialog.c:141
+#: ../libpurple/protocols/msn/msn.c:665
+#: ../libpurple/protocols/msnp9/dialog.c:133
+#: ../libpurple/protocols/msnp9/msn.c:550
+#: ../libpurple/protocols/msnp9/msn.c:564
+#: ../libpurple/protocols/novell/novell.c:1928
 #: ../libpurple/protocols/silc/buddy.c:317
-#: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
+#: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:308
 #: ../libpurple/protocols/silc10/buddy.c:314
 #: ../libpurple/protocols/silc10/pk.c:119
-#: ../libpurple/protocols/silc10/wb.c:304 ../pidgin/gtkrequest.c:268
+#: ../libpurple/protocols/silc10/wb.c:307 ../pidgin/gtkrequest.c:318
 msgid "Yes"
 msgstr "Sim"
 
 #: ../libpurple/plugins/offlinemsg.c:166
-#: ../libpurple/protocols/msn/dialog.c:134
-#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
-#: ../libpurple/protocols/novell/novell.c:1918
+#: ../libpurple/protocols/msn/dialog.c:142
+#: ../libpurple/protocols/msn/msn.c:665
+#: ../libpurple/protocols/msnp9/dialog.c:134
+#: ../libpurple/protocols/msnp9/msn.c:550
+#: ../libpurple/protocols/msnp9/msn.c:564
+#: ../libpurple/protocols/novell/novell.c:1929
 #: ../libpurple/protocols/silc/buddy.c:318
-#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
+#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:309
 #: ../libpurple/protocols/silc10/buddy.c:315
 #: ../libpurple/protocols/silc10/pk.c:120
-#: ../libpurple/protocols/silc10/wb.c:305 ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/silc10/wb.c:308 ../pidgin/gtkrequest.c:319
 msgid "No"
 msgstr "Não"
 
@@ -3369,7 +3454,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/signals-test.c:711
+#: ../libpurple/plugins/signals-test.c:753
 msgid "Signals Test"
 msgstr "Teste dos sinais"
 
@@ -3377,8 +3462,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/signals-test.c:714
-#: ../libpurple/plugins/signals-test.c:716
+#: ../libpurple/plugins/signals-test.c:756
+#: ../libpurple/plugins/signals-test.c:758
 msgid "Test to see that all signals are working properly."
 msgstr "Teste para ver se todos os sinais estão funcionando corretamente."
 
@@ -3401,8 +3486,8 @@
 msgstr "Verifica se a maioria das coisas estão funcionando."
 
 #. Scheme name
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:902
-#: ../libpurple/plugins/ssl/ssl-nss.c:725
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:911
+#: ../libpurple/plugins/ssl/ssl-nss.c:731
 msgid "X.509 Certificates"
 msgstr "Certificados X.509"
 
@@ -3412,7 +3497,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:986
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:995
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -3420,8 +3505,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:989
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:991
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:998
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:1000
 msgid "Provides SSL support through GNUTLS."
 msgstr "Fornece suporte a SSL através do GNUTLS."
 
@@ -3431,7 +3516,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:810
+#: ../libpurple/plugins/ssl/ssl-nss.c:816
 msgid "NSS"
 msgstr "NSS"
 
@@ -3439,8 +3524,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:813
-#: ../libpurple/plugins/ssl/ssl-nss.c:815
+#: ../libpurple/plugins/ssl/ssl-nss.c:819
+#: ../libpurple/plugins/ssl/ssl-nss.c:821
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Fornece suporte a SSL através do Mozilla NSS."
 
@@ -3526,15 +3611,15 @@
 "Notifica na janela de conversa quando um amigo sai ou entra do status de "
 "ausente ou inativo."
 
-#: ../libpurple/plugins/tcl/tcl.c:421
+#: ../libpurple/plugins/tcl/tcl.c:423
 msgid "Tcl Plugin Loader"
 msgstr "Carregador de plugins Tcl"
 
-#: ../libpurple/plugins/tcl/tcl.c:423 ../libpurple/plugins/tcl/tcl.c:424
+#: ../libpurple/plugins/tcl/tcl.c:425 ../libpurple/plugins/tcl/tcl.c:426
 msgid "Provides support for loading Tcl plugins"
 msgstr "Fornece suporte ao carregamento de plugins Tcl."
 
-#: ../libpurple/plugins/tcl/tcl.c:507
+#: ../libpurple/plugins/tcl/tcl.c:509
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
@@ -3542,12 +3627,21 @@
 "Não foi possível detectar uma instalação do ActiveTCL. Se você deseja usar "
 "plugins TCL, instale o ActiveTCL de http://www.activestate.com\n"
 
-#. Send a message about the connection error
-#: ../libpurple/protocols/bonjour/bonjour.c:112
+#: ../libpurple/protocols/bonjour/bonjour.c:108
+msgid ""
+"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://"
+"developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-"
+"LocalMessaging for more information."
+msgstr ""
+"A biblioteca do Apple Bonjour para Windows não foi encontrada. Veja o FAQ em "
+"http://developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-"
+"LocalMessaging para maiores informações."
+
+#: ../libpurple/protocols/bonjour/bonjour.c:127
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "Não foi possível escutar por conexões de mensagens instantâneas\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:137
+#: ../libpurple/protocols/bonjour/bonjour.c:154
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
@@ -3555,40 +3649,40 @@
 "rodando?"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:351
-#: ../libpurple/protocols/bonjour/bonjour.c:656
-#: ../libpurple/protocols/gg/gg.c:632
-#: ../libpurple/protocols/jabber/jabber.c:942
+#: ../libpurple/protocols/bonjour/bonjour.c:370
+#: ../libpurple/protocols/bonjour/bonjour.c:675
+#: ../libpurple/protocols/gg/gg.c:633
+#: ../libpurple/protocols/jabber/jabber.c:969
 msgid "First name"
 msgstr "Nome"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:353
-#: ../libpurple/protocols/bonjour/bonjour.c:659
-#: ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/jabber/jabber.c:947
+#: ../libpurple/protocols/bonjour/bonjour.c:372
+#: ../libpurple/protocols/bonjour/bonjour.c:678
+#: ../libpurple/protocols/gg/gg.c:628
+#: ../libpurple/protocols/jabber/jabber.c:974
 msgid "Last name"
 msgstr "Sobrenome"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:357
+#: ../libpurple/protocols/bonjour/bonjour.c:376
 #: ../libpurple/protocols/jabber/buddy.c:295
 #: ../libpurple/protocols/jabber/buddy.c:1325
 #: ../libpurple/protocols/jabber/buddy.c:1335
-#: ../libpurple/protocols/jabber/buddy.c:2216
+#: ../libpurple/protocols/jabber/buddy.c:2219
 #: ../libpurple/protocols/silc/ops.c:1041
-#: ../libpurple/protocols/silc/util.c:555
+#: ../libpurple/protocols/silc/util.c:561
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
 msgid "E-Mail"
 msgstr "Email"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:360
-#: ../libpurple/protocols/bonjour/bonjour.c:665
+#: ../libpurple/protocols/bonjour/bonjour.c:379
+#: ../libpurple/protocols/bonjour/bonjour.c:684
 msgid "AIM Account"
 msgstr "Conta do AIM"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:363
-#: ../libpurple/protocols/bonjour/bonjour.c:668
+#: ../libpurple/protocols/bonjour/bonjour.c:382
+#: ../libpurple/protocols/bonjour/bonjour.c:687
 msgid "XMPP Account"
 msgstr "Conta do XMPP"
 
@@ -3602,20 +3696,20 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:467
-#: ../libpurple/protocols/bonjour/bonjour.c:469
+#: ../libpurple/protocols/bonjour/bonjour.c:486
+#: ../libpurple/protocols/bonjour/bonjour.c:488
 msgid "Bonjour Protocol Plugin"
 msgstr "Plugin do protocolo Bonjour"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:610
+#: ../libpurple/protocols/bonjour/bonjour.c:629
 msgid "Purple Person"
 msgstr "Pessoa púrpura"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:662
-#: ../libpurple/protocols/gg/gg.c:477
-#: ../libpurple/protocols/jabber/jabber.c:932
-#: ../libpurple/protocols/silc/silc.c:770
-#: ../libpurple/protocols/silc/silc.c:1011
+#: ../libpurple/protocols/bonjour/bonjour.c:681
+#: ../libpurple/protocols/gg/gg.c:478
+#: ../libpurple/protocols/jabber/jabber.c:959
+#: ../libpurple/protocols/silc/silc.c:913
+#: ../libpurple/protocols/silc/silc.c:1154
 #: ../libpurple/protocols/silc10/silc.c:681
 #: ../libpurple/protocols/silc10/silc.c:922
 msgid "E-mail"
@@ -3625,38 +3719,38 @@
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:380
+#: ../libpurple/protocols/bonjour/jabber.c:395
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s fechou a conversa."
 
-#: ../libpurple/protocols/bonjour/jabber.c:437
-#: ../libpurple/protocols/bonjour/jabber.c:660
-#: ../libpurple/protocols/bonjour/jabber.c:678
+#: ../libpurple/protocols/bonjour/jabber.c:453
+#: ../libpurple/protocols/bonjour/jabber.c:686
+#: ../libpurple/protocols/bonjour/jabber.c:704
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Não foi possível enviar mensagem: a conversa não pôde ser iniciada."
 
-#: ../libpurple/protocols/bonjour/jabber.c:583
+#: ../libpurple/protocols/bonjour/jabber.c:603
 msgid "Cannot open socket"
 msgstr "Não foi possível abrir socket"
 
-#: ../libpurple/protocols/bonjour/jabber.c:591
+#: ../libpurple/protocols/bonjour/jabber.c:613
 msgid "Error setting socket options"
 msgstr "Erro ao definir as opções do socket"
 
-#: ../libpurple/protocols/bonjour/jabber.c:615
+#: ../libpurple/protocols/bonjour/jabber.c:639
 msgid "Could not bind socket to port"
 msgstr "Não foi possível vincular socket à porta"
 
-#: ../libpurple/protocols/bonjour/jabber.c:623
+#: ../libpurple/protocols/bonjour/jabber.c:649
 msgid "Could not listen on socket"
 msgstr "Não foi possível escutar no socket"
 
-#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1829
+#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1845
 msgid "Invalid proxy settings"
 msgstr "Configurações de proxy inválidas"
 
-#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1829
+#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1845
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -3674,39 +3768,41 @@
 msgid "Unable to fetch the token.\n"
 msgstr "Não foi possível obter o token.\n"
 
-#: ../libpurple/protocols/gg/gg.c:269 ../libpurple/protocols/gg/gg.c:288
+#: ../libpurple/protocols/gg/gg.c:267 ../libpurple/protocols/gg/gg.c:274
+#: ../libpurple/protocols/gg/gg.c:280
 msgid "Save Buddylist..."
 msgstr "Salvar lista de amigos..."
 
-#: ../libpurple/protocols/gg/gg.c:270
+#: ../libpurple/protocols/gg/gg.c:268
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr "Sua lista de amigos está vazia, nada foi escrito no arquivo."
 
-#: ../libpurple/protocols/gg/gg.c:276 ../libpurple/protocols/gg/gg.c:278
-msgid "Couldn't open file"
-msgstr "Não foi possível abrir o arquivo"
-
-#: ../libpurple/protocols/gg/gg.c:289
+#: ../libpurple/protocols/gg/gg.c:275
 msgid "Buddylist saved successfully!"
 msgstr "Lista de amigos salva com sucesso"
 
-#: ../libpurple/protocols/gg/gg.c:307 ../libpurple/protocols/gg/gg.c:308
+#: ../libpurple/protocols/gg/gg.c:278
+#, c-format
+msgid "Couldn't write buddy list for %s to %s"
+msgstr "Não foi possível gravar lista de amigos de %s em %s"
+
+#: ../libpurple/protocols/gg/gg.c:303 ../libpurple/protocols/gg/gg.c:304
 msgid "Couldn't load buddylist"
 msgstr "Não foi possível carregar lista de amigos"
 
-#: ../libpurple/protocols/gg/gg.c:324
+#: ../libpurple/protocols/gg/gg.c:320
 msgid "Load Buddylist..."
 msgstr "Carregar lista de amigos..."
 
-#: ../libpurple/protocols/gg/gg.c:325
+#: ../libpurple/protocols/gg/gg.c:321
 msgid "Buddylist loaded successfully!"
 msgstr "Lista de amigos carregada com sucesso!"
 
-#: ../libpurple/protocols/gg/gg.c:336
+#: ../libpurple/protocols/gg/gg.c:332
 msgid "Save buddylist..."
 msgstr "Salvar lista de amigos..."
 
-#: ../libpurple/protocols/gg/gg.c:384
+#: ../libpurple/protocols/gg/gg.c:382
 msgid "Fill in the registration fields."
 msgstr "Preencha os campos de registro."
 
@@ -3714,305 +3810,311 @@
 msgid "Passwords do not match."
 msgstr "As senhas não conferem."
 
-#: ../libpurple/protocols/gg/gg.c:398
+#: ../libpurple/protocols/gg/gg.c:399
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "Não foi possível registrar uma nova conta. Ocorreu um erro.\n"
 
-#: ../libpurple/protocols/gg/gg.c:411
-msgid "New Gadu-Gadu Account Registered"
-msgstr "Nova conta do Gadu-Gadu registrada"
-
 #: ../libpurple/protocols/gg/gg.c:412
+msgid "New Gadu-Gadu Account Registered"
+msgstr "Nova conta do Gadu-Gadu registrada"
+
+#: ../libpurple/protocols/gg/gg.c:413
 msgid "Registration completed successfully!"
 msgstr "O registro foi concluído com sucesso!"
 
-#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
-#: ../libpurple/protocols/jabber/jabber.c:913
-#: ../libpurple/protocols/jabber/jabber.c:916
-#: ../libpurple/protocols/jabber/jabber.c:1722
+#: ../libpurple/protocols/gg/gg.c:483 ../libpurple/protocols/gg/gg.c:776
+#: ../libpurple/protocols/jabber/jabber.c:940
+#: ../libpurple/protocols/jabber/jabber.c:943
+#: ../libpurple/protocols/jabber/jabber.c:1731
 msgid "Password"
 msgstr "Senha"
 
-#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
+#: ../libpurple/protocols/gg/gg.c:488 ../libpurple/protocols/gg/gg.c:781
 msgid "Password (retype)"
 msgstr "Senha (redigitar)"
 
-#: ../libpurple/protocols/gg/gg.c:492 ../libpurple/protocols/gg/gg.c:785
+#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:786
 msgid "Enter current token"
 msgstr "Digite o token atual"
 
-#: ../libpurple/protocols/gg/gg.c:498 ../libpurple/protocols/gg/gg.c:791
+#: ../libpurple/protocols/gg/gg.c:499 ../libpurple/protocols/gg/gg.c:792
 msgid "Current token"
 msgstr "Token atual"
 
-#: ../libpurple/protocols/gg/gg.c:502 ../libpurple/protocols/gg/gg.c:503
+#: ../libpurple/protocols/gg/gg.c:503 ../libpurple/protocols/gg/gg.c:504
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registrar nova conta do Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:504
+#: ../libpurple/protocols/gg/gg.c:505
 msgid "Please, fill in the following fields"
 msgstr "Por favor, preencha os seguintes campos"
 
-#: ../libpurple/protocols/gg/gg.c:642 ../libpurple/protocols/gg/gg.c:1054
-#: ../libpurple/protocols/gg/gg.c:1126
-#: ../libpurple/protocols/jabber/jabber.c:957
-#: ../libpurple/protocols/oscar/oscar.c:3789
-#: ../libpurple/protocols/oscar/oscar.c:3802
+#: ../libpurple/protocols/gg/gg.c:643 ../libpurple/protocols/gg/gg.c:1056
+#: ../libpurple/protocols/gg/gg.c:1128
+#: ../libpurple/protocols/jabber/jabber.c:984
+#: ../libpurple/protocols/oscar/oscar.c:3799
+#: ../libpurple/protocols/oscar/oscar.c:3812
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Cidade"
 
-#: ../libpurple/protocols/gg/gg.c:647
+#: ../libpurple/protocols/gg/gg.c:648
 msgid "Year of birth"
 msgstr "Ano de nascimento"
 
-#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1589
-#: ../libpurple/protocols/myspace/user.c:115
-#: ../libpurple/protocols/oscar/oscar.c:3732
+#: ../libpurple/protocols/gg/gg.c:651 ../libpurple/protocols/msn/msn.c:1737
+#: ../libpurple/protocols/msnp9/msn.c:1590
+#: ../libpurple/protocols/myspace/user.c:119
+#: ../libpurple/protocols/oscar/oscar.c:3742
 #: ../libpurple/protocols/qq/buddy_info.c:46
-#: ../libpurple/protocols/qq/qq.c:226 ../libpurple/protocols/qq/qq.c:229
-#: ../libpurple/protocols/qq/qq.c:232 ../libpurple/protocols/qq/qq.c:236
+#: ../libpurple/protocols/qq/qq.c:227 ../libpurple/protocols/qq/qq.c:230
+#: ../libpurple/protocols/qq/qq.c:233 ../libpurple/protocols/qq/qq.c:237
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1091
 msgid "Gender"
 msgstr "Sexo"
 
-#: ../libpurple/protocols/gg/gg.c:651
+#: ../libpurple/protocols/gg/gg.c:652
 msgid "Male or female"
 msgstr "Homem ou mulher"
 
-#: ../libpurple/protocols/gg/gg.c:652
-#: ../libpurple/protocols/oscar/oscar.c:3732
-#: ../libpurple/protocols/qq/buddy_info.c:83
-#: ../libpurple/protocols/qq/qq.c:226
-msgid "Male"
-msgstr "Masculino"
-
 #: ../libpurple/protocols/gg/gg.c:653
-#: ../libpurple/protocols/oscar/oscar.c:3732
+#: ../libpurple/protocols/oscar/oscar.c:3742
+#: ../libpurple/protocols/qq/buddy_info.c:83
+#: ../libpurple/protocols/qq/qq.c:227
+msgid "Male"
+msgstr "Masculino"
+
+#: ../libpurple/protocols/gg/gg.c:654
+#: ../libpurple/protocols/oscar/oscar.c:3742
 #: ../libpurple/protocols/qq/buddy_info.c:84
-#: ../libpurple/protocols/qq/qq.c:229
+#: ../libpurple/protocols/qq/qq.c:230
 msgid "Female"
 msgstr "Feminino"
 
-#: ../libpurple/protocols/gg/gg.c:657
+#: ../libpurple/protocols/gg/gg.c:658
 msgid "Only online"
 msgstr "Apenas conectado"
 
-#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:662
+#: ../libpurple/protocols/gg/gg.c:662 ../libpurple/protocols/gg/gg.c:663
 msgid "Find buddies"
 msgstr "Encontrar amigos"
 
-#: ../libpurple/protocols/gg/gg.c:663
+#: ../libpurple/protocols/gg/gg.c:664
 msgid "Please, enter your search criteria below"
 msgstr "Favor digitar seu critério de busca abaixo"
 
-#: ../libpurple/protocols/gg/gg.c:701
+#: ../libpurple/protocols/gg/gg.c:702
 msgid "Fill in the fields."
 msgstr "Preencha os campos."
 
-#: ../libpurple/protocols/gg/gg.c:713
+#: ../libpurple/protocols/gg/gg.c:714
 msgid "Your current password is different from the one that you specified."
 msgstr "Sua senha atual é diferente da senha que você especificou."
 
-#: ../libpurple/protocols/gg/gg.c:727
+#: ../libpurple/protocols/gg/gg.c:728
 msgid "Unable to change password. Error occurred.\n"
 msgstr "Não foi possível alterar a senha. Ocorreu um erro.\n"
 
-#: ../libpurple/protocols/gg/gg.c:736
-msgid "Change password for the Gadu-Gadu account"
-msgstr "Mudar senha da conta do Gadu-Gadu"
-
 #: ../libpurple/protocols/gg/gg.c:737
+msgid "Change password for the Gadu-Gadu account"
+msgstr "Mudar senha da conta do Gadu-Gadu"
+
+#: ../libpurple/protocols/gg/gg.c:738
 msgid "Password was changed successfully!"
 msgstr "Senha alterada com sucesso!"
 
-#: ../libpurple/protocols/gg/gg.c:770
+#: ../libpurple/protocols/gg/gg.c:771
 msgid "Current password"
 msgstr "Senha atual"
 
-#: ../libpurple/protocols/gg/gg.c:795
+#: ../libpurple/protocols/gg/gg.c:796
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Favor digitar sua senha atual e sua nova senha do UIN: "
 
-#: ../libpurple/protocols/gg/gg.c:799 ../libpurple/protocols/gg/gg.c:800
+#: ../libpurple/protocols/gg/gg.c:800 ../libpurple/protocols/gg/gg.c:801
 msgid "Change Gadu-Gadu Password"
 msgstr "Alterar a senha do Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:876
+#: ../libpurple/protocols/gg/gg.c:878
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "Selecione o bate-papo para o amigo: %s"
 
-#: ../libpurple/protocols/gg/gg.c:879 ../libpurple/protocols/gg/gg.c:880
+#: ../libpurple/protocols/gg/gg.c:881 ../libpurple/protocols/gg/gg.c:882
 msgid "Add to chat..."
 msgstr "Adicionar ao bate-papo..."
 
-#: ../libpurple/protocols/gg/gg.c:1008
-#: ../libpurple/protocols/jabber/buddy.c:2031
-#: ../libpurple/protocols/novell/novell.c:2828
+#: ../libpurple/protocols/gg/gg.c:1010
+#: ../libpurple/protocols/jabber/buddy.c:2034
+#: ../libpurple/protocols/novell/novell.c:2845
 #: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:5604
-#: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
-#: ../libpurple/protocols/qq/qq.c:292
-#: ../libpurple/protocols/yahoo/yahoo.c:3099 ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:3104 ../pidgin/gtkblist.c:3436
-#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1061
+#: ../libpurple/protocols/oscar/oscar.c:5654
+#: ../libpurple/protocols/qq/qq.c:171 ../libpurple/protocols/qq/qq.c:178
+#: ../libpurple/protocols/qq/qq.c:293
+#: ../libpurple/protocols/yahoo/yahoo.c:3110 ../libpurple/status.c:154
+#: ../pidgin/gtkblist.c:3338 ../pidgin/gtkblist.c:3676
+#: ../pidgin/gtkdocklet.c:561 ../pidgin/gtkstatusbox.c:1061
 msgid "Offline"
 msgstr "Desconectado"
 
-#: ../libpurple/protocols/gg/gg.c:1011
-#: ../libpurple/protocols/jabber/buddy.c:2033
+#: ../libpurple/protocols/gg/gg.c:1013
+#: ../libpurple/protocols/jabber/buddy.c:2036
 #: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
 #: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
-#: ../libpurple/protocols/novell/novell.c:2816
-#: ../libpurple/protocols/qq/qq.c:280
-#: ../libpurple/protocols/yahoo/yahoo.c:3101 ../libpurple/status.c:155
-#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1057
+#: ../libpurple/protocols/msnp9/state.c:29
+#: ../libpurple/protocols/msnp9/state.c:30
+#: ../libpurple/protocols/msnp9/state.c:37
+#: ../libpurple/protocols/msnp9/state.c:38
+#: ../libpurple/protocols/novell/novell.c:2833
+#: ../libpurple/protocols/qq/qq.c:281
+#: ../libpurple/protocols/yahoo/yahoo.c:3112 ../libpurple/status.c:155
+#: ../pidgin/gtkdocklet.c:545 ../pidgin/gtkstatusbox.c:1057
 msgid "Available"
 msgstr "Disponível"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#: ../libpurple/protocols/gg/gg.c:1014 ../libpurple/protocols/irc/irc.c:528
+#: ../libpurple/protocols/gg/gg.c:1016 ../libpurple/protocols/irc/irc.c:537
 #: ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/buddy.c:2037
-#: ../libpurple/protocols/novell/novell.c:2819
+#: ../libpurple/protocols/jabber/buddy.c:2040
+#: ../libpurple/protocols/novell/novell.c:2836
 #: ../libpurple/protocols/oscar/oscar.c:733
-#: ../libpurple/protocols/oscar/oscar.c:4547
-#: ../libpurple/protocols/oscar/oscar.c:5632
-#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/qq/qq.c:284
-#: ../libpurple/protocols/silc/buddy.c:1476
-#: ../libpurple/protocols/silc10/buddy.c:1476
-#: ../libpurple/protocols/yahoo/yahoo.c:3653
-#: ../libpurple/protocols/yahoo/yahoo.c:3727 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1939
+#: ../libpurple/protocols/oscar/oscar.c:4557
+#: ../libpurple/protocols/oscar/oscar.c:5682
+#: ../libpurple/protocols/qq/qq.c:181 ../libpurple/protocols/qq/qq.c:285
+#: ../libpurple/protocols/silc/buddy.c:1479
+#: ../libpurple/protocols/silc10/buddy.c:1479
+#: ../libpurple/protocols/yahoo/yahoo.c:3664
+#: ../libpurple/protocols/yahoo/yahoo.c:3738 ../libpurple/status.c:158
+#: ../pidgin/gtkdocklet.c:549 ../pidgin/gtkprefs.c:2040
 #: ../pidgin/gtkstatusbox.c:1058
 #, c-format
 msgid "Away"
 msgstr "Ausente"
 
-#: ../libpurple/protocols/gg/gg.c:1043 ../libpurple/protocols/gg/gg.c:1117
-#: ../libpurple/protocols/oscar/oscar.c:2699
-#: ../libpurple/protocols/oscar/oscar.c:3699
+#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1119
+#: ../libpurple/protocols/oscar/oscar.c:2709
+#: ../libpurple/protocols/oscar/oscar.c:3709
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libpurple/protocols/gg/gg.c:1046 ../libpurple/protocols/gg/gg.c:1120
-#: ../libpurple/protocols/jabber/buddy.c:2210
-#: ../libpurple/protocols/jabber/buddy.c:2386
-#: ../libpurple/protocols/oscar/oscar.c:3710
+#: ../libpurple/protocols/gg/gg.c:1048 ../libpurple/protocols/gg/gg.c:1122
+#: ../libpurple/protocols/jabber/buddy.c:2213
+#: ../libpurple/protocols/jabber/buddy.c:2399
+#: ../libpurple/protocols/oscar/oscar.c:3720
 #: ../libpurple/protocols/silc/ops.c:990
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "Nome"
 
-#: ../libpurple/protocols/gg/gg.c:1059 ../libpurple/protocols/gg/gg.c:1129
+#: ../libpurple/protocols/gg/gg.c:1061 ../libpurple/protocols/gg/gg.c:1131
 msgid "Birth Year"
 msgstr "Ano de nascimento"
 
-#: ../libpurple/protocols/gg/gg.c:1111 ../libpurple/protocols/gg/gg.c:1180
-#: ../libpurple/protocols/oscar/oscar.c:3911
+#: ../libpurple/protocols/gg/gg.c:1113 ../libpurple/protocols/gg/gg.c:1182
+#: ../libpurple/protocols/oscar/oscar.c:3921
 msgid "Unable to display the search results."
 msgstr "Não foi possível exibir os resultados da busca."
 
-#: ../libpurple/protocols/gg/gg.c:1171
+#: ../libpurple/protocols/gg/gg.c:1173
 msgid "Gadu-Gadu Public Directory"
 msgstr "Páginas amarelas do Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:1172
+#: ../libpurple/protocols/gg/gg.c:1174
 msgid "Search results"
 msgstr "Resultados da busca"
 
-#: ../libpurple/protocols/gg/gg.c:1215
+#: ../libpurple/protocols/gg/gg.c:1217
 msgid "No matching users found"
 msgstr "Nenhum usuário compatível encontrado"
 
-#: ../libpurple/protocols/gg/gg.c:1216
+#: ../libpurple/protocols/gg/gg.c:1218
 msgid "There are no users matching your search criteria."
 msgstr "Não existem usuários que satisfaçam seu critério de busca"
 
-#: ../libpurple/protocols/gg/gg.c:1310 ../libpurple/protocols/gg/gg.c:1463
+#: ../libpurple/protocols/gg/gg.c:1314 ../libpurple/protocols/gg/gg.c:1469
 msgid "Unable to read socket"
 msgstr "Não foi possível ler do socket"
 
-#: ../libpurple/protocols/gg/gg.c:1395
+#: ../libpurple/protocols/gg/gg.c:1399
 msgid "Buddy list downloaded"
 msgstr "Lista de amigos transferida"
 
-#: ../libpurple/protocols/gg/gg.c:1396
+#: ../libpurple/protocols/gg/gg.c:1400
 msgid "Your buddy list was downloaded from the server."
 msgstr "Sua lista de amigos foi transferida do servidor."
 
-#: ../libpurple/protocols/gg/gg.c:1403
+#: ../libpurple/protocols/gg/gg.c:1407
 msgid "Buddy list uploaded"
 msgstr "Lista de amigos enviada"
 
-#: ../libpurple/protocols/gg/gg.c:1404
+#: ../libpurple/protocols/gg/gg.c:1408
 msgid "Your buddy list was stored on the server."
 msgstr "Sua lista de amigos foi guardada no servidor."
 
-#: ../libpurple/protocols/gg/gg.c:1509 ../libpurple/protocols/gg/gg.c:1715
+#: ../libpurple/protocols/gg/gg.c:1517 ../libpurple/protocols/gg/gg.c:1725
 msgid "Connection failed."
 msgstr "Falha na conexão."
 
-#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/msn/msn.c:559
+#: ../libpurple/protocols/gg/gg.c:1629 ../libpurple/protocols/msn/msn.c:664
+#: ../libpurple/protocols/msnp9/msn.c:563
 msgid "Blocked"
 msgstr "Bloqueado"
 
-#: ../libpurple/protocols/gg/gg.c:1644
+#: ../libpurple/protocols/gg/gg.c:1652
 msgid "Add to chat"
 msgstr "Adicionar ao bate-papo"
 
-#: ../libpurple/protocols/gg/gg.c:1653
+#: ../libpurple/protocols/gg/gg.c:1661
 msgid "Unblock"
 msgstr "Desbloquear"
 
-#: ../libpurple/protocols/gg/gg.c:1657
+#: ../libpurple/protocols/gg/gg.c:1665
 msgid "Block"
 msgstr "Bloquear"
 
-#: ../libpurple/protocols/gg/gg.c:1674
+#: ../libpurple/protocols/gg/gg.c:1682
 msgid "Chat _name:"
 msgstr "_Nome do bate-papo:"
 
-#: ../libpurple/protocols/gg/gg.c:1914
+#: ../libpurple/protocols/gg/gg.c:1933
 msgid "Chat error"
 msgstr "Erro no bate-papo"
 
-#: ../libpurple/protocols/gg/gg.c:1915
+#: ../libpurple/protocols/gg/gg.c:1934
 msgid "This chat name is already in use"
 msgstr "Este nome de bate-papo já está sendo utilizado"
 
-#: ../libpurple/protocols/gg/gg.c:1998
+#: ../libpurple/protocols/gg/gg.c:2019
 msgid "Not connected to the server."
 msgstr "Não conectado ao servidor."
 
-#: ../libpurple/protocols/gg/gg.c:2021
+#: ../libpurple/protocols/gg/gg.c:2042
 msgid "Find buddies..."
 msgstr "Encontrar amigos..."
 
-#: ../libpurple/protocols/gg/gg.c:2027
+#: ../libpurple/protocols/gg/gg.c:2048
 msgid "Change password..."
 msgstr "Alterar senha..."
 
-#: ../libpurple/protocols/gg/gg.c:2033
+#: ../libpurple/protocols/gg/gg.c:2054
 msgid "Upload buddylist to Server"
 msgstr "Enviar lista de amigos para o servidor"
 
-#: ../libpurple/protocols/gg/gg.c:2037
+#: ../libpurple/protocols/gg/gg.c:2058
 msgid "Download buddylist from Server"
 msgstr "Transferir lista de amigos do servidor"
 
-#: ../libpurple/protocols/gg/gg.c:2041
+#: ../libpurple/protocols/gg/gg.c:2062
 msgid "Delete buddylist from Server"
 msgstr "Remover lista de amigos do servidor"
 
-#: ../libpurple/protocols/gg/gg.c:2045
+#: ../libpurple/protocols/gg/gg.c:2066
 msgid "Save buddylist to file..."
 msgstr "Salvar lista de amigos para um arquivo..."
 
-#: ../libpurple/protocols/gg/gg.c:2049
+#: ../libpurple/protocols/gg/gg.c:2070
 msgid "Load buddylist from file..."
 msgstr "Carregar lista de amigos do arquivo.."
 
@@ -4027,38 +4129,38 @@
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2153
+#: ../libpurple/protocols/gg/gg.c:2174
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Plugin do protocolo Gadu-Gadu"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2154
+#: ../libpurple/protocols/gg/gg.c:2175
 msgid "Polish popular IM"
 msgstr "Cliente de mensagens instantâneas popular na Polônia"
 
-#: ../libpurple/protocols/gg/gg.c:2208
+#: ../libpurple/protocols/gg/gg.c:2229
 msgid "Gadu-Gadu User"
 msgstr "Usuário do Gadu-Gadu"
 
 #: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1637
-#: ../libpurple/protocols/silc10/silc.c:1566
+#: ../libpurple/protocols/silc/silc.c:1780
+#: ../libpurple/protocols/silc10/silc.c:1569
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Comando desconhecido: %s"
 
 #: ../libpurple/protocols/irc/cmds.c:503
 #: ../libpurple/protocols/jabber/chat.c:591
-#: ../libpurple/protocols/silc/silc.c:1345
-#: ../libpurple/protocols/silc10/silc.c:1274
+#: ../libpurple/protocols/silc/silc.c:1488
+#: ../libpurple/protocols/silc10/silc.c:1277
 #, c-format
 msgid "current topic is: %s"
 msgstr "O tópico atual é: %s"
 
 #: ../libpurple/protocols/irc/cmds.c:507
 #: ../libpurple/protocols/jabber/chat.c:595
-#: ../libpurple/protocols/silc/silc.c:1349
-#: ../libpurple/protocols/silc10/silc.c:1278
+#: ../libpurple/protocols/silc/silc.c:1492
+#: ../libpurple/protocols/silc10/silc.c:1281
 msgid "No topic is set"
 msgstr "Nenhum tópico foi definido"
 
@@ -4092,83 +4194,81 @@
 msgid "MOTD for %s"
 msgstr "Mensagem do dia (MOTD) para %s"
 
-#: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
-#: ../libpurple/protocols/irc/irc.c:612 ../libpurple/protocols/irc/irc.c:637
-#: ../libpurple/protocols/myspace/myspace.c:2356
+#: ../libpurple/protocols/irc/irc.c:129 ../libpurple/protocols/irc/irc.c:169
+#: ../libpurple/protocols/irc/irc.c:625 ../libpurple/protocols/irc/irc.c:654
+#: ../libpurple/protocols/myspace/myspace.c:2378
 msgid "Server has disconnected"
 msgstr "O servidor desconectou"
 
-#: ../libpurple/protocols/irc/irc.c:249
+#: ../libpurple/protocols/irc/irc.c:253
 msgid "View MOTD"
 msgstr "Ver mensagem do dia (MOTD)"
 
-#: ../libpurple/protocols/irc/irc.c:261 ../libpurple/protocols/silc/chat.c:33
+#: ../libpurple/protocols/irc/irc.c:265 ../libpurple/protocols/silc/chat.c:33
 #: ../libpurple/protocols/silc10/chat.c:33
 msgid "_Channel:"
 msgstr "_Canal:"
 
-#: ../libpurple/protocols/irc/irc.c:267
-#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:524
+#: ../libpurple/protocols/irc/irc.c:271
+#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:527
 msgid "_Password:"
 msgstr "_Senha:"
 
-#: ../libpurple/protocols/irc/irc.c:298
+#: ../libpurple/protocols/irc/irc.c:304
 msgid "IRC nicks may not contain whitespace"
 msgstr "Apelidos do IRC não podem conter espaços"
 
 #. 1. connect to server
 #. connect to the server
-#: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1280
-#: ../libpurple/protocols/msn/session.c:345
-#: ../libpurple/protocols/myspace/myspace.c:301
-#: ../libpurple/protocols/novell/novell.c:2182
-#: ../libpurple/protocols/oscar/oscar.c:1287
+#: ../libpurple/protocols/irc/irc.c:325
+#: ../libpurple/protocols/jabber/jabber.c:1311
+#: ../libpurple/protocols/msn/session.c:402
+#: ../libpurple/protocols/msnp9/session.c:355
+#: ../libpurple/protocols/myspace/myspace.c:302
+#: ../libpurple/protocols/novell/novell.c:2198
+#: ../libpurple/protocols/oscar/oscar.c:1290
 #: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3723
-#: ../libpurple/protocols/simple/simple.c:1716
-#: ../libpurple/protocols/yahoo/yahoo.c:2939
+#: ../libpurple/protocols/sametime/sametime.c:3768
+#: ../libpurple/protocols/simple/simple.c:1893
+#: ../libpurple/protocols/yahoo/yahoo.c:2948
 #: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:662
 msgid "Connecting"
 msgstr "Conectando"
 
-#: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:610
-#: ../libpurple/protocols/jabber/jabber.c:1095
+#: ../libpurple/protocols/irc/irc.c:335
+#: ../libpurple/protocols/jabber/jabber.c:637
+#: ../libpurple/protocols/jabber/jabber.c:1126
 msgid "SSL support unavailable"
 msgstr "Suporte a SSL indisponível"
 
-#. TODO: try other ports if in auto mode, then save
-#. * working port and try that first next time.
-#: ../libpurple/protocols/irc/irc.c:338
-#: ../libpurple/protocols/myspace/myspace.c:317
-#: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1631
+#: ../libpurple/protocols/irc/irc.c:348
+#: ../libpurple/protocols/myspace/myspace.c:320
+#: ../libpurple/protocols/simple/simple.c:469
+#: ../libpurple/protocols/simple/simple.c:1803
 msgid "Couldn't create socket"
 msgstr "Não foi possível criar socket"
 
-#: ../libpurple/protocols/irc/irc.c:421
-#: ../libpurple/protocols/myspace/myspace.c:2469
-#: ../libpurple/protocols/oscar/oscar.c:1283
+#: ../libpurple/protocols/irc/irc.c:430
+#: ../libpurple/protocols/oscar/oscar.c:1286
 msgid "Couldn't connect to host"
 msgstr "Não foi possível conectar ao host"
 
-#: ../libpurple/protocols/irc/irc.c:609 ../libpurple/protocols/irc/irc.c:634
-#: ../libpurple/protocols/myspace/myspace.c:2352
+#: ../libpurple/protocols/irc/irc.c:620 ../libpurple/protocols/irc/irc.c:649
+#: ../libpurple/protocols/myspace/myspace.c:2372
 msgid "Read error"
 msgstr "Erro de leitura"
 
-#: ../libpurple/protocols/irc/irc.c:773
-#: ../libpurple/protocols/silc/chat.c:1412
+#: ../libpurple/protocols/irc/irc.c:790
+#: ../libpurple/protocols/silc/chat.c:1398
 #: ../libpurple/protocols/silc10/chat.c:1426
 #: ../libpurple/protocols/yahoo/yahoochat.c:1497
 msgid "Users"
 msgstr "Usuários"
 
-#: ../libpurple/protocols/irc/irc.c:776
-#: ../libpurple/protocols/sametime/sametime.c:3374
-#: ../libpurple/protocols/silc/chat.c:1415
-#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/irc/irc.c:793
+#: ../libpurple/protocols/sametime/sametime.c:3416
+#: ../libpurple/protocols/silc/chat.c:1401
+#: ../libpurple/protocols/silc/ops.c:1393
 #: ../libpurple/protocols/silc10/chat.c:1429
 #: ../libpurple/protocols/silc10/ops.c:1382
 #: ../libpurple/protocols/yahoo/yahoochat.c:1506
@@ -4183,55 +4283,57 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:914
+#: ../libpurple/protocols/irc/irc.c:931
 msgid "IRC Protocol Plugin"
 msgstr "Plugin do protocolo IRC"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:915
+#: ../libpurple/protocols/irc/irc.c:932
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "O plugin do protocolo IRC que é menos ruim"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:940 ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2185
-#: ../libpurple/protocols/oscar/oscar.c:6671
-#: ../libpurple/protocols/qq/qq.c:755
-#: ../libpurple/protocols/sametime/sametime.c:5727
+#: ../libpurple/protocols/irc/irc.c:957 ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/msn/msn.c:2335
+#: ../libpurple/protocols/msnp9/msn.c:2186
+#: ../libpurple/protocols/oscar/oscar.c:6721
+#: ../libpurple/protocols/qq/qq.c:756
+#: ../libpurple/protocols/sametime/sametime.c:5773
 #: ../libpurple/protocols/silc/ops.c:1249
-#: ../libpurple/protocols/silc/ops.c:1341
+#: ../libpurple/protocols/silc/ops.c:1343
 #: ../libpurple/protocols/silc10/ops.c:1244
 #: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1896
+#: ../libpurple/protocols/simple/simple.c:2083
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Servidor"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2190
-#: ../libpurple/protocols/oscar/oscar.c:6674
-#: ../libpurple/protocols/qq/qq.c:758
-#: ../libpurple/protocols/sametime/sametime.c:5732
-#: ../libpurple/protocols/silc/silc.c:1918
-#: ../libpurple/protocols/silc10/silc.c:1861
+#: ../libpurple/protocols/irc/irc.c:960 ../libpurple/protocols/msn/msn.c:2340
+#: ../libpurple/protocols/msnp9/msn.c:2191
+#: ../libpurple/protocols/oscar/oscar.c:6724
+#: ../libpurple/protocols/qq/qq.c:759
+#: ../libpurple/protocols/sametime/sametime.c:5778
+#: ../libpurple/protocols/silc/silc.c:2061
+#: ../libpurple/protocols/silc10/silc.c:1864
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Porta"
 
-#: ../libpurple/protocols/irc/irc.c:946
+#: ../libpurple/protocols/irc/irc.c:963
 msgid "Encodings"
 msgstr "Codificações"
 
-#: ../libpurple/protocols/irc/irc.c:949 ../libpurple/protocols/irc/msgs.c:316
-#: ../libpurple/protocols/jabber/jabber.c:904
-#: ../libpurple/protocols/jabber/jabber.c:907
-#: ../libpurple/protocols/silc/buddy.c:1539
+#: ../libpurple/protocols/irc/irc.c:966 ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/jabber/jabber.c:931
+#: ../libpurple/protocols/jabber/jabber.c:934
+#: ../libpurple/protocols/silc/buddy.c:1542
 #: ../libpurple/protocols/silc/ops.c:1197
 #: ../libpurple/protocols/silc/ops.c:1200
-#: ../libpurple/protocols/silc/ops.c:1334
-#: ../libpurple/protocols/silc/ops.c:1337
-#: ../libpurple/protocols/silc/silc.c:1005
-#: ../libpurple/protocols/silc10/buddy.c:1539
+#: ../libpurple/protocols/silc/ops.c:1336
+#: ../libpurple/protocols/silc/ops.c:1339
+#: ../libpurple/protocols/silc/silc.c:1148
+#: ../libpurple/protocols/silc10/buddy.c:1542
 #: ../libpurple/protocols/silc10/ops.c:1191
 #: ../libpurple/protocols/silc10/ops.c:1194
 #: ../libpurple/protocols/silc10/ops.c:1340
@@ -4240,8 +4342,8 @@
 msgid "Username"
 msgstr "Nome do usuário"
 
-#: ../libpurple/protocols/irc/irc.c:952 ../libpurple/protocols/irc/msgs.c:317
-#: ../libpurple/protocols/silc/silc.c:1009
+#: ../libpurple/protocols/irc/irc.c:969 ../libpurple/protocols/irc/msgs.c:317
+#: ../libpurple/protocols/silc/silc.c:1152
 #: ../libpurple/protocols/silc10/silc.c:920
 msgid "Real name"
 msgstr "Nome real"
@@ -4250,7 +4352,7 @@
 #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libpurple/protocols/irc/irc.c:960
+#: ../libpurple/protocols/irc/irc.c:977
 msgid "Use SSL"
 msgstr "Usar SSL"
 
@@ -4281,8 +4383,8 @@
 msgstr " <i>(identificado)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3700
-#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/oscar/oscar.c:3710
+#: ../libpurple/protocols/silc/ops.c:1422
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr "Apelido"
@@ -4380,28 +4482,28 @@
 msgid "Invitation only"
 msgstr "Apenas convidados"
 
-#: ../libpurple/protocols/irc/msgs.c:795
+#: ../libpurple/protocols/irc/msgs.c:798
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Você foi expulso por %s: (%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:800 ../libpurple/protocols/silc/ops.c:699
+#: ../libpurple/protocols/irc/msgs.c:803 ../libpurple/protocols/silc/ops.c:699
 #: ../libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Chutado por %s (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:823
+#: ../libpurple/protocols/irc/msgs.c:826
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "Modo (%s %s) por %s"
 
-#: ../libpurple/protocols/irc/msgs.c:908 ../libpurple/protocols/irc/msgs.c:909
+#: ../libpurple/protocols/irc/msgs.c:911 ../libpurple/protocols/irc/msgs.c:912
 msgid "Invalid nickname"
 msgstr "Apelido inválido"
 
-#: ../libpurple/protocols/irc/msgs.c:910
+#: ../libpurple/protocols/irc/msgs.c:913
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
@@ -4409,7 +4511,7 @@
 "O apelido selecionado foi rejeitado pelo servidor. Provavelmente, ele contém "
 "caracteres inválidos."
 
-#: ../libpurple/protocols/irc/msgs.c:915
+#: ../libpurple/protocols/irc/msgs.c:918
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -4417,44 +4519,44 @@
 "O nome de conta selecionado foi rejeitado pelo servidor. Provavelmente, ele "
 "contém caracteres inválidos."
 
-#: ../libpurple/protocols/irc/msgs.c:954
+#: ../libpurple/protocols/irc/msgs.c:957
 msgid "Cannot change nick"
 msgstr "Não foi possível mudar apelido"
 
-#: ../libpurple/protocols/irc/msgs.c:954
+#: ../libpurple/protocols/irc/msgs.c:957
 msgid "Could not change nick"
 msgstr "Não foi possível mudar apelido"
 
-#: ../libpurple/protocols/irc/msgs.c:975
+#: ../libpurple/protocols/irc/msgs.c:978
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Você saiu do canal%s%s"
 
-#: ../libpurple/protocols/irc/msgs.c:1017
+#: ../libpurple/protocols/irc/msgs.c:1020
 msgid "Error: invalid PONG from server"
 msgstr "Erro: PONG inválido do servidor"
 
-#: ../libpurple/protocols/irc/msgs.c:1019
+#: ../libpurple/protocols/irc/msgs.c:1022
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "Resposta do PING -- Latência: %lu segundos"
 
-#: ../libpurple/protocols/irc/msgs.c:1110
+#: ../libpurple/protocols/irc/msgs.c:1113
 #, c-format
 msgid "Cannot join %s: Registration is required."
 msgstr "Não foi possível entrar em %s: Registro requerido"
 
-#: ../libpurple/protocols/irc/msgs.c:1111
+#: ../libpurple/protocols/irc/msgs.c:1114
 #: ../libpurple/protocols/silc/ops.c:1093
 #: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Não foi possível entrar no canal"
 
-#: ../libpurple/protocols/irc/msgs.c:1145
+#: ../libpurple/protocols/irc/msgs.c:1148
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Este usuário ou canal está temporariamente indisponível."
 
-#: ../libpurple/protocols/irc/msgs.c:1157
+#: ../libpurple/protocols/irc/msgs.c:1160
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops de %s"
@@ -4564,7 +4666,7 @@
 msgstr "names [canal]:  Lista os usuários que estão no canal atualmente."
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:2261
+#: ../libpurple/protocols/jabber/jabber.c:2321
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;novo apelido&gt;:  Muda seu apelido."
 
@@ -4674,55 +4776,55 @@
 "whowas &lt;apelido&gt;:  Exibe informações de um usuário que está "
 "desconectado."
 
-#: ../libpurple/protocols/irc/parse.c:465
+#: ../libpurple/protocols/irc/parse.c:520
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Tempo de resposta de %s: %lu segundos"
 
-#: ../libpurple/protocols/irc/parse.c:466
+#: ../libpurple/protocols/irc/parse.c:521
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:466
+#: ../libpurple/protocols/irc/parse.c:521
 msgid "CTCP PING reply"
 msgstr "Resposta do CTCP PING"
 
-#: ../libpurple/protocols/irc/parse.c:577
-#: ../libpurple/protocols/irc/parse.c:581 ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/irc/parse.c:633
+#: ../libpurple/protocols/irc/parse.c:640 ../libpurple/protocols/toc/toc.c:191
 #: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
 #: ../libpurple/protocols/toc/toc.c:786
 msgid "Disconnected."
 msgstr "Desconectado."
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:137
-#: ../libpurple/protocols/jabber/jabber.c:671
-#: ../libpurple/protocols/jabber/jabber.c:701
-#: ../libpurple/protocols/jabber/jabber.c:1887
+#: ../libpurple/protocols/jabber/adhoccommands.c:143
+#: ../libpurple/protocols/jabber/jabber.c:698
+#: ../libpurple/protocols/jabber/jabber.c:728
+#: ../libpurple/protocols/jabber/jabber.c:1901
 msgid "Unknown Error"
 msgstr "Erro desconhecido"
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:139
-#: ../libpurple/protocols/jabber/adhoccommands.c:140
+#: ../libpurple/protocols/jabber/adhoccommands.c:145
+#: ../libpurple/protocols/jabber/adhoccommands.c:146
 msgid "Ad-Hoc Command Failed"
 msgstr "Comando ad-hoc falhou"
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:173
+#: ../libpurple/protocols/jabber/adhoccommands.c:182
 msgid "execute"
 msgstr "execute"
 
-#: ../libpurple/protocols/jabber/auth.c:53
+#: ../libpurple/protocols/jabber/auth.c:55
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr ""
 "O servidor requer TLS/SSL para conexão. Nenhum suporte a TLS/SSL foi "
 "encontrado."
 
-#: ../libpurple/protocols/jabber/auth.c:116
+#: ../libpurple/protocols/jabber/auth.c:120
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 "O servidor requer autenticação em texto puro sobre um fluxo não-criptografado"
 
-#: ../libpurple/protocols/jabber/auth.c:319
-#: ../libpurple/protocols/jabber/auth.c:508
+#: ../libpurple/protocols/jabber/auth.c:323
+#: ../libpurple/protocols/jabber/auth.c:518
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -4731,33 +4833,32 @@
 "%s requer autenticação via texto puro sobre uma conexão não criptografada. "
 "Deseja permitir isso e continuar a autenticação?"
 
-#: ../libpurple/protocols/jabber/auth.c:321
-#: ../libpurple/protocols/jabber/auth.c:322
-#: ../libpurple/protocols/jabber/auth.c:510
-#: ../libpurple/protocols/jabber/auth.c:511
-#: ../libpurple/protocols/jabber/auth.c:598
-#: ../libpurple/protocols/jabber/auth.c:599
+#: ../libpurple/protocols/jabber/auth.c:325
+#: ../libpurple/protocols/jabber/auth.c:326
+#: ../libpurple/protocols/jabber/auth.c:520
+#: ../libpurple/protocols/jabber/auth.c:521
+#: ../libpurple/protocols/jabber/auth.c:614
+#: ../libpurple/protocols/jabber/auth.c:615
 msgid "Plaintext Authentication"
 msgstr "Autenticação via texto puro"
 
-#: ../libpurple/protocols/jabber/auth.c:334
-#: ../libpurple/protocols/jabber/auth.c:523
-#: ../libpurple/protocols/jabber/auth.c:610
+#: ../libpurple/protocols/jabber/auth.c:340
+#: ../libpurple/protocols/jabber/auth.c:534
+#: ../libpurple/protocols/jabber/auth.c:627
 msgid "Server does not use any supported authentication method"
 msgstr "O servidor não utiliza nenhum método de autenticação suportado"
 
-#. This should never happen!
-#: ../libpurple/protocols/jabber/auth.c:462
-#: ../libpurple/protocols/jabber/auth.c:561
-#: ../libpurple/protocols/jabber/auth.c:776
-#: ../libpurple/protocols/jabber/auth.c:917
-#: ../libpurple/protocols/jabber/auth.c:942
-#: ../libpurple/protocols/jabber/auth.c:961
-#: ../libpurple/protocols/jabber/jabber.c:123
+#: ../libpurple/protocols/jabber/auth.c:472
+#: ../libpurple/protocols/jabber/auth.c:576
+#: ../libpurple/protocols/jabber/auth.c:795
+#: ../libpurple/protocols/jabber/auth.c:944
+#: ../libpurple/protocols/jabber/auth.c:971
+#: ../libpurple/protocols/jabber/auth.c:993
+#: ../libpurple/protocols/jabber/jabber.c:127
 msgid "Invalid response from server."
 msgstr "O servidor retornou uma resposta inválida."
 
-#: ../libpurple/protocols/jabber/auth.c:600
+#: ../libpurple/protocols/jabber/auth.c:616
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
@@ -4765,18 +4866,18 @@
 "O servidor requer autenticação via texto puro sobre uma conexão não "
 "criptografada. Deseja permitir isso e continuar a autenticação?"
 
-#: ../libpurple/protocols/jabber/auth.c:797
-#: ../libpurple/protocols/jabber/auth.c:820
+#: ../libpurple/protocols/jabber/auth.c:818
+#: ../libpurple/protocols/jabber/auth.c:843
 msgid "Invalid challenge from server"
 msgstr "O servidor retornou uma identificação inválida"
 
-#: ../libpurple/protocols/jabber/auth.c:892
+#: ../libpurple/protocols/jabber/auth.c:917
 msgid "SASL error"
 msgstr "Erro de SASL"
 
 #: ../libpurple/protocols/jabber/buddy.c:283
 #: ../libpurple/protocols/jabber/buddy.c:1219
-#: ../libpurple/protocols/sametime/sametime.c:4128
+#: ../libpurple/protocols/sametime/sametime.c:4174
 #: ../libpurple/protocols/silc/ops.c:986
 #: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
@@ -4795,7 +4896,7 @@
 msgstr "Nome"
 
 #: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/jabber.c:977
+#: ../libpurple/protocols/jabber/jabber.c:1004
 msgid "URL"
 msgstr "URL"
 
@@ -4826,7 +4927,7 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:293
 #: ../libpurple/protocols/jabber/buddy.c:1295
-#: ../libpurple/protocols/silc/silc.c:1015
+#: ../libpurple/protocols/silc/silc.c:1158
 #: ../libpurple/protocols/silc10/silc.c:926
 msgid "Country"
 msgstr "País"
@@ -4854,16 +4955,17 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:300
 #: ../libpurple/protocols/jabber/buddy.c:1250
-#: ../libpurple/protocols/msn/msn.c:1658
-#: ../libpurple/protocols/oscar/oscar.c:3749
+#: ../libpurple/protocols/msn/msn.c:1806
+#: ../libpurple/protocols/msnp9/msn.c:1659
+#: ../libpurple/protocols/oscar/oscar.c:3759
 msgid "Birthday"
 msgstr "Data de nascimento"
 
 #: ../libpurple/protocols/jabber/buddy.c:301
 #: ../libpurple/protocols/jabber/buddy.c:1365
 #: ../libpurple/protocols/jabber/chat.c:775
-#: ../libpurple/protocols/jabber/usermood.c:175 ../pidgin/gtkblist.c:3116
-#: ../pidgin/gtkprefs.c:739
+#: ../libpurple/protocols/jabber/usermood.c:193 ../pidgin/gtkblist.c:3350
+#: ../pidgin/gtkprefs.c:740
 msgid "Description"
 msgstr "Descrição"
 
@@ -4982,7 +5084,7 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:851
 #: ../libpurple/protocols/jabber/buddy.c:1011
-#: ../libpurple/protocols/sametime/sametime.c:3235
+#: ../libpurple/protocols/sametime/sametime.c:3277
 msgid "File Transfer"
 msgstr "Transferência de arquivo"
 
@@ -5098,8 +5200,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:897
 #: ../libpurple/protocols/jabber/buddy.c:1057
-#: ../libpurple/protocols/silc/ops.c:1596
-#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc/ops.c:1600
+#: ../libpurple/protocols/silc/ops.c:1605
 #: ../libpurple/protocols/silc10/ops.c:1612
 #: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping"
@@ -5147,22 +5249,22 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:921
 #: ../libpurple/protocols/jabber/buddy.c:1081
-#: ../libpurple/protocols/oscar/oscar.c:2906
+#: ../libpurple/protocols/oscar/oscar.c:2916
 msgid "Capabilities"
 msgstr "Recursos"
 
 #: ../libpurple/protocols/jabber/buddy.c:933
-#: ../libpurple/protocols/jabber/libxmpp.c:206
+#: ../libpurple/protocols/jabber/libxmpp.c:209
 #: ../libpurple/protocols/jabber/si.c:859
 msgid "Resource"
 msgstr "Recurso"
 
 #: ../libpurple/protocols/jabber/buddy.c:935
-#: ../libpurple/protocols/jabber/jabber.c:1531
-#: ../libpurple/protocols/jabber/jabber.c:1554
-#: ../libpurple/protocols/jabber/jabber.c:1577
-#: ../libpurple/protocols/jabber/jabber.c:1600
-#: ../libpurple/protocols/jabber/jabber.c:1623
+#: ../libpurple/protocols/jabber/jabber.c:1569
+#: ../libpurple/protocols/jabber/jabber.c:1583
+#: ../libpurple/protocols/jabber/jabber.c:1597
+#: ../libpurple/protocols/jabber/jabber.c:1611
+#: ../libpurple/protocols/jabber/jabber.c:1625
 msgid "Priority"
 msgstr "Prioridade"
 
@@ -5173,9 +5275,9 @@
 msgstr "Nome do meio"
 
 #: ../libpurple/protocols/jabber/buddy.c:1270
-#: ../libpurple/protocols/jabber/jabber.c:952
-#: ../libpurple/protocols/oscar/oscar.c:3788
-#: ../libpurple/protocols/oscar/oscar.c:3801
+#: ../libpurple/protocols/jabber/jabber.c:979
+#: ../libpurple/protocols/oscar/oscar.c:3798
+#: ../libpurple/protocols/oscar/oscar.c:3811
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1030
 #: ../libpurple/protocols/silc10/ops.c:1064
@@ -5194,72 +5296,72 @@
 msgid "Logo"
 msgstr "Logotipo"
 
-#: ../libpurple/protocols/jabber/buddy.c:1942
+#: ../libpurple/protocols/jabber/buddy.c:1945
 msgid "Un-hide From"
 msgstr "Não ocultar-se de"
 
-#: ../libpurple/protocols/jabber/buddy.c:1946
+#: ../libpurple/protocols/jabber/buddy.c:1949
 msgid "Temporarily Hide From"
 msgstr "Ocultar-se temporariamente de"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1954
+#: ../libpurple/protocols/jabber/buddy.c:1957
 msgid "Cancel Presence Notification"
 msgstr "Cancelar notificação de presença"
 
-#: ../libpurple/protocols/jabber/buddy.c:1961
+#: ../libpurple/protocols/jabber/buddy.c:1964
 msgid "(Re-)Request authorization"
 msgstr "(Re-)requisitar autorização"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1970
+#: ../libpurple/protocols/jabber/buddy.c:1973
 msgid "Unsubscribe"
 msgstr "Parar de monitorar a presença"
 
-#: ../libpurple/protocols/jabber/buddy.c:1985
+#: ../libpurple/protocols/jabber/buddy.c:1988
 msgid "Log In"
 msgstr "Conectar"
 
-#: ../libpurple/protocols/jabber/buddy.c:1989
+#: ../libpurple/protocols/jabber/buddy.c:1992
 msgid "Log Out"
 msgstr "Desconectar"
 
-#: ../libpurple/protocols/jabber/buddy.c:2035
-#: ../libpurple/protocols/jabber/jabber.c:1553
+#: ../libpurple/protocols/jabber/buddy.c:2038
+#: ../libpurple/protocols/jabber/jabber.c:1582
 msgid "Chatty"
 msgstr "Disponível para bate-papo"
 
-#: ../libpurple/protocols/jabber/buddy.c:2039
+#: ../libpurple/protocols/jabber/buddy.c:2042
 msgid "Extended Away"
 msgstr "Ausente (estendido)"
 
-#: ../libpurple/protocols/jabber/buddy.c:2041
-#: ../libpurple/protocols/jabber/jabber.c:1622
+#: ../libpurple/protocols/jabber/buddy.c:2044
+#: ../libpurple/protocols/jabber/jabber.c:1624
 #: ../libpurple/protocols/oscar/oscar.c:727
-#: ../libpurple/protocols/oscar/oscar.c:5808
-#: ../libpurple/protocols/sametime/sametime.c:3297
+#: ../libpurple/protocols/oscar/oscar.c:5858
+#: ../libpurple/protocols/sametime/sametime.c:3339
 #, c-format
 msgid "Do Not Disturb"
 msgstr "Não perturbe"
 
-#: ../libpurple/protocols/jabber/buddy.c:2208
+#: ../libpurple/protocols/jabber/buddy.c:2211
 msgid "JID"
 msgstr "ID Jabber"
 
-#: ../libpurple/protocols/jabber/buddy.c:2212
-#: ../libpurple/protocols/jabber/buddy.c:2391
-#: ../libpurple/protocols/oscar/oscar.c:3711
+#: ../libpurple/protocols/jabber/buddy.c:2215
+#: ../libpurple/protocols/jabber/buddy.c:2404
+#: ../libpurple/protocols/oscar/oscar.c:3721
 msgid "Last Name"
 msgstr "Sobrenome"
 
-#: ../libpurple/protocols/jabber/buddy.c:2244
+#: ../libpurple/protocols/jabber/buddy.c:2247
 msgid "The following are the results of your search"
 msgstr "Os seguintes são os resultados da sua busca"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:2319
+#: ../libpurple/protocols/jabber/buddy.c:2332
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -5267,70 +5369,70 @@
 "Encontre um contato digitando critérios de busca nos campos abaixo. Nota: "
 "Todos os campos suportam caracteres coringa (%)"
 
-#: ../libpurple/protocols/jabber/buddy.c:2339
+#: ../libpurple/protocols/jabber/buddy.c:2352
 msgid "Directory Query Failed"
 msgstr "A consulta ao serviço de diretório falhou"
 
-#: ../libpurple/protocols/jabber/buddy.c:2340
+#: ../libpurple/protocols/jabber/buddy.c:2353
 msgid "Could not query the directory server."
 msgstr "Não foi possível consultar o servidor do serviço de diretório."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:2374
+#: ../libpurple/protocols/jabber/buddy.c:2387
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Instruções do servidor: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:2381
+#: ../libpurple/protocols/jabber/buddy.c:2394
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 "Preencha um ou mais campos para procurar um usuário XMPP que satisfaça este "
 "critério."
 
-#: ../libpurple/protocols/jabber/buddy.c:2401
-#: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3714
-#: ../libpurple/protocols/oscar/oscar.c:3723
+#: ../libpurple/protocols/jabber/buddy.c:2414
+#: ../libpurple/protocols/novell/novell.c:1497
+#: ../libpurple/protocols/oscar/oscar.c:3724
+#: ../libpurple/protocols/oscar/oscar.c:3733
 msgid "E-Mail Address"
 msgstr "Endereço de e-mail"
 
-#: ../libpurple/protocols/jabber/buddy.c:2410
-#: ../libpurple/protocols/jabber/buddy.c:2411
+#: ../libpurple/protocols/jabber/buddy.c:2423
+#: ../libpurple/protocols/jabber/buddy.c:2424
 msgid "Search for XMPP users"
 msgstr "Procurar por usuários XMPP"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:2412
+#: ../libpurple/protocols/jabber/buddy.c:2425
 #: ../libpurple/protocols/qq/group.c:123
 #: ../libpurple/protocols/qq/group_im.c:147
 #: ../libpurple/protocols/qq/sys_msg.c:174
 #: ../libpurple/protocols/qq/sys_msg.c:250
 #: ../libpurple/protocols/qq/sys_msg.c:268
-#: ../libpurple/protocols/sametime/sametime.c:5611
+#: ../libpurple/protocols/sametime/sametime.c:5657
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
 msgstr "Procurar"
 
-#: ../libpurple/protocols/jabber/buddy.c:2427
+#: ../libpurple/protocols/jabber/buddy.c:2440
 msgid "Invalid Directory"
 msgstr "Diretório inválido"
 
-#: ../libpurple/protocols/jabber/buddy.c:2444
+#: ../libpurple/protocols/jabber/buddy.c:2457
 msgid "Enter a User Directory"
 msgstr "Digite um diretório de usuários"
 
-#: ../libpurple/protocols/jabber/buddy.c:2445
+#: ../libpurple/protocols/jabber/buddy.c:2458
 msgid "Select a user directory to search"
 msgstr "Selecione um diretório de usuários para procurar"
 
-#: ../libpurple/protocols/jabber/buddy.c:2448
+#: ../libpurple/protocols/jabber/buddy.c:2461
 msgid "Search Directory"
 msgstr "Diretório de busca"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5294
+#: ../libpurple/protocols/oscar/oscar.c:5342
 #: ../libpurple/protocols/yahoo/yahoochat.c:1048
 msgid "_Room:"
 msgstr "Sa_la:"
@@ -5400,7 +5502,7 @@
 
 #: ../libpurple/protocols/jabber/chat.c:678
 #: ../libpurple/protocols/jabber/chat.c:689
-#: ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/silc/ops.c:1460
 #: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "Erro ao obter lista de salas"
@@ -5421,29 +5523,25 @@
 msgid "Find Rooms"
 msgstr "Encontrar salas"
 
-#: ../libpurple/protocols/jabber/jabber.c:92
-msgid "Error initializing session"
-msgstr "Erro ao inicializar sessão"
-
-#: ../libpurple/protocols/jabber/jabber.c:145
+#: ../libpurple/protocols/jabber/jabber.c:151
 msgid "You require encryption, but it is not available on this server."
 msgstr "Você requereu criptografia, mas este servidor não a suporta."
 
-#: ../libpurple/protocols/jabber/jabber.c:259
-#: ../libpurple/protocols/jabber/jabber.c:312
-#: ../libpurple/protocols/jabber/jabber.c:340
+#: ../libpurple/protocols/jabber/jabber.c:269
+#: ../libpurple/protocols/jabber/jabber.c:324
+#: ../libpurple/protocols/jabber/jabber.c:354
 msgid "Write error"
 msgstr "Erro ao enviar"
 
-#: ../libpurple/protocols/jabber/jabber.c:408
-#: ../libpurple/protocols/jabber/jabber.c:445
+#: ../libpurple/protocols/jabber/jabber.c:424
+#: ../libpurple/protocols/jabber/jabber.c:463
 msgid "Read Error"
 msgstr "Erro de leitura"
 
-#: ../libpurple/protocols/jabber/jabber.c:482
-#: ../libpurple/protocols/oscar/flap_connection.c:394
-#: ../libpurple/protocols/yahoo/yahoo.c:2558
-#: ../libpurple/protocols/yahoo/yahoo.c:2590
+#: ../libpurple/protocols/jabber/jabber.c:500
+#: ../libpurple/protocols/oscar/flap_connection.c:398
+#: ../libpurple/protocols/yahoo/yahoo.c:2562
+#: ../libpurple/protocols/yahoo/yahoo.c:2594
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -5452,616 +5550,604 @@
 "Não foi possível estabelecer conexão com o servidor:\n"
 "%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:529
+#: ../libpurple/protocols/jabber/jabber.c:550
 msgid "Unable to create socket"
 msgstr "Não foi possível criar socket"
 
-#: ../libpurple/protocols/jabber/jabber.c:575
-#: ../libpurple/protocols/jabber/jabber.c:1063
+#: ../libpurple/protocols/jabber/jabber.c:598
+#: ../libpurple/protocols/jabber/jabber.c:1092
 msgid "Invalid XMPP ID"
 msgstr "ID do XMPP inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:580
+#: ../libpurple/protocols/jabber/jabber.c:605
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "ID do XMPP inválido. O domínio precisa ser especificado."
 
-#: ../libpurple/protocols/jabber/jabber.c:656
+#: ../libpurple/protocols/jabber/jabber.c:683
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registro de %s@%s foi efetuado com sucesso"
 
-#: ../libpurple/protocols/jabber/jabber.c:662
+#: ../libpurple/protocols/jabber/jabber.c:689
 #, c-format
 msgid "Registration to %s successful"
 msgstr "Registro em %s efetuado com sucesso"
 
-#: ../libpurple/protocols/jabber/jabber.c:664
-#: ../libpurple/protocols/jabber/jabber.c:665
+#: ../libpurple/protocols/jabber/jabber.c:691
+#: ../libpurple/protocols/jabber/jabber.c:692
 msgid "Registration Successful"
 msgstr "Registro efetuado com sucesso"
 
-#: ../libpurple/protocols/jabber/jabber.c:673
-#: ../libpurple/protocols/jabber/jabber.c:674
+#: ../libpurple/protocols/jabber/jabber.c:700
+#: ../libpurple/protocols/jabber/jabber.c:701
 msgid "Registration Failed"
 msgstr "Registro falhou"
 
-#: ../libpurple/protocols/jabber/jabber.c:692
+#: ../libpurple/protocols/jabber/jabber.c:719
 #, c-format
 msgid "Registration from %s successfully removed"
 msgstr "Remoção do registro de %s efetuada com sucesso"
 
-#: ../libpurple/protocols/jabber/jabber.c:694
-#: ../libpurple/protocols/jabber/jabber.c:695
+#: ../libpurple/protocols/jabber/jabber.c:721
+#: ../libpurple/protocols/jabber/jabber.c:722
 msgid "Unregistration Successful"
 msgstr "Desregistro efetuado com sucesso"
 
-#: ../libpurple/protocols/jabber/jabber.c:703
-#: ../libpurple/protocols/jabber/jabber.c:704
+#: ../libpurple/protocols/jabber/jabber.c:730
+#: ../libpurple/protocols/jabber/jabber.c:731
 msgid "Unregistration Failed"
 msgstr "Desregistro falhou"
 
-#: ../libpurple/protocols/jabber/jabber.c:864
-#: ../libpurple/protocols/jabber/jabber.c:865
+#: ../libpurple/protocols/jabber/jabber.c:891
+#: ../libpurple/protocols/jabber/jabber.c:892
 msgid "Already Registered"
 msgstr "Já está registrado"
 
-#: ../libpurple/protocols/jabber/jabber.c:962
-#: ../libpurple/protocols/oscar/oscar.c:3790
-#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/jabber/jabber.c:989
+#: ../libpurple/protocols/oscar/oscar.c:3800
+#: ../libpurple/protocols/oscar/oscar.c:3813
 msgid "State"
 msgstr "Estado"
 
-#: ../libpurple/protocols/jabber/jabber.c:967
+#: ../libpurple/protocols/jabber/jabber.c:994
 msgid "Postal code"
 msgstr "Código postal (CEP)"
 
-#: ../libpurple/protocols/jabber/jabber.c:972
+#: ../libpurple/protocols/jabber/jabber.c:999
 #: ../libpurple/protocols/silc/ops.c:1035
-#: ../libpurple/protocols/silc/silc.c:772
-#: ../libpurple/protocols/silc/util.c:557
+#: ../libpurple/protocols/silc/silc.c:915
+#: ../libpurple/protocols/silc/util.c:563
 #: ../libpurple/protocols/silc10/ops.c:1069
 #: ../libpurple/protocols/silc10/silc.c:683
 #: ../libpurple/protocols/silc10/util.c:553
 msgid "Phone"
 msgstr "Telefone"
 
-#: ../libpurple/protocols/jabber/jabber.c:982
+#: ../libpurple/protocols/jabber/jabber.c:1009
 msgid "Date"
 msgstr "Data"
 
-#: ../libpurple/protocols/jabber/jabber.c:987
+#: ../libpurple/protocols/jabber/jabber.c:1014
 msgid "Unregister"
 msgstr "Desregistrar"
 
-#: ../libpurple/protocols/jabber/jabber.c:994
+#: ../libpurple/protocols/jabber/jabber.c:1021
 msgid ""
 "Please fill out the information below to change your account registration."
 msgstr ""
 "Por favor preencha as informações abaixo para mudar seu registro de conta."
 
-#: ../libpurple/protocols/jabber/jabber.c:997
+#: ../libpurple/protocols/jabber/jabber.c:1024
 msgid "Please fill out the information below to register your new account."
 msgstr ""
 "Por favor preencha as informações abaixo para registrar sua nova conta."
 
-#: ../libpurple/protocols/jabber/jabber.c:1005
-#: ../libpurple/protocols/jabber/jabber.c:1006
+#: ../libpurple/protocols/jabber/jabber.c:1032
+#: ../libpurple/protocols/jabber/jabber.c:1033
 msgid "Register New XMPP Account"
 msgstr "Registrar nova conta do XMPP"
 
-#: ../libpurple/protocols/jabber/jabber.c:1007
-#: ../libpurple/protocols/jabber/jabber.c:1016
+#: ../libpurple/protocols/jabber/jabber.c:1034
+#: ../libpurple/protocols/jabber/jabber.c:1043
 msgid "Register"
 msgstr "Registrar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1012
+#: ../libpurple/protocols/jabber/jabber.c:1039
 #, c-format
 msgid "Change Account Registration at %s"
 msgstr "Modificar registro de conta em %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1013
+#: ../libpurple/protocols/jabber/jabber.c:1040
 #, c-format
 msgid "Register New Account at %s"
 msgstr "Registrar nova conta em %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1016
+#: ../libpurple/protocols/jabber/jabber.c:1043
 msgid "Change Registration"
 msgstr "Mudar registro"
 
-#: ../libpurple/protocols/jabber/jabber.c:1120
-#: ../libpurple/protocols/jabber/jabber.c:1121
+#: ../libpurple/protocols/jabber/jabber.c:1151
+#: ../libpurple/protocols/jabber/jabber.c:1152
 msgid "Error unregistering account"
 msgstr "Erro ao desregistrar conta"
 
-#: ../libpurple/protocols/jabber/jabber.c:1126
-#: ../libpurple/protocols/jabber/jabber.c:1127
+#: ../libpurple/protocols/jabber/jabber.c:1157
+#: ../libpurple/protocols/jabber/jabber.c:1158
 msgid "Account successfully unregistered"
 msgstr "Conta desregistrada com sucesso"
 
-#: ../libpurple/protocols/jabber/jabber.c:1284
+#: ../libpurple/protocols/jabber/jabber.c:1315
 msgid "Initializing Stream"
 msgstr "Inicializando fluxo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1289
+#: ../libpurple/protocols/jabber/jabber.c:1320
 msgid "Initializing SSL/TLS"
 msgstr "Inicializando SSL/TLS"
 
-#: ../libpurple/protocols/jabber/jabber.c:1293
-#: ../libpurple/protocols/msn/session.c:351
+#: ../libpurple/protocols/jabber/jabber.c:1324
+#: ../libpurple/protocols/msn/session.c:408
+#: ../libpurple/protocols/msnp9/session.c:361
 msgid "Authenticating"
 msgstr "Autenticando"
 
-#: ../libpurple/protocols/jabber/jabber.c:1302
+#: ../libpurple/protocols/jabber/jabber.c:1333
 msgid "Re-initializing Stream"
 msgstr "Reinicializando fluxo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1396
-#: ../libpurple/protocols/jabber/jabber.c:1865
-#: ../libpurple/protocols/jabber/jabber.c:1909
-#: ../libpurple/protocols/jabber/jabber.c:1945
+#: ../libpurple/protocols/jabber/jabber.c:1427
+#: ../libpurple/protocols/jabber/jabber.c:1879
+#: ../libpurple/protocols/jabber/jabber.c:1922
+#: ../libpurple/protocols/jabber/jabber.c:1960
 #: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:5602
+#: ../libpurple/protocols/oscar/oscar.c:5652
 msgid "Not Authorized"
 msgstr "Não autorizado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1442
+#: ../libpurple/protocols/jabber/jabber.c:1475
 msgid "Both"
 msgstr "Ambas"
 
-#: ../libpurple/protocols/jabber/jabber.c:1444
+#: ../libpurple/protocols/jabber/jabber.c:1477
 msgid "From (To pending)"
 msgstr "De (Para pendente)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1446
+#: ../libpurple/protocols/jabber/jabber.c:1479
 msgid "From"
 msgstr "De"
 
-#: ../libpurple/protocols/jabber/jabber.c:1449
+#: ../libpurple/protocols/jabber/jabber.c:1482
 msgid "To"
 msgstr "Para"
 
-#: ../libpurple/protocols/jabber/jabber.c:1451
+#: ../libpurple/protocols/jabber/jabber.c:1484
 msgid "None (To pending)"
 msgstr "Nenhuma (Para pendente)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1453
+#: ../libpurple/protocols/jabber/jabber.c:1486
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "Nenhuma"
 
-#: ../libpurple/protocols/jabber/jabber.c:1456
+#: ../libpurple/protocols/jabber/jabber.c:1489
 msgid "Subscription"
 msgstr "Inscrição"
 
-#: ../libpurple/protocols/jabber/jabber.c:1466
-#: ../libpurple/protocols/jabber/jabber.c:1469
-#: ../libpurple/protocols/jabber/jabber.c:1533
-#: ../libpurple/protocols/jabber/jabber.c:1556
-#: ../libpurple/protocols/jabber/jabber.c:1579
-#: ../libpurple/protocols/jabber/jabber.c:1602
-#: ../libpurple/protocols/jabber/jabber.c:1625
-#: ../libpurple/protocols/jabber/usermood.c:166
-#: ../libpurple/protocols/silc/buddy.c:1557
+#: ../libpurple/protocols/jabber/jabber.c:1499
+#: ../libpurple/protocols/jabber/jabber.c:1502
+#: ../libpurple/protocols/jabber/jabber.c:1571
+#: ../libpurple/protocols/jabber/jabber.c:1585
+#: ../libpurple/protocols/jabber/jabber.c:1599
+#: ../libpurple/protocols/jabber/jabber.c:1613
+#: ../libpurple/protocols/jabber/jabber.c:1627
+#: ../libpurple/protocols/jabber/usermood.c:184
+#: ../libpurple/protocols/silc/buddy.c:1560
 #: ../libpurple/protocols/silc/ops.c:1212
-#: ../libpurple/protocols/silc10/buddy.c:1557
+#: ../libpurple/protocols/silc10/buddy.c:1560
 #: ../libpurple/protocols/silc10/ops.c:1207
 msgid "Mood"
 msgstr "Humor"
 
-#: ../libpurple/protocols/jabber/jabber.c:1534
-#: ../libpurple/protocols/jabber/jabber.c:1557
-#: ../libpurple/protocols/jabber/jabber.c:1580
-#: ../libpurple/protocols/jabber/jabber.c:1603
-#: ../libpurple/protocols/jabber/jabber.c:1626
+#: ../libpurple/protocols/jabber/jabber.c:1507
+#: ../libpurple/protocols/msn/msn.c:647
+msgid "Current media"
+msgstr "Mídia atual"
+
+#: ../libpurple/protocols/jabber/jabber.c:1572
+#: ../libpurple/protocols/jabber/jabber.c:1586
+#: ../libpurple/protocols/jabber/jabber.c:1600
+#: ../libpurple/protocols/jabber/jabber.c:1614
+#: ../libpurple/protocols/jabber/jabber.c:1628
 msgid "Mood Text"
 msgstr "Humor (texto)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1535
-#: ../libpurple/protocols/jabber/jabber.c:1558
-#: ../libpurple/protocols/jabber/jabber.c:1581
-#: ../libpurple/protocols/jabber/jabber.c:1604
-#: ../libpurple/protocols/jabber/jabber.c:1627
+#: ../libpurple/protocols/jabber/jabber.c:1574
+#: ../libpurple/protocols/jabber/jabber.c:1588
+#: ../libpurple/protocols/jabber/jabber.c:1602
+#: ../libpurple/protocols/jabber/jabber.c:1616
+#: ../libpurple/protocols/jabber/jabber.c:1630
+msgid "Allow Buzz"
+msgstr "Permitir que chamem sua atenção"
+
+#: ../libpurple/protocols/jabber/jabber.c:1648
 msgid "Tune Artist"
 msgstr "Artista da música"
 
-#: ../libpurple/protocols/jabber/jabber.c:1536
-#: ../libpurple/protocols/jabber/jabber.c:1559
-#: ../libpurple/protocols/jabber/jabber.c:1582
-#: ../libpurple/protocols/jabber/jabber.c:1605
-#: ../libpurple/protocols/jabber/jabber.c:1628
+#: ../libpurple/protocols/jabber/jabber.c:1649
 msgid "Tune Title"
 msgstr "Título da música"
 
-#: ../libpurple/protocols/jabber/jabber.c:1537
-#: ../libpurple/protocols/jabber/jabber.c:1560
-#: ../libpurple/protocols/jabber/jabber.c:1583
-#: ../libpurple/protocols/jabber/jabber.c:1606
-#: ../libpurple/protocols/jabber/jabber.c:1629
+#: ../libpurple/protocols/jabber/jabber.c:1650
 msgid "Tune Album"
 msgstr "Álbum da música"
 
-#: ../libpurple/protocols/jabber/jabber.c:1538
-#: ../libpurple/protocols/jabber/jabber.c:1561
-#: ../libpurple/protocols/jabber/jabber.c:1584
-#: ../libpurple/protocols/jabber/jabber.c:1607
-#: ../libpurple/protocols/jabber/jabber.c:1630
+#: ../libpurple/protocols/jabber/jabber.c:1651
 msgid "Tune Genre"
 msgstr "Gênero da música"
 
-#: ../libpurple/protocols/jabber/jabber.c:1539
-#: ../libpurple/protocols/jabber/jabber.c:1562
-#: ../libpurple/protocols/jabber/jabber.c:1585
-#: ../libpurple/protocols/jabber/jabber.c:1608
-#: ../libpurple/protocols/jabber/jabber.c:1631
+#: ../libpurple/protocols/jabber/jabber.c:1652
 msgid "Tune Comment"
 msgstr "Comentário da música"
 
-#: ../libpurple/protocols/jabber/jabber.c:1540
-#: ../libpurple/protocols/jabber/jabber.c:1563
-#: ../libpurple/protocols/jabber/jabber.c:1586
-#: ../libpurple/protocols/jabber/jabber.c:1609
-#: ../libpurple/protocols/jabber/jabber.c:1632
+#: ../libpurple/protocols/jabber/jabber.c:1653
 msgid "Tune Track"
 msgstr "Faixa da música"
 
-#: ../libpurple/protocols/jabber/jabber.c:1541
-#: ../libpurple/protocols/jabber/jabber.c:1564
-#: ../libpurple/protocols/jabber/jabber.c:1587
-#: ../libpurple/protocols/jabber/jabber.c:1610
-#: ../libpurple/protocols/jabber/jabber.c:1633
+#: ../libpurple/protocols/jabber/jabber.c:1654
 msgid "Tune Time"
 msgstr "Duração da música"
 
-#: ../libpurple/protocols/jabber/jabber.c:1542
-#: ../libpurple/protocols/jabber/jabber.c:1565
-#: ../libpurple/protocols/jabber/jabber.c:1588
-#: ../libpurple/protocols/jabber/jabber.c:1611
-#: ../libpurple/protocols/jabber/jabber.c:1634
+#: ../libpurple/protocols/jabber/jabber.c:1655
 msgid "Tune Year"
 msgstr "Ano da música"
 
-#: ../libpurple/protocols/jabber/jabber.c:1543
-#: ../libpurple/protocols/jabber/jabber.c:1566
-#: ../libpurple/protocols/jabber/jabber.c:1589
-#: ../libpurple/protocols/jabber/jabber.c:1612
-#: ../libpurple/protocols/jabber/jabber.c:1635
+#: ../libpurple/protocols/jabber/jabber.c:1656
 msgid "Tune URL"
 msgstr "URL da música"
 
-#: ../libpurple/protocols/jabber/jabber.c:1545
-#: ../libpurple/protocols/jabber/jabber.c:1568
-#: ../libpurple/protocols/jabber/jabber.c:1591
-#: ../libpurple/protocols/jabber/jabber.c:1614
-#: ../libpurple/protocols/jabber/jabber.c:1637
-msgid "Allow Buzz"
-msgstr "Permitir que chamem sua atenção"
-
-#: ../libpurple/protocols/jabber/jabber.c:1665
+#: ../libpurple/protocols/jabber/jabber.c:1672
 msgid "Password Changed"
 msgstr "Senha alterada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1666
+#: ../libpurple/protocols/jabber/jabber.c:1673
 msgid "Your password has been changed."
 msgstr "Sua senha foi alterada."
 
-#: ../libpurple/protocols/jabber/jabber.c:1670
-#: ../libpurple/protocols/jabber/jabber.c:1671
+#: ../libpurple/protocols/jabber/jabber.c:1679
+#: ../libpurple/protocols/jabber/jabber.c:1680
 msgid "Error changing password"
 msgstr "Erro ao mudar a senha"
 
-#: ../libpurple/protocols/jabber/jabber.c:1728
+#: ../libpurple/protocols/jabber/jabber.c:1737
 msgid "Password (again)"
 msgstr "Senha (novamente)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1734
-#: ../libpurple/protocols/jabber/jabber.c:1735
+#: ../libpurple/protocols/jabber/jabber.c:1743
+#: ../libpurple/protocols/jabber/jabber.c:1744
 msgid "Change XMPP Password"
 msgstr "Alterar senha do XMPP"
 
-#: ../libpurple/protocols/jabber/jabber.c:1735
+#: ../libpurple/protocols/jabber/jabber.c:1744
 msgid "Please enter your new password"
 msgstr "Favor digitar sua nova senha"
 
-#: ../libpurple/protocols/jabber/jabber.c:1749
-#: ../libpurple/protocols/oscar/oscar.c:6388
-#: ../libpurple/protocols/silc/silc.c:1093
-#: ../libpurple/protocols/silc10/silc.c:1004
+#: ../libpurple/protocols/jabber/jabber.c:1758
+#: ../libpurple/protocols/oscar/oscar.c:6438
+#: ../libpurple/protocols/silc/silc.c:1236
+#: ../libpurple/protocols/silc10/silc.c:1007
 msgid "Set User Info..."
 msgstr "Definir informações de usuário..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1754
-#: ../libpurple/protocols/oscar/oscar.c:6399
-#: ../libpurple/protocols/silc/silc.c:1089
-#: ../libpurple/protocols/silc10/silc.c:1000
+#: ../libpurple/protocols/jabber/jabber.c:1763
+#: ../libpurple/protocols/oscar/oscar.c:6449
+#: ../libpurple/protocols/silc/silc.c:1232
+#: ../libpurple/protocols/silc10/silc.c:1003
 msgid "Change Password..."
 msgstr "Alterar senha..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1759
+#: ../libpurple/protocols/jabber/jabber.c:1768
 msgid "Search for Users..."
 msgstr "Procurar por usuários..."
 
-#: ../libpurple/protocols/jabber/jabber.c:1845
+#: ../libpurple/protocols/jabber/jabber.c:1859
 msgid "Bad Request"
 msgstr "Requisição inválida"
 
-#: ../libpurple/protocols/jabber/jabber.c:1847
+#: ../libpurple/protocols/jabber/jabber.c:1861
 msgid "Conflict"
 msgstr "Conflito"
 
-#: ../libpurple/protocols/jabber/jabber.c:1849
+#: ../libpurple/protocols/jabber/jabber.c:1863
 msgid "Feature Not Implemented"
 msgstr "Recurso não implementado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1851
+#: ../libpurple/protocols/jabber/jabber.c:1865
 msgid "Forbidden"
 msgstr "Proibido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1853
+#: ../libpurple/protocols/jabber/jabber.c:1867
 msgid "Gone"
 msgstr "Saiu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1855
-#: ../libpurple/protocols/jabber/jabber.c:1935
+#: ../libpurple/protocols/jabber/jabber.c:1869
+#: ../libpurple/protocols/jabber/jabber.c:1950
 msgid "Internal Server Error"
 msgstr "Erro interno do servidor"
 
-#: ../libpurple/protocols/jabber/jabber.c:1857
+#: ../libpurple/protocols/jabber/jabber.c:1871
 msgid "Item Not Found"
 msgstr "Item não encontrado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1859
+#: ../libpurple/protocols/jabber/jabber.c:1873
 msgid "Malformed XMPP ID"
 msgstr "ID do XMPP em formato inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1861
+#: ../libpurple/protocols/jabber/jabber.c:1875
 msgid "Not Acceptable"
 msgstr "Não aceitável"
 
-#: ../libpurple/protocols/jabber/jabber.c:1863
-msgid "Not Allowed"
-msgstr "Não permitido"
-
-#: ../libpurple/protocols/jabber/jabber.c:1867
-msgid "Payment Required"
-msgstr "Pagamento requerido"
-
-#: ../libpurple/protocols/jabber/jabber.c:1869
-msgid "Recipient Unavailable"
-msgstr "Destinatário indisponível"
-
-#: ../libpurple/protocols/jabber/jabber.c:1873
-msgid "Registration Required"
-msgstr "Registro requerido"
-
-#: ../libpurple/protocols/jabber/jabber.c:1875
-msgid "Remote Server Not Found"
-msgstr "Servidor remoto não encontrado"
-
 #: ../libpurple/protocols/jabber/jabber.c:1877
+msgid "Not Allowed"
+msgstr "Não permitido"
+
+#: ../libpurple/protocols/jabber/jabber.c:1881
+msgid "Payment Required"
+msgstr "Pagamento requerido"
+
+#: ../libpurple/protocols/jabber/jabber.c:1883
+msgid "Recipient Unavailable"
+msgstr "Destinatário indisponível"
+
+#: ../libpurple/protocols/jabber/jabber.c:1887
+msgid "Registration Required"
+msgstr "Registro requerido"
+
+#: ../libpurple/protocols/jabber/jabber.c:1889
+msgid "Remote Server Not Found"
+msgstr "Servidor remoto não encontrado"
+
+#: ../libpurple/protocols/jabber/jabber.c:1891
 msgid "Remote Server Timeout"
 msgstr "Tempo limite esgotado ao conectar ao servidor remoto"
 
-#: ../libpurple/protocols/jabber/jabber.c:1879
+#: ../libpurple/protocols/jabber/jabber.c:1893
 msgid "Server Overloaded"
 msgstr "Servidor sobrecarregado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1881
+#: ../libpurple/protocols/jabber/jabber.c:1895
 msgid "Service Unavailable"
 msgstr "Serviço indisponível"
 
-#: ../libpurple/protocols/jabber/jabber.c:1883
+#: ../libpurple/protocols/jabber/jabber.c:1897
 msgid "Subscription Required"
 msgstr "Inscrição requerida"
 
-#: ../libpurple/protocols/jabber/jabber.c:1885
+#: ../libpurple/protocols/jabber/jabber.c:1899
 msgid "Unexpected Request"
 msgstr "Requisição inesperada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1892
+#: ../libpurple/protocols/jabber/jabber.c:1907
 msgid "Authorization Aborted"
 msgstr "Autorização abortada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1894
+#: ../libpurple/protocols/jabber/jabber.c:1909
 msgid "Incorrect encoding in authorization"
 msgstr "Codificação da autorização incorreta"
 
-#: ../libpurple/protocols/jabber/jabber.c:1897
+#: ../libpurple/protocols/jabber/jabber.c:1911
 msgid "Invalid authzid"
 msgstr "Authzid inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1900
+#: ../libpurple/protocols/jabber/jabber.c:1913
 msgid "Invalid Authorization Mechanism"
 msgstr "Mecanismo de autorização inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1903
+#: ../libpurple/protocols/jabber/jabber.c:1916
 msgid "Authorization mechanism too weak"
 msgstr "Mecanismo de autenticação fraco demais"
 
-#: ../libpurple/protocols/jabber/jabber.c:1911
+#: ../libpurple/protocols/jabber/jabber.c:1924
 msgid "Temporary Authentication Failure"
 msgstr "Falha temporária na autenticação"
 
-#: ../libpurple/protocols/jabber/jabber.c:1914
+#: ../libpurple/protocols/jabber/jabber.c:1927
 msgid "Authentication Failure"
 msgstr "Falha na autenticação"
 
-#: ../libpurple/protocols/jabber/jabber.c:1920
+#: ../libpurple/protocols/jabber/jabber.c:1935
 msgid "Bad Format"
 msgstr "Formato inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1922
+#: ../libpurple/protocols/jabber/jabber.c:1937
 msgid "Bad Namespace Prefix"
 msgstr "Prefixo de namespace inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1925
+#: ../libpurple/protocols/jabber/jabber.c:1940
 msgid "Resource Conflict"
 msgstr "Conflito de recursos"
 
-#: ../libpurple/protocols/jabber/jabber.c:1927
-#: ../libpurple/protocols/silc/silc.c:244
+#: ../libpurple/protocols/jabber/jabber.c:1942
+#: ../libpurple/protocols/silc/silc.c:350
 #: ../libpurple/protocols/silc10/ops.c:1720
 msgid "Connection Timeout"
 msgstr "Tempo limite de conexão esgotado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1929
+#: ../libpurple/protocols/jabber/jabber.c:1944
 msgid "Host Gone"
 msgstr "Host fora do ar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1931
+#: ../libpurple/protocols/jabber/jabber.c:1946
 msgid "Host Unknown"
 msgstr "Host desconhecido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1933
+#: ../libpurple/protocols/jabber/jabber.c:1948
 msgid "Improper Addressing"
 msgstr "Endereçamento impróprio"
 
-#: ../libpurple/protocols/jabber/jabber.c:1937
+#: ../libpurple/protocols/jabber/jabber.c:1952
 msgid "Invalid ID"
 msgstr "ID inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1939
+#: ../libpurple/protocols/jabber/jabber.c:1954
 msgid "Invalid Namespace"
 msgstr "Namespace inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1941
+#: ../libpurple/protocols/jabber/jabber.c:1956
 msgid "Invalid XML"
 msgstr "XML inválido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1943
+#: ../libpurple/protocols/jabber/jabber.c:1958
 msgid "Non-matching Hosts"
 msgstr "Hosts não compatíveis"
 
-#: ../libpurple/protocols/jabber/jabber.c:1947
+#: ../libpurple/protocols/jabber/jabber.c:1962
 msgid "Policy Violation"
 msgstr "Violação de normas"
 
-#: ../libpurple/protocols/jabber/jabber.c:1949
+#: ../libpurple/protocols/jabber/jabber.c:1964
 msgid "Remote Connection Failed"
 msgstr "Falha na conexão remota"
 
-#: ../libpurple/protocols/jabber/jabber.c:1951
+#: ../libpurple/protocols/jabber/jabber.c:1966
 msgid "Resource Constraint"
 msgstr "Limitação de recursos"
 
-#: ../libpurple/protocols/jabber/jabber.c:1953
+#: ../libpurple/protocols/jabber/jabber.c:1968
 msgid "Restricted XML"
 msgstr "XML restrito"
 
-#: ../libpurple/protocols/jabber/jabber.c:1955
+#: ../libpurple/protocols/jabber/jabber.c:1970
 msgid "See Other Host"
 msgstr "Ver outro host"
 
-#: ../libpurple/protocols/jabber/jabber.c:1957
+#: ../libpurple/protocols/jabber/jabber.c:1972
 msgid "System Shutdown"
 msgstr "Desligamento do sistema"
 
-#: ../libpurple/protocols/jabber/jabber.c:1959
+#: ../libpurple/protocols/jabber/jabber.c:1974
 msgid "Undefined Condition"
 msgstr "Condição indefinida"
 
-#: ../libpurple/protocols/jabber/jabber.c:1961
+#: ../libpurple/protocols/jabber/jabber.c:1976
 msgid "Unsupported Encoding"
 msgstr "Codificação não suportada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1963
+#: ../libpurple/protocols/jabber/jabber.c:1978
 msgid "Unsupported Stanza Type"
 msgstr "Tipo de comando (Stanza) não suportado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1965
+#: ../libpurple/protocols/jabber/jabber.c:1980
 msgid "Unsupported Version"
 msgstr "Versão não suportada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1967
+#: ../libpurple/protocols/jabber/jabber.c:1982
 msgid "XML Not Well Formed"
 msgstr "XML mal-formado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1969
+#: ../libpurple/protocols/jabber/jabber.c:1984
 msgid "Stream Error"
 msgstr "Erro no fluxo XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:2052
+#: ../libpurple/protocols/jabber/jabber.c:2069
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Não foi possível banir usuário %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2072
+#: ../libpurple/protocols/jabber/jabber.c:2089
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Filiação desconhecida: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2077
+#: ../libpurple/protocols/jabber/jabber.c:2094
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Não foi possível filiar usuário %s como \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2096
+#: ../libpurple/protocols/jabber/jabber.c:2113
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Cargo desconhecido: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2101
+#: ../libpurple/protocols/jabber/jabber.c:2118
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "Não foi possível definir cargo \"%s\" para o usuário: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2154
+#: ../libpurple/protocols/jabber/jabber.c:2171
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Não foi possível convidar usuário (%s)."
 
-#: ../libpurple/protocols/jabber/jabber.c:2185
+#: ../libpurple/protocols/jabber/jabber.c:2202
 #, c-format
 msgid "Unable to ping user %s"
 msgstr "Não foi possível verificar presença de usuário %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2207
-#: ../libpurple/protocols/jabber/jabber.c:2217
+#: ../libpurple/protocols/jabber/jabber.c:2220
+#: ../libpurple/protocols/jabber/jabber.c:2231
 #, c-format
 msgid "Unable to buzz, because there is nothing known about user %s."
 msgstr ""
 "Não foi possível chamar a atenção de %s, pois nada é conhecido sobre ele(a)."
 
-#: ../libpurple/protocols/jabber/jabber.c:2213
+#: ../libpurple/protocols/jabber/jabber.c:2226
 #, c-format
 msgid "Unable to buzz, because user %s might be offline."
 msgstr ""
 "Não foi possível chamar a atenção de %s, pois este(a) pode estar "
 "desconectado."
 
-#: ../libpurple/protocols/jabber/jabber.c:2239
+#: ../libpurple/protocols/jabber/jabber.c:2257
 #, c-format
 msgid "Unable to buzz, because the user %s does not support it."
 msgstr ""
 "Não foi possível chamar a atenção de %s, pois este não suporta tal recurso."
 
-#: ../libpurple/protocols/jabber/jabber.c:2253
+#: ../libpurple/protocols/jabber/jabber.c:2279
+#: ../libpurple/protocols/yahoo/yahoo.c:4130
+msgid "Buzz"
+msgstr "Chamar a atenção"
+
+#: ../libpurple/protocols/jabber/jabber.c:2280
+#: ../libpurple/protocols/jabber/message.c:308
+#: ../libpurple/protocols/yahoo/yahoo.c:4131
+#, c-format
+msgid "%s has buzzed you!"
+msgstr "%s chamou sua atenção!"
+
+#: ../libpurple/protocols/jabber/jabber.c:2281
+#: ../libpurple/protocols/yahoo/yahoo.c:4132
+#, c-format
+msgid "Buzzing %s..."
+msgstr "Chamando a atenção de %s..."
+
+#: ../libpurple/protocols/jabber/jabber.c:2313
 msgid "config:  Configure a chat room."
 msgstr "config:  Configura uma sala de bate-papo."
 
-#: ../libpurple/protocols/jabber/jabber.c:2257
+#: ../libpurple/protocols/jabber/jabber.c:2317
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Configura uma sala de bate-papo."
 
-#: ../libpurple/protocols/jabber/jabber.c:2266
+#: ../libpurple/protocols/jabber/jabber.c:2326
 msgid "part [room]:  Leave the room."
 msgstr "part [sala]:  Sai da sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:2271
+#: ../libpurple/protocols/jabber/jabber.c:2331
 msgid "register:  Register with a chat room."
 msgstr "register:  Registra com uma sala de bate-papo."
 
-#: ../libpurple/protocols/jabber/jabber.c:2277
+#: ../libpurple/protocols/jabber/jabber.c:2337
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [novo tópico]:  Ver ou mudar o tópico."
 
-#: ../libpurple/protocols/jabber/jabber.c:2283
+#: ../libpurple/protocols/jabber/jabber.c:2343
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;usuário&gt; [sala]: Bane o usuário da sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:2289
+#: ../libpurple/protocols/jabber/jabber.c:2349
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -6069,7 +6155,7 @@
 "affiliate &lt;usuário&gt; &lt;owner|admin|member|outcast|none&gt;: define a "
 "filiação do usuário com a sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:2295
+#: ../libpurple/protocols/jabber/jabber.c:2355
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -6077,32 +6163,32 @@
 "role &lt;usuário&gt; &lt;moderator|participant|visitor|none&gt;: Define o "
 "cargo do usuário na sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:2301
+#: ../libpurple/protocols/jabber/jabber.c:2361
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;usuário&gt; [mensagem]:  Convida o usuário para a sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:2307
+#: ../libpurple/protocols/jabber/jabber.c:2367
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join:  &lt;sala&gt; [servidor]: Entra num bate-papo neste servidor."
 
-#: ../libpurple/protocols/jabber/jabber.c:2313
+#: ../libpurple/protocols/jabber/jabber.c:2373
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;usuário&gt; [sala]:  Expulsa um usuário da sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:2318
+#: ../libpurple/protocols/jabber/jabber.c:2378
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 "msg &lt;usuário&gt; &lt;mensagem&gt;:  Envia uma mensagem particular para "
 "outro usuário."
 
-#: ../libpurple/protocols/jabber/jabber.c:2324
+#: ../libpurple/protocols/jabber/jabber.c:2384
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
 msgstr ""
 "ping &lt;jid&gt;:       Verifica conexão com usuário/componente/servidor."
 
-#: ../libpurple/protocols/jabber/jabber.c:2329
-#: ../libpurple/protocols/yahoo/yahoo.c:4145
+#: ../libpurple/protocols/jabber/jabber.c:2389
+#: ../libpurple/protocols/yahoo/yahoo.c:4156
 msgid "buzz: Buzz a user to get their attention"
 msgstr ""
 "buzz: Envia um alerta (buzz) para um usuário de modo a chamar a sua atenção"
@@ -6123,35 +6209,35 @@
 msgstr "Plugin do protocolo XMPP"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:202 ../pidgin/gtkaccount.c:506
+#: ../libpurple/protocols/jabber/libxmpp.c:205 ../pidgin/gtkaccount.c:509
 msgid "Domain"
 msgstr "Domínio"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:210
+#: ../libpurple/protocols/jabber/libxmpp.c:213
 msgid "Require SSL/TLS"
 msgstr "Requerer SSL/TLS"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:214
+#: ../libpurple/protocols/jabber/libxmpp.c:217
 msgid "Force old (port 5223) SSL"
 msgstr "Forçar SSL antigo (porta 5223)"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:219
+#: ../libpurple/protocols/jabber/libxmpp.c:222
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Permitir autenticação em texto puro sobre fluxos não-criptografados"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:224
-#: ../libpurple/protocols/myspace/myspace.c:3277
-#: ../libpurple/protocols/simple/simple.c:1902
+#: ../libpurple/protocols/jabber/libxmpp.c:227
+#: ../libpurple/protocols/myspace/myspace.c:3305
+#: ../libpurple/protocols/simple/simple.c:2089
 msgid "Connect port"
 msgstr "Porta de conexão"
 
 #. TODO: default to automatically try different ports. Make the user be
 #. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
-#: ../libpurple/protocols/jabber/libxmpp.c:228
-#: ../libpurple/protocols/myspace/myspace.c:3274
-#: ../libpurple/protocols/silc/silc.c:1914
-#: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
+#: ../libpurple/protocols/jabber/libxmpp.c:231
+#: ../libpurple/protocols/myspace/myspace.c:3302
+#: ../libpurple/protocols/silc/silc.c:2057
+#: ../libpurple/protocols/silc10/silc.c:1860 ../pidgin/gtkaccount.c:840
 msgid "Connect server"
 msgstr "Servidor de conexão"
 
@@ -6160,55 +6246,49 @@
 msgid "%s has left the conversation."
 msgstr "%s saiu da conversa."
 
-#: ../libpurple/protocols/jabber/message.c:161
+#: ../libpurple/protocols/jabber/message.c:162
 #, c-format
 msgid "Message from %s"
 msgstr "Mensagem de %s"
 
-#: ../libpurple/protocols/jabber/message.c:225
+#: ../libpurple/protocols/jabber/message.c:226
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s mudou o tópico para: %s"
 
-#: ../libpurple/protocols/jabber/message.c:227
+#: ../libpurple/protocols/jabber/message.c:228
 #, c-format
 msgid "The topic is: %s"
 msgstr "O tópico é: %s"
 
-#: ../libpurple/protocols/jabber/message.c:275
+#: ../libpurple/protocols/jabber/message.c:276
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "A entrega de mensagens para %s falhou: %s"
 
-#: ../libpurple/protocols/jabber/message.c:278
+#: ../libpurple/protocols/jabber/message.c:279
 msgid "XMPP Message Error"
 msgstr "Erro de mensagem do XMPP"
 
-#: ../libpurple/protocols/jabber/message.c:307
-#: ../libpurple/protocols/yahoo/yahoo.c:4120
-#, c-format
-msgid "%s has buzzed you!"
-msgstr "%s chamou sua atenção!"
-
-#: ../libpurple/protocols/jabber/message.c:407
+#: ../libpurple/protocols/jabber/message.c:408
 #, c-format
 msgid " (Code %s)"
 msgstr " (Código %s)"
 
-#: ../libpurple/protocols/jabber/parser.c:196
+#: ../libpurple/protocols/jabber/parser.c:198
 msgid "XML Parse error"
 msgstr "Erro ao processar XML"
 
-#: ../libpurple/protocols/jabber/presence.c:427
+#: ../libpurple/protocols/jabber/presence.c:435
 msgid "Unknown Error in presence"
 msgstr "Erro desconhecido na presença"
 
-#: ../libpurple/protocols/jabber/presence.c:508
-#: ../libpurple/protocols/jabber/presence.c:509
+#: ../libpurple/protocols/jabber/presence.c:516
+#: ../libpurple/protocols/jabber/presence.c:517
 msgid "Create New Room"
 msgstr "Criar nova sala"
 
-#: ../libpurple/protocols/jabber/presence.c:510
+#: ../libpurple/protocols/jabber/presence.c:518
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -6216,20 +6296,20 @@
 "Você está criando uma nova sala. Você deseja configurá-la, ou aceitar as "
 "configurações padrão?"
 
-#: ../libpurple/protocols/jabber/presence.c:516
+#: ../libpurple/protocols/jabber/presence.c:524
 msgid "_Configure Room"
 msgstr "_Configurar sala"
 
-#: ../libpurple/protocols/jabber/presence.c:517
+#: ../libpurple/protocols/jabber/presence.c:525
 msgid "_Accept Defaults"
 msgstr "_Aceitar padrões"
 
-#: ../libpurple/protocols/jabber/presence.c:559
+#: ../libpurple/protocols/jabber/presence.c:567
 #, c-format
 msgid "Error in chat %s"
 msgstr "Erro no bate-papo %s"
 
-#: ../libpurple/protocols/jabber/presence.c:563
+#: ../libpurple/protocols/jabber/presence.c:571
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Erro ao entrar no bate-papo %s"
@@ -6276,21 +6356,21 @@
 msgid "Select a Resource"
 msgstr "Selecione um recurso"
 
-#: ../libpurple/protocols/jabber/usermood.c:179
-#: ../libpurple/protocols/jabber/usermood.c:180
+#: ../libpurple/protocols/jabber/usermood.c:197
+#: ../libpurple/protocols/jabber/usermood.c:198
 msgid "Edit User Mood"
 msgstr "Editar humor do usuário"
 
-#: ../libpurple/protocols/jabber/usermood.c:181
+#: ../libpurple/protocols/jabber/usermood.c:199
 msgid "Please select your mood from the list."
 msgstr "Favor selecionar seu humor na lista."
 
-#: ../libpurple/protocols/jabber/usermood.c:183
+#: ../libpurple/protocols/jabber/usermood.c:201
 #: ../libpurple/protocols/jabber/usernick.c:78
 msgid "Set"
 msgstr "Definir"
 
-#: ../libpurple/protocols/jabber/usermood.c:191
+#: ../libpurple/protocols/jabber/usermood.c:209
 msgid "Set Mood..."
 msgstr "Definir humor..."
 
@@ -6310,7 +6390,7 @@
 "Como estas informações são visíveis para todos os contatos da sua lista de "
 "contatos, é recomendável escolher algo apropriado."
 
-#: ../libpurple/protocols/jabber/usernick.c:99
+#: ../libpurple/protocols/jabber/usernick.c:100
 msgid "Set Nickname..."
 msgstr "Definir apelido..."
 
@@ -6322,12 +6402,18 @@
 msgid "Select an action"
 msgstr "Selecione uma ação"
 
-#: ../libpurple/protocols/msn/dialog.c:110
+#: ../libpurple/protocols/msn/contact.c:712
+msgid "Unable to retrieve MSN Address Book"
+msgstr "Falha ao obter catálogo de endereços do MSN"
+
+#: ../libpurple/protocols/msn/dialog.c:118
+#: ../libpurple/protocols/msnp9/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "Problema de sincronização da lista de amigos em %s (%s)"
 
-#: ../libpurple/protocols/msn/dialog.c:116
+#: ../libpurple/protocols/msn/dialog.c:124
+#: ../libpurple/protocols/msnp9/dialog.c:116
 #, c-format
 msgid ""
 "%s on the local list is inside the group \"%s\" but not on the server list. "
@@ -6336,7 +6422,8 @@
 "%s na lista local está dentro do grupo \"%s\", mas não está na lista do "
 "servidor. Você deseja adicionar este amigo?"
 
-#: ../libpurple/protocols/msn/dialog.c:124
+#: ../libpurple/protocols/msn/dialog.c:132
+#: ../libpurple/protocols/msnp9/dialog.c:124
 #, c-format
 msgid ""
 "%s is on the local list but not on the server list. Do you want this buddy "
@@ -6346,163 +6433,195 @@
 "adicionar este amigo?"
 
 #: ../libpurple/protocols/msn/error.c:36
+#: ../libpurple/protocols/msnp9/error.c:36
 #, c-format
 msgid "Unable to parse message"
 msgstr "Não foi possível processar mensagem"
 
 #: ../libpurple/protocols/msn/error.c:41
+#: ../libpurple/protocols/msnp9/error.c:41
 #, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Erro de sintaxe (provavelmente um bug do cliente)"
 
 #: ../libpurple/protocols/msn/error.c:46
+#: ../libpurple/protocols/msnp9/error.c:46
 #, c-format
 msgid "Invalid e-mail address"
 msgstr "Endereço de e-mail inválido"
 
 #: ../libpurple/protocols/msn/error.c:49
+#: ../libpurple/protocols/msnp9/error.c:49
 #, c-format
 msgid "User does not exist"
 msgstr "Usuário inexistente"
 
 #: ../libpurple/protocols/msn/error.c:53
+#: ../libpurple/protocols/msnp9/error.c:53
 #, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Faltando nome de domínio totalmente qualificado"
 
 #: ../libpurple/protocols/msn/error.c:56
+#: ../libpurple/protocols/msnp9/error.c:56
 #, c-format
 msgid "Already logged in"
 msgstr "Você já está conectado"
 
 #: ../libpurple/protocols/msn/error.c:59
+#: ../libpurple/protocols/msnp9/error.c:59
 #, c-format
 msgid "Invalid screen name"
 msgstr "Nome de usuário inválido"
 
 #: ../libpurple/protocols/msn/error.c:62
+#: ../libpurple/protocols/msnp9/error.c:62
 #, c-format
 msgid "Invalid friendly name"
 msgstr "Apelido inválido"
 
 #: ../libpurple/protocols/msn/error.c:65
+#: ../libpurple/protocols/msnp9/error.c:65
 #, c-format
 msgid "List full"
 msgstr "Lista cheia"
 
 #: ../libpurple/protocols/msn/error.c:68
+#: ../libpurple/protocols/msnp9/error.c:68
 #, c-format
 msgid "Already there"
 msgstr "Já está lá"
 
 #: ../libpurple/protocols/msn/error.c:72
+#: ../libpurple/protocols/msnp9/error.c:72
 #, c-format
 msgid "Not on list"
 msgstr "Não está na lista"
 
 #: ../libpurple/protocols/msn/error.c:75
+#: ../libpurple/protocols/msnp9/error.c:75
 #: ../libpurple/protocols/zephyr/zephyr.c:756
 #, c-format
 msgid "User is offline"
 msgstr "Usuário está desconectado"
 
 #: ../libpurple/protocols/msn/error.c:78
+#: ../libpurple/protocols/msnp9/error.c:78
 #, c-format
 msgid "Already in the mode"
 msgstr "Você já está nesse modo"
 
 #: ../libpurple/protocols/msn/error.c:82
+#: ../libpurple/protocols/msnp9/error.c:82
 #, c-format
 msgid "Already in opposite list"
 msgstr "Usuário já está na lista oposta"
 
 #: ../libpurple/protocols/msn/error.c:86
+#: ../libpurple/protocols/msnp9/error.c:86
 #, c-format
 msgid "Too many groups"
 msgstr "Excesso de grupos"
 
 #: ../libpurple/protocols/msn/error.c:89
+#: ../libpurple/protocols/msnp9/error.c:89
 #, c-format
 msgid "Invalid group"
 msgstr "Grupo inválido"
 
 #: ../libpurple/protocols/msn/error.c:92
+#: ../libpurple/protocols/msnp9/error.c:92
 #, c-format
 msgid "User not in group"
 msgstr "O usuário não está no grupo"
 
 #: ../libpurple/protocols/msn/error.c:95
+#: ../libpurple/protocols/msnp9/error.c:95
 #, c-format
 msgid "Group name too long"
 msgstr "Nome do grupo muito extenso."
 
 #: ../libpurple/protocols/msn/error.c:98
+#: ../libpurple/protocols/msnp9/error.c:98
 #, c-format
 msgid "Cannot remove group zero"
 msgstr "Não foi possível remover o grupo zero"
 
 #: ../libpurple/protocols/msn/error.c:103
+#: ../libpurple/protocols/msnp9/error.c:103
 #, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Você tentou adicionar um usuário a um grupo que não existe"
 
 #: ../libpurple/protocols/msn/error.c:107
+#: ../libpurple/protocols/msnp9/error.c:107
 #, c-format
 msgid "Switchboard failed"
 msgstr "O quadro de comunicações falhou"
 
 #: ../libpurple/protocols/msn/error.c:111
+#: ../libpurple/protocols/msnp9/error.c:111
 #, c-format
 msgid "Notify transfer failed"
 msgstr "A notificação de transferência falhou"
 
 #: ../libpurple/protocols/msn/error.c:116
+#: ../libpurple/protocols/msnp9/error.c:116
 #, c-format
 msgid "Required fields missing"
 msgstr "Campos requeridos não foram preenchidos"
 
 #: ../libpurple/protocols/msn/error.c:120
+#: ../libpurple/protocols/msnp9/error.c:120
 #, c-format
 msgid "Too many hits to a FND"
 msgstr "Acessos demais a um FND"
 
 #: ../libpurple/protocols/msn/error.c:124
+#: ../libpurple/protocols/msnp9/error.c:124
 #: ../libpurple/protocols/oscar/oscar.c:120
 #, c-format
 msgid "Not logged in"
 msgstr "Desconectado"
 
 #: ../libpurple/protocols/msn/error.c:128
+#: ../libpurple/protocols/msnp9/error.c:128
 #, c-format
 msgid "Service temporarily unavailable"
 msgstr "Serviço temporariamente indisponível"
 
 #: ../libpurple/protocols/msn/error.c:131
+#: ../libpurple/protocols/msnp9/error.c:131
 #, c-format
 msgid "Database server error"
 msgstr "Erro do servidor de banco de dados"
 
 #: ../libpurple/protocols/msn/error.c:135
+#: ../libpurple/protocols/msnp9/error.c:135
 #, c-format
 msgid "Command disabled"
 msgstr "Comando desativado"
 
 #: ../libpurple/protocols/msn/error.c:139
+#: ../libpurple/protocols/msnp9/error.c:139
 #, c-format
 msgid "File operation error"
 msgstr "Erro ao executar operação de arquivo"
 
 #: ../libpurple/protocols/msn/error.c:143
+#: ../libpurple/protocols/msnp9/error.c:143
 #, c-format
 msgid "Memory allocation error"
 msgstr "Erro de alocação de memória"
 
 #: ../libpurple/protocols/msn/error.c:147
+#: ../libpurple/protocols/msnp9/error.c:147
 #, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Valor CHL incorreto enviado para o servidor"
 
 #: ../libpurple/protocols/msn/error.c:152
+#: ../libpurple/protocols/msnp9/error.c:152
 #, c-format
 msgid "Server busy"
 msgstr "Servidor ocupado"
@@ -6510,167 +6629,192 @@
 #: ../libpurple/protocols/msn/error.c:155
 #: ../libpurple/protocols/msn/error.c:170
 #: ../libpurple/protocols/msn/error.c:230
+#: ../libpurple/protocols/msnp9/error.c:155
+#: ../libpurple/protocols/msnp9/error.c:170
+#: ../libpurple/protocols/msnp9/error.c:230
 #, c-format
 msgid "Server unavailable"
 msgstr "Servidor indisponível"
 
 #: ../libpurple/protocols/msn/error.c:158
+#: ../libpurple/protocols/msnp9/error.c:158
 #, c-format
 msgid "Peer notification server down"
 msgstr "O servidor de notificação de pares está fora do ar"
 
 #: ../libpurple/protocols/msn/error.c:162
+#: ../libpurple/protocols/msnp9/error.c:162
 #, c-format
 msgid "Database connect error"
 msgstr "Erro ao conectar ao banco de dados"
 
 #: ../libpurple/protocols/msn/error.c:167
+#: ../libpurple/protocols/msnp9/error.c:167
 #, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "O servidor vai sair do ar (abandonar navio)"
 
 #: ../libpurple/protocols/msn/error.c:174
+#: ../libpurple/protocols/msnp9/error.c:174
 #, c-format
 msgid "Error creating connection"
 msgstr "Erro ao criar a conexão"
 
 #: ../libpurple/protocols/msn/error.c:179
+#: ../libpurple/protocols/msnp9/error.c:179
 #, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "Parâmetros CVR desconhecidos ou não permitidos"
 
 #: ../libpurple/protocols/msn/error.c:183
+#: ../libpurple/protocols/msnp9/error.c:183
 #, c-format
 msgid "Unable to write"
 msgstr "Não foi possível enviar"
 
 #: ../libpurple/protocols/msn/error.c:186
+#: ../libpurple/protocols/msnp9/error.c:186
 #, c-format
 msgid "Session overload"
 msgstr "Sessão sobrecarregada"
 
 #: ../libpurple/protocols/msn/error.c:190
+#: ../libpurple/protocols/msnp9/error.c:190
 #, c-format
 msgid "User is too active"
 msgstr "O usuário está muito ativo"
 
 #: ../libpurple/protocols/msn/error.c:193
+#: ../libpurple/protocols/msnp9/error.c:193
 #, c-format
 msgid "Too many sessions"
 msgstr "Excesso de sessões"
 
 #: ../libpurple/protocols/msn/error.c:196
+#: ../libpurple/protocols/msnp9/error.c:196
 #, c-format
 msgid "Passport not verified"
 msgstr "Conta do Passport não verificada"
 
 #: ../libpurple/protocols/msn/error.c:199
+#: ../libpurple/protocols/msnp9/error.c:199
 #, c-format
 msgid "Bad friend file"
 msgstr "Arquivo de amigos mal formado"
 
 #: ../libpurple/protocols/msn/error.c:203
+#: ../libpurple/protocols/msnp9/error.c:203
 #, c-format
 msgid "Not expected"
 msgstr "Inesperado"
 
 #: ../libpurple/protocols/msn/error.c:209
+#: ../libpurple/protocols/msnp9/error.c:209
 #, c-format
 msgid "Friendly name changes too rapidly"
 msgstr "O apelido foi mudado rapidamente demais"
 
 #: ../libpurple/protocols/msn/error.c:218
+#: ../libpurple/protocols/msnp9/error.c:218
 #, c-format
 msgid "Server too busy"
 msgstr "Servidor ocupado demais"
 
 #: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1380
-#: ../libpurple/protocols/silc/silc.c:233
+#: ../libpurple/protocols/msnp9/error.c:222
+#: ../libpurple/protocols/oscar/oscar.c:1377
+#: ../libpurple/protocols/silc/silc.c:338
 #: ../libpurple/protocols/silc10/ops.c:1709
-#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1380
+#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1393
 #, c-format
 msgid "Authentication failed"
 msgstr "Autenticação mal sucedida"
 
 #: ../libpurple/protocols/msn/error.c:225
+#: ../libpurple/protocols/msnp9/error.c:225
 #, c-format
 msgid "Not allowed when offline"
 msgstr "Não permitido enquanto desconectado"
 
 #: ../libpurple/protocols/msn/error.c:233
+#: ../libpurple/protocols/msnp9/error.c:233
 #, c-format
 msgid "Not accepting new users"
 msgstr "Usuários novos não estão sendo aceitos"
 
 #: ../libpurple/protocols/msn/error.c:237
+#: ../libpurple/protocols/msnp9/error.c:237
 #, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Passport para crianças sem consentimento dos pais"
 
 #: ../libpurple/protocols/msn/error.c:241
+#: ../libpurple/protocols/msnp9/error.c:241
 #, c-format
 msgid "Passport account not yet verified"
 msgstr "Conta do Passport ainda não foi verificada"
 
 #: ../libpurple/protocols/msn/error.c:244
+#: ../libpurple/protocols/msnp9/error.c:244
 #, c-format
 msgid "Bad ticket"
 msgstr "Bilhete inválido"
 
 #: ../libpurple/protocols/msn/error.c:249
+#: ../libpurple/protocols/msnp9/error.c:249
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "Código de erro desconhecido: %d"
 
 #: ../libpurple/protocols/msn/error.c:263
+#: ../libpurple/protocols/msnp9/error.c:263
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "Erro MSN: %s\n"
 
-#: ../libpurple/protocols/msn/msn.c:130
+#: ../libpurple/protocols/msn/msn.c:130 ../libpurple/protocols/msnp9/msn.c:130
 msgid "Nudge"
 msgstr "Chamar a atenção"
 
-#: ../libpurple/protocols/msn/msn.c:131
+#: ../libpurple/protocols/msn/msn.c:131 ../libpurple/protocols/msnp9/msn.c:131
 #, c-format
 msgid "%s has nudged you!"
 msgstr "%s chamou sua atenção!"
 
-#: ../libpurple/protocols/msn/msn.c:132
+#: ../libpurple/protocols/msn/msn.c:132 ../libpurple/protocols/msnp9/msn.c:132
 #, c-format
 msgid "Nudging %s..."
 msgstr "Chamando a atenção de %s..."
 
-#: ../libpurple/protocols/msn/msn.c:174
+#: ../libpurple/protocols/msn/msn.c:174 ../libpurple/protocols/msnp9/msn.c:174
 msgid "Your new MSN friendly name is too long."
 msgstr "Seu novo apelido é longo demais."
 
-#: ../libpurple/protocols/msn/msn.c:282
+#: ../libpurple/protocols/msn/msn.c:286 ../libpurple/protocols/msnp9/msn.c:282
 msgid "Set your friendly name."
 msgstr "Defina seu apelido."
 
-#: ../libpurple/protocols/msn/msn.c:283
+#: ../libpurple/protocols/msn/msn.c:287 ../libpurple/protocols/msnp9/msn.c:283
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Esse é o nome que será visto como seu pelos outros amigos MSN."
 
-#: ../libpurple/protocols/msn/msn.c:301
+#: ../libpurple/protocols/msn/msn.c:305 ../libpurple/protocols/msnp9/msn.c:301
 msgid "Set your home phone number."
 msgstr "Defina seu número de telefone de casa."
 
-#: ../libpurple/protocols/msn/msn.c:318
+#: ../libpurple/protocols/msn/msn.c:322 ../libpurple/protocols/msnp9/msn.c:318
 msgid "Set your work phone number."
 msgstr "Defina seu número de telefone do trabalho."
 
-#: ../libpurple/protocols/msn/msn.c:335
+#: ../libpurple/protocols/msn/msn.c:339 ../libpurple/protocols/msnp9/msn.c:335
 msgid "Set your mobile phone number."
 msgstr "Defina seu número de telefone móvel."
 
-#: ../libpurple/protocols/msn/msn.c:350
+#: ../libpurple/protocols/msn/msn.c:354 ../libpurple/protocols/msnp9/msn.c:350
 msgid "Allow MSN Mobile pages?"
 msgstr "Permitir pages MSN Mobile?"
 
-#: ../libpurple/protocols/msn/msn.c:351
+#: ../libpurple/protocols/msn/msn.c:355 ../libpurple/protocols/msnp9/msn.c:351
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -6678,323 +6822,392 @@
 "Você deseja permitir ou não permitir que pessoas na sua lista de amigos "
 "enviem pages MSN Mobile para seu celular ou outro dispositivo móvel?"
 
-#: ../libpurple/protocols/msn/msn.c:357
+#: ../libpurple/protocols/msn/msn.c:361 ../libpurple/protocols/msnp9/msn.c:357
 msgid "Allow"
 msgstr "Permitir"
 
-#: ../libpurple/protocols/msn/msn.c:358
+#: ../libpurple/protocols/msn/msn.c:362 ../libpurple/protocols/msnp9/msn.c:358
 msgid "Disallow"
 msgstr "Não permitir"
 
-#: ../libpurple/protocols/msn/msn.c:374
+#: ../libpurple/protocols/msn/msn.c:378 ../libpurple/protocols/msnp9/msn.c:374
 msgid "This Hotmail account may not be active."
 msgstr "Esta conta do Hotmail pode não estar ativa."
 
-#: ../libpurple/protocols/msn/msn.c:400
+#: ../libpurple/protocols/msn/msn.c:404 ../libpurple/protocols/msnp9/msn.c:400
 msgid "Send a mobile message."
 msgstr "Enviar uma mensagem para dispositivo móvel."
 
-#: ../libpurple/protocols/msn/msn.c:402
+#: ../libpurple/protocols/msn/msn.c:406 ../libpurple/protocols/msnp9/msn.c:402
 msgid "Page"
 msgstr "Enviar"
 
-#: ../libpurple/protocols/msn/msn.c:549
-msgid "Has you"
-msgstr "Tem você"
-
-#: ../libpurple/protocols/msn/msn.c:579 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:3077
-#: ../libpurple/protocols/yahoo/yahoo.c:3761
+#: ../libpurple/protocols/msn/msn.c:688 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/msnp9/msn.c:583
+#: ../libpurple/protocols/msnp9/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:3088
+#: ../libpurple/protocols/yahoo/yahoo.c:3772
 msgid "Be Right Back"
 msgstr "Volto já"
 
-#: ../libpurple/protocols/msn/msn.c:583 ../libpurple/protocols/msn/state.c:31
-#: ../libpurple/protocols/novell/novell.c:2822
-#: ../libpurple/protocols/novell/novell.c:2952
-#: ../libpurple/protocols/silc/buddy.c:1480
+#: ../libpurple/protocols/msn/msn.c:694 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/msnp9/msn.c:587
+#: ../libpurple/protocols/msnp9/state.c:31
+#: ../libpurple/protocols/novell/novell.c:2839
+#: ../libpurple/protocols/novell/novell.c:2969
+#: ../libpurple/protocols/silc/buddy.c:1483
 #: ../libpurple/protocols/silc/silc.c:56
-#: ../libpurple/protocols/silc10/buddy.c:1480
+#: ../libpurple/protocols/silc10/buddy.c:1483
 #: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:3079
-#: ../libpurple/protocols/yahoo/yahoo.c:3764
+#: ../libpurple/protocols/yahoo/yahoo.c:3090
+#: ../libpurple/protocols/yahoo/yahoo.c:3775
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../libpurple/protocols/msn/msn.c:587
-#: ../libpurple/protocols/yahoo/yahoo.c:3087
-#: ../libpurple/protocols/yahoo/yahoo.c:3776
+#: ../libpurple/protocols/msn/msn.c:699 ../libpurple/protocols/msnp9/msn.c:591
+#: ../libpurple/protocols/yahoo/yahoo.c:3098
+#: ../libpurple/protocols/yahoo/yahoo.c:3787
 msgid "On the Phone"
 msgstr "Ao telefone"
 
-#: ../libpurple/protocols/msn/msn.c:591
-#: ../libpurple/protocols/yahoo/yahoo.c:3091
-#: ../libpurple/protocols/yahoo/yahoo.c:3782
+#: ../libpurple/protocols/msn/msn.c:704 ../libpurple/protocols/msnp9/msn.c:595
+#: ../libpurple/protocols/yahoo/yahoo.c:3102
+#: ../libpurple/protocols/yahoo/yahoo.c:3793
 msgid "Out to Lunch"
 msgstr "Em horário de almoço"
 
-#: ../libpurple/protocols/msn/msn.c:619
+#: ../libpurple/protocols/msn/msn.c:723
+msgid "Artist"
+msgstr "Artista"
+
+#: ../libpurple/protocols/msn/msn.c:724
+msgid "Album"
+msgstr "Álbum"
+
+#: ../libpurple/protocols/msn/msn.c:742 ../libpurple/protocols/msnp9/msn.c:623
 msgid "Set Friendly Name..."
 msgstr "Definir apelido..."
 
-#: ../libpurple/protocols/msn/msn.c:624
+#: ../libpurple/protocols/msn/msn.c:747 ../libpurple/protocols/msnp9/msn.c:628
 msgid "Set Home Phone Number..."
 msgstr "Definir número de telefone de casa..."
 
-#: ../libpurple/protocols/msn/msn.c:628
+#: ../libpurple/protocols/msn/msn.c:751 ../libpurple/protocols/msnp9/msn.c:632
 msgid "Set Work Phone Number..."
 msgstr "Definir número de telefone do trabalho..."
 
-#: ../libpurple/protocols/msn/msn.c:632
+#: ../libpurple/protocols/msn/msn.c:755 ../libpurple/protocols/msnp9/msn.c:636
 msgid "Set Mobile Phone Number..."
 msgstr "Definir número de telefone móvel..."
 
-#: ../libpurple/protocols/msn/msn.c:638
+#: ../libpurple/protocols/msn/msn.c:761 ../libpurple/protocols/msnp9/msn.c:642
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Ativar/Desativar dispositivos móveis..."
 
-#: ../libpurple/protocols/msn/msn.c:643
+#: ../libpurple/protocols/msn/msn.c:766 ../libpurple/protocols/msnp9/msn.c:647
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Permitir/Não permitir pages para dispositivos móveis..."
 
-#: ../libpurple/protocols/msn/msn.c:654
+#: ../libpurple/protocols/msn/msn.c:777 ../libpurple/protocols/msnp9/msn.c:658
 msgid "Open Hotmail Inbox"
 msgstr "Abrir caixa de entrada do Hotmail"
 
-#: ../libpurple/protocols/msn/msn.c:678
+#: ../libpurple/protocols/msn/msn.c:801 ../libpurple/protocols/msnp9/msn.c:682
 msgid "Send to Mobile"
 msgstr "Enviar para dispositivo móvel"
 
-#: ../libpurple/protocols/msn/msn.c:688
-#: ../libpurple/protocols/novell/novell.c:3408
+#: ../libpurple/protocols/msn/msn.c:811 ../libpurple/protocols/msnp9/msn.c:692
+#: ../libpurple/protocols/novell/novell.c:3425
 msgid "Initiate _Chat"
 msgstr "Iniciar _bate-papo"
 
-#: ../libpurple/protocols/msn/msn.c:726
+#: ../libpurple/protocols/msn/msn.c:849 ../libpurple/protocols/msnp9/msn.c:731
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 "O suporte ao SSL é necessário para o MSN. Por favor instale uma biblioteca "
 "SSL suportada."
 
-#: ../libpurple/protocols/msn/msn.c:754
+#: ../libpurple/protocols/msn/msn.c:879 ../libpurple/protocols/msnp9/msn.c:761
 msgid "Failed to connect to server."
 msgstr "Não foi possível conectar ao servidor."
 
-#: ../libpurple/protocols/msn/msn.c:1510 ../libpurple/protocols/msn/msn.c:1858
+#: ../libpurple/protocols/msn/msn.c:1663 ../libpurple/protocols/msn/msn.c:2006
+#: ../libpurple/protocols/msnp9/msn.c:1516
+#: ../libpurple/protocols/msnp9/msn.c:1859
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "Erro ao obter perfil"
 
-#: ../libpurple/protocols/msn/msn.c:1581 ../pidgin/plugins/convcolors.c:309
-#: ../pidgin/plugins/pidginrc.c:366
+#: ../libpurple/protocols/msn/msn.c:1729
+#: ../libpurple/protocols/msnp9/msn.c:1582 ../pidgin/plugins/convcolors.c:309
+#: ../pidgin/plugins/pidginrc.c:360
 msgid "General"
 msgstr "Geral"
 
-#: ../libpurple/protocols/msn/msn.c:1588
-#: ../libpurple/protocols/myspace/user.c:110
-#: ../libpurple/protocols/oscar/oscar.c:3755
+#: ../libpurple/protocols/msn/msn.c:1736
+#: ../libpurple/protocols/msnp9/msn.c:1589
+#: ../libpurple/protocols/myspace/user.c:115
+#: ../libpurple/protocols/oscar/oscar.c:3765
 #: ../libpurple/protocols/qq/buddy_info.c:45
-#: ../libpurple/protocols/qq/qq.c:221
+#: ../libpurple/protocols/qq/qq.c:222
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "Idade"
 
-#: ../libpurple/protocols/msn/msn.c:1590
+#: ../libpurple/protocols/msn/msn.c:1738
+#: ../libpurple/protocols/msnp9/msn.c:1591
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr "Ocupação"
 
-#: ../libpurple/protocols/msn/msn.c:1591
-#: ../libpurple/protocols/myspace/user.c:119
-#: ../libpurple/protocols/novell/novell.c:1478
+#: ../libpurple/protocols/msn/msn.c:1739
+#: ../libpurple/protocols/msnp9/msn.c:1592
+#: ../libpurple/protocols/myspace/user.c:123
+#: ../libpurple/protocols/novell/novell.c:1487
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
 #: ../libpurple/protocols/zephyr/zephyr.c:798
 #: ../libpurple/protocols/zephyr/zephyr.c:1215
 msgid "Location"
 msgstr "Localização"
 
-#: ../libpurple/protocols/msn/msn.c:1596 ../libpurple/protocols/msn/msn.c:1788
-#: ../libpurple/protocols/msn/msn.c:1794 ../libpurple/protocols/msn/msn.c:1801
+#: ../libpurple/protocols/msn/msn.c:1744 ../libpurple/protocols/msn/msn.c:1936
+#: ../libpurple/protocols/msn/msn.c:1942 ../libpurple/protocols/msn/msn.c:1949
+#: ../libpurple/protocols/msnp9/msn.c:1597
+#: ../libpurple/protocols/msnp9/msn.c:1789
+#: ../libpurple/protocols/msnp9/msn.c:1795
+#: ../libpurple/protocols/msnp9/msn.c:1802
 msgid "Hobbies and Interests"
 msgstr "Hobbies e interesses"
 
-#: ../libpurple/protocols/msn/msn.c:1602 ../libpurple/protocols/msn/msn.c:1722
-#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1735
-#: ../libpurple/protocols/msn/msn.c:1743 ../libpurple/protocols/msn/msn.c:1750
+#: ../libpurple/protocols/msn/msn.c:1750 ../libpurple/protocols/msn/msn.c:1870
+#: ../libpurple/protocols/msn/msn.c:1876 ../libpurple/protocols/msn/msn.c:1883
+#: ../libpurple/protocols/msn/msn.c:1891 ../libpurple/protocols/msn/msn.c:1898
+#: ../libpurple/protocols/msnp9/msn.c:1603
+#: ../libpurple/protocols/msnp9/msn.c:1723
+#: ../libpurple/protocols/msnp9/msn.c:1729
+#: ../libpurple/protocols/msnp9/msn.c:1736
+#: ../libpurple/protocols/msnp9/msn.c:1744
+#: ../libpurple/protocols/msnp9/msn.c:1751
 msgid "A Little About Me"
 msgstr "Um pouco sobre mim"
 
-#: ../libpurple/protocols/msn/msn.c:1619
+#: ../libpurple/protocols/msn/msn.c:1767
+#: ../libpurple/protocols/msnp9/msn.c:1620
 msgid "Social"
 msgstr "Social"
 
-#: ../libpurple/protocols/msn/msn.c:1621
+#: ../libpurple/protocols/msn/msn.c:1769
+#: ../libpurple/protocols/msnp9/msn.c:1622
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "Estado civil"
 
-#: ../libpurple/protocols/msn/msn.c:1622
+#: ../libpurple/protocols/msn/msn.c:1770
+#: ../libpurple/protocols/msnp9/msn.c:1623
 msgid "Interests"
 msgstr "Interesses"
 
-#: ../libpurple/protocols/msn/msn.c:1623
+#: ../libpurple/protocols/msn/msn.c:1771
+#: ../libpurple/protocols/msnp9/msn.c:1624
 msgid "Pets"
 msgstr "Animais de estimação"
 
-#: ../libpurple/protocols/msn/msn.c:1624
+#: ../libpurple/protocols/msn/msn.c:1772
+#: ../libpurple/protocols/msnp9/msn.c:1625
 msgid "Hometown"
 msgstr "Cidade natal"
 
-#: ../libpurple/protocols/msn/msn.c:1625
+#: ../libpurple/protocols/msn/msn.c:1773
+#: ../libpurple/protocols/msnp9/msn.c:1626
 msgid "Places Lived"
 msgstr "Locais em que viveu"
 
-#: ../libpurple/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/msn/msn.c:1774
+#: ../libpurple/protocols/msnp9/msn.c:1627
 msgid "Fashion"
 msgstr "Moda"
 
-#: ../libpurple/protocols/msn/msn.c:1627
+#: ../libpurple/protocols/msn/msn.c:1775
+#: ../libpurple/protocols/msnp9/msn.c:1628
 msgid "Humor"
 msgstr "Humor"
 
-#: ../libpurple/protocols/msn/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1776
+#: ../libpurple/protocols/msnp9/msn.c:1629
 msgid "Music"
 msgstr "Música"
 
-#: ../libpurple/protocols/msn/msn.c:1629 ../libpurple/protocols/msn/msn.c:1810
-#: ../libpurple/protocols/msn/msn.c:1816
+#: ../libpurple/protocols/msn/msn.c:1777 ../libpurple/protocols/msn/msn.c:1958
+#: ../libpurple/protocols/msn/msn.c:1964
+#: ../libpurple/protocols/msnp9/msn.c:1630
+#: ../libpurple/protocols/msnp9/msn.c:1811
+#: ../libpurple/protocols/msnp9/msn.c:1817
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Favorite Quote"
 msgstr "Citação favorita"
 
-#: ../libpurple/protocols/msn/msn.c:1646
+#: ../libpurple/protocols/msn/msn.c:1794
+#: ../libpurple/protocols/msnp9/msn.c:1647
 msgid "Contact Info"
 msgstr "Informações do contato"
 
-#: ../libpurple/protocols/msn/msn.c:1647
+#: ../libpurple/protocols/msn/msn.c:1795
+#: ../libpurple/protocols/msnp9/msn.c:1648
 msgid "Personal"
 msgstr "Pessoal"
 
-#: ../libpurple/protocols/msn/msn.c:1650
+#: ../libpurple/protocols/msn/msn.c:1798
+#: ../libpurple/protocols/msnp9/msn.c:1651
 msgid "Significant Other"
 msgstr "Parceiro(a)"
 
-#: ../libpurple/protocols/msn/msn.c:1651
+#: ../libpurple/protocols/msn/msn.c:1799
+#: ../libpurple/protocols/msnp9/msn.c:1652
 msgid "Home Phone"
 msgstr "Telefone doméstico"
 
-#: ../libpurple/protocols/msn/msn.c:1652
+#: ../libpurple/protocols/msn/msn.c:1800
+#: ../libpurple/protocols/msnp9/msn.c:1653
 msgid "Home Phone 2"
 msgstr "Telefone doméstico 2"
 
-#: ../libpurple/protocols/msn/msn.c:1653
-#: ../libpurple/protocols/oscar/oscar.c:3793
+#: ../libpurple/protocols/msn/msn.c:1801
+#: ../libpurple/protocols/msnp9/msn.c:1654
+#: ../libpurple/protocols/oscar/oscar.c:3803
 msgid "Home Address"
 msgstr "Endereço de casa"
 
-#: ../libpurple/protocols/msn/msn.c:1654
+#: ../libpurple/protocols/msn/msn.c:1802
+#: ../libpurple/protocols/msnp9/msn.c:1655
 msgid "Personal Mobile"
 msgstr "Celular pessoal"
 
-#: ../libpurple/protocols/msn/msn.c:1655
+#: ../libpurple/protocols/msn/msn.c:1803
+#: ../libpurple/protocols/msnp9/msn.c:1656
 msgid "Home Fax"
 msgstr "Fax doméstico"
 
-#: ../libpurple/protocols/msn/msn.c:1656
+#: ../libpurple/protocols/msn/msn.c:1804
+#: ../libpurple/protocols/msnp9/msn.c:1657
 msgid "Personal E-Mail"
 msgstr "E-Mail pessoal"
 
-#: ../libpurple/protocols/msn/msn.c:1657
+#: ../libpurple/protocols/msn/msn.c:1805
+#: ../libpurple/protocols/msnp9/msn.c:1658
 msgid "Personal IM"
 msgstr "MI Pessoal"
 
-#: ../libpurple/protocols/msn/msn.c:1659
+#: ../libpurple/protocols/msn/msn.c:1807
+#: ../libpurple/protocols/msnp9/msn.c:1660
 msgid "Anniversary"
 msgstr "Aniversário de casamento"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1675
+#: ../libpurple/protocols/msn/msn.c:1823
+#: ../libpurple/protocols/msnp9/msn.c:1676
 msgid "Work"
 msgstr "Negócios"
 
-#: ../libpurple/protocols/msn/msn.c:1677
+#: ../libpurple/protocols/msn/msn.c:1825
+#: ../libpurple/protocols/msnp9/msn.c:1678
 #: ../libpurple/protocols/silc/ops.c:1010
 #: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Título de trabalho"
 
-#: ../libpurple/protocols/msn/msn.c:1678
-#: ../libpurple/protocols/oscar/oscar.c:3814
+#: ../libpurple/protocols/msn/msn.c:1826
+#: ../libpurple/protocols/msnp9/msn.c:1679
+#: ../libpurple/protocols/oscar/oscar.c:3824
 msgid "Company"
 msgstr "Empresa"
 
-#: ../libpurple/protocols/msn/msn.c:1679
-#: ../libpurple/protocols/novell/novell.c:1480
+#: ../libpurple/protocols/msn/msn.c:1827
+#: ../libpurple/protocols/msnp9/msn.c:1680
+#: ../libpurple/protocols/novell/novell.c:1489
 msgid "Department"
 msgstr "Departamento"
 
-#: ../libpurple/protocols/msn/msn.c:1680
+#: ../libpurple/protocols/msn/msn.c:1828
+#: ../libpurple/protocols/msnp9/msn.c:1681
 msgid "Profession"
 msgstr "Profissão"
 
-#: ../libpurple/protocols/msn/msn.c:1681
+#: ../libpurple/protocols/msn/msn.c:1829
+#: ../libpurple/protocols/msnp9/msn.c:1682
 msgid "Work Phone"
 msgstr "Telefone do trabalho"
 
-#: ../libpurple/protocols/msn/msn.c:1682
+#: ../libpurple/protocols/msn/msn.c:1830
+#: ../libpurple/protocols/msnp9/msn.c:1683
 msgid "Work Phone 2"
 msgstr "Telefone 2 do trabalho"
 
-#: ../libpurple/protocols/msn/msn.c:1683
-#: ../libpurple/protocols/oscar/oscar.c:3806
+#: ../libpurple/protocols/msn/msn.c:1831
+#: ../libpurple/protocols/msnp9/msn.c:1684
+#: ../libpurple/protocols/oscar/oscar.c:3816
 msgid "Work Address"
 msgstr "Endereço de trabalho"
 
-#: ../libpurple/protocols/msn/msn.c:1684
+#: ../libpurple/protocols/msn/msn.c:1832
+#: ../libpurple/protocols/msnp9/msn.c:1685
 msgid "Work Mobile"
 msgstr "Celular de trabalho"
 
-#: ../libpurple/protocols/msn/msn.c:1685
+#: ../libpurple/protocols/msn/msn.c:1833
+#: ../libpurple/protocols/msnp9/msn.c:1686
 msgid "Work Pager"
 msgstr "Pager de trabalho"
 
-#: ../libpurple/protocols/msn/msn.c:1686
+#: ../libpurple/protocols/msn/msn.c:1834
+#: ../libpurple/protocols/msnp9/msn.c:1687
 msgid "Work Fax"
 msgstr "Fax de trabalho"
 
-#: ../libpurple/protocols/msn/msn.c:1687
+#: ../libpurple/protocols/msn/msn.c:1835
+#: ../libpurple/protocols/msnp9/msn.c:1688
 msgid "Work E-Mail"
 msgstr "E-Mail de trabalho"
 
-#: ../libpurple/protocols/msn/msn.c:1688
+#: ../libpurple/protocols/msn/msn.c:1836
+#: ../libpurple/protocols/msnp9/msn.c:1689
 msgid "Work IM"
 msgstr "MI de trabalho"
 
-#: ../libpurple/protocols/msn/msn.c:1689
+#: ../libpurple/protocols/msn/msn.c:1837
+#: ../libpurple/protocols/msnp9/msn.c:1690
 msgid "Start Date"
 msgstr "Data de início"
 
-#: ../libpurple/protocols/msn/msn.c:1759 ../libpurple/protocols/msn/msn.c:1765
-#: ../libpurple/protocols/msn/msn.c:1772 ../libpurple/protocols/msn/msn.c:1779
+#: ../libpurple/protocols/msn/msn.c:1907 ../libpurple/protocols/msn/msn.c:1913
+#: ../libpurple/protocols/msn/msn.c:1920 ../libpurple/protocols/msn/msn.c:1927
+#: ../libpurple/protocols/msnp9/msn.c:1760
+#: ../libpurple/protocols/msnp9/msn.c:1766
+#: ../libpurple/protocols/msnp9/msn.c:1773
+#: ../libpurple/protocols/msnp9/msn.c:1780
 msgid "Favorite Things"
 msgstr "Coisas favoritas"
 
-#: ../libpurple/protocols/msn/msn.c:1824
+#: ../libpurple/protocols/msn/msn.c:1972
+#: ../libpurple/protocols/msnp9/msn.c:1825
 msgid "Last Updated"
 msgstr "Última atualização"
 
-#: ../libpurple/protocols/msn/msn.c:1835
+#: ../libpurple/protocols/msn/msn.c:1983
+#: ../libpurple/protocols/msnp9/msn.c:1836
 #: ../libpurple/protocols/qq/buddy_info.c:60
 #: ../libpurple/protocols/silc/ops.c:1026
 #: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "Página da web"
 
-#: ../libpurple/protocols/msn/msn.c:1859
+#: ../libpurple/protocols/msn/msn.c:2007
+#: ../libpurple/protocols/msnp9/msn.c:1860
 msgid "The user has not created a public profile."
 msgstr "O usuário não criou um perfil público."
 
-#: ../libpurple/protocols/msn/msn.c:1860
+#: ../libpurple/protocols/msn/msn.c:2008
+#: ../libpurple/protocols/msnp9/msn.c:1861
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
@@ -7004,7 +7217,8 @@
 "que o usuário não existe, ou que o usuário existe mas não criou um perfil "
 "público."
 
-#: ../libpurple/protocols/msn/msn.c:1864
+#: ../libpurple/protocols/msn/msn.c:2012
+#: ../libpurple/protocols/msnp9/msn.c:1865
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
@@ -7012,7 +7226,8 @@
 "Não foi possível encontrar nenhuma informação no perfil do usuário. "
 "Provavelmente o usuário não existe."
 
-#: ../libpurple/protocols/msn/msn.c:1872
+#: ../libpurple/protocols/msn/msn.c:2020
+#: ../libpurple/protocols/msnp9/msn.c:1873
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "URL do Perfil"
@@ -7027,101 +7242,130 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2158 ../libpurple/protocols/msn/msn.c:2160
-msgid "MSN Protocol Plugin"
-msgstr "Plugin do protocolo MSN"
-
-#: ../libpurple/protocols/msn/msn.c:2194
+#: ../libpurple/protocols/msn/msn.c:2307 ../libpurple/protocols/msn/msn.c:2309
+msgid "Windows Live Messenger Protocol Plugin"
+msgstr "Plugin de protocolo do Windows Live Messanger"
+
+#: ../libpurple/protocols/msn/msn.c:2344
+#: ../libpurple/protocols/msnp9/msn.c:2195
 msgid "Use HTTP Method"
 msgstr "Usar método HTTP"
 
-#: ../libpurple/protocols/msn/msn.c:2199
-#, fuzzy
+#: ../libpurple/protocols/msn/msn.c:2349
+#: ../libpurple/protocols/msnp9/msn.c:2200
 msgid "HTTP Method Server"
-msgstr "Servidor de teste do IPC"
-
-#: ../libpurple/protocols/msn/msn.c:2204
+msgstr "Servidor do método HTTP"
+
+#: ../libpurple/protocols/msn/msn.c:2354
+#: ../libpurple/protocols/msnp9/msn.c:2205
 msgid "Show custom smileys"
 msgstr "Exibir emoticons personalizados"
 
-#: ../libpurple/protocols/msn/msn.c:2212
+#: ../libpurple/protocols/msn/msn.c:2362
+#: ../libpurple/protocols/msnp9/msn.c:2213
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: chama a atenção do usuário"
 
-#: ../libpurple/protocols/msn/nexus.c:146
-#: ../libpurple/protocols/msn/servconn.c:135
-#: ../libpurple/protocols/qq/qq_proxy.c:242
-#: ../libpurple/protocols/qq/qq_proxy.c:321
-#: ../libpurple/protocols/qq/qq_proxy.c:366
-#: ../libpurple/protocols/qq/qq_proxy.c:399
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:63
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:163
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:187
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:200
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:229
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:243
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:268
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:302
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:332
-#: ../libpurple/protocols/yahoo/yahoochat.c:1416
-#: ../libpurple/protocols/yahoo/yahoochat.c:1442
-msgid "Unable to connect"
-msgstr "Não foi possível conectar"
-
-#: ../libpurple/protocols/msn/notification.c:178
+#: ../libpurple/protocols/msn/nexus.c:70
+msgid "Windows Live ID authentication:Unable to connect"
+msgstr "Autenticação do Windows Live ID: Falha ao conectar"
+
+#. we must have failed!
+#: ../libpurple/protocols/msn/nexus.c:126
+msgid ""
+"Windows Live ID authentication: cannot find authenticate token in server "
+"response"
+msgstr ""
+"Autenticação do Windows Live ID: Não foi possível encontrar token de "
+"autenticação na resposta do servidor"
+
+#: ../libpurple/protocols/msn/nexus.c:172
+msgid "Windows Live ID authentication Failed"
+msgstr "A autenticação do Windows Live ID falhou"
+
+#: ../libpurple/protocols/msn/notification.c:185
+#: ../libpurple/protocols/msnp9/notification.c:178
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s não é um grupo válido."
 
-#: ../libpurple/protocols/msn/notification.c:184
-#: ../libpurple/protocols/msn/notification.c:532
-#: ../libpurple/protocols/msn/session.c:330
+#: ../libpurple/protocols/msn/notification.c:191
+#: ../libpurple/protocols/msn/notification.c:931
+#: ../libpurple/protocols/msn/session.c:387
+#: ../libpurple/protocols/msnp9/notification.c:184
+#: ../libpurple/protocols/msnp9/notification.c:532
+#: ../libpurple/protocols/msnp9/session.c:340
 msgid "Unknown error."
 msgstr "Erro desconhecido."
 
-#: ../libpurple/protocols/msn/notification.c:187
+#: ../libpurple/protocols/msn/notification.c:194
+#: ../libpurple/protocols/msnp9/notification.c:187
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s em %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:498
+#: ../libpurple/protocols/msn/notification.c:509
+#, c-format
+msgid "%s just sent you a Nudge!"
+msgstr "%s chamou sua atenção!"
+
+#: ../libpurple/protocols/msn/notification.c:836
+#, c-format
+msgid "Unknown error (%d)"
+msgstr "Erro desconhecido (%d)"
+
+#: ../libpurple/protocols/msn/notification.c:837
+#: ../libpurple/protocols/sametime/sametime.c:4471
+msgid "Unable to add user"
+msgstr "Não foi possível adicionar usuário"
+
+#: ../libpurple/protocols/msn/notification.c:897
+#: ../libpurple/protocols/msnp9/notification.c:498
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "Não foi possível adicionar usuário em %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:502
+#: ../libpurple/protocols/msn/notification.c:901
+#: ../libpurple/protocols/msnp9/notification.c:502
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "Não foi possível bloquear usuário em %s (%s)."
 
-#: ../libpurple/protocols/msn/notification.c:506
+#: ../libpurple/protocols/msn/notification.c:905
+#: ../libpurple/protocols/msnp9/notification.c:506
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "Não foi possível permitir usuário em %s (%s)."
 
-#: ../libpurple/protocols/msn/notification.c:514
+#: ../libpurple/protocols/msn/notification.c:913
+#: ../libpurple/protocols/msnp9/notification.c:514
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr "%s não pôde ser adicionado porque a sua lista de amigos está cheia."
 
-#: ../libpurple/protocols/msn/notification.c:523
+#: ../libpurple/protocols/msn/notification.c:922
+#: ../libpurple/protocols/msnp9/notification.c:523
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s não é uma conta do Passport válida."
 
-#: ../libpurple/protocols/msn/notification.c:528
+#: ../libpurple/protocols/msn/notification.c:927
+#: ../libpurple/protocols/msnp9/notification.c:528
 msgid "Service Temporarily Unavailable."
 msgstr "Serviço temporariamente indisponível."
 
-#: ../libpurple/protocols/msn/notification.c:851
+#: ../libpurple/protocols/msn/notification.c:1263
+#: ../libpurple/protocols/msnp9/notification.c:851
 msgid "Unable to rename group"
 msgstr "Não foi possível renomear grupo"
 
-#: ../libpurple/protocols/msn/notification.c:906
+#: ../libpurple/protocols/msn/notification.c:1318
+#: ../libpurple/protocols/msnp9/notification.c:906
 msgid "Unable to delete group"
 msgstr "Não foi possível remover grupo"
 
-#: ../libpurple/protocols/msn/notification.c:1325
+#: ../libpurple/protocols/msn/notification.c:1931
+#: ../libpurple/protocols/msnp9/notification.c:1325
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -7150,15 +7394,39 @@
 "\n"
 "Depois que a manutenção terminar, você poderá conectar com sucesso."
 
+#: ../libpurple/protocols/msn/servconn.c:135
+#: ../libpurple/protocols/msnp9/nexus.c:146
+#: ../libpurple/protocols/msnp9/servconn.c:133
+#: ../libpurple/protocols/qq/qq_proxy.c:242
+#: ../libpurple/protocols/qq/qq_proxy.c:324
+#: ../libpurple/protocols/qq/qq_proxy.c:369
+#: ../libpurple/protocols/qq/qq_proxy.c:402
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:64
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:167
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:191
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:204
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:233
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:247
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:272
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:307
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:338
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
+msgid "Unable to connect"
+msgstr "Não foi possível conectar"
+
 #: ../libpurple/protocols/msn/servconn.c:137
+#: ../libpurple/protocols/msnp9/servconn.c:135
 msgid "Writing error"
 msgstr "Erro de escrita"
 
 #: ../libpurple/protocols/msn/servconn.c:139
+#: ../libpurple/protocols/msnp9/servconn.c:137
 msgid "Reading error"
 msgstr "Erro de leitura"
 
 #: ../libpurple/protocols/msn/servconn.c:146
+#: ../libpurple/protocols/msnp9/servconn.c:144
 #, c-format
 msgid ""
 "Connection error from %s server:\n"
@@ -7167,98 +7435,120 @@
 "Erro de conexão do servidor %s:\n"
 "%s"
 
-#: ../libpurple/protocols/msn/session.c:299
+#: ../libpurple/protocols/msn/session.c:349
+#: ../libpurple/protocols/msnp9/session.c:302
 msgid "Our protocol is not supported by the server."
 msgstr "Nosso protocolo não é suportado pelo servidor."
 
-#: ../libpurple/protocols/msn/session.c:303
+#: ../libpurple/protocols/msn/session.c:354
+#: ../libpurple/protocols/msnp9/session.c:307
 msgid "Error parsing HTTP."
 msgstr "Erro ao processar HTTP."
 
-#: ../libpurple/protocols/msn/session.c:307
-#: ../libpurple/protocols/oscar/flap_connection.c:384
-#: ../libpurple/protocols/yahoo/yahoo.c:205
+#: ../libpurple/protocols/msn/session.c:358
+#: ../libpurple/protocols/msnp9/session.c:311
+#: ../libpurple/protocols/oscar/flap_connection.c:387
+#: ../libpurple/protocols/yahoo/yahoo.c:207
 msgid "You have signed on from another location."
 msgstr "Você conectou de outro local."
 
-#: ../libpurple/protocols/msn/session.c:310
+#: ../libpurple/protocols/msn/session.c:364
+#: ../libpurple/protocols/msnp9/session.c:317
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "Os servidores do MSN estão temporariamente indisponíveis. Favor esperar e "
 "tentar novamente."
 
-#: ../libpurple/protocols/msn/session.c:315
+#: ../libpurple/protocols/msn/session.c:370
+#: ../libpurple/protocols/msnp9/session.c:323
 msgid "The MSN servers are going down temporarily."
 msgstr "Os servidores MSN vão sair do ar temporariamente."
 
-#: ../libpurple/protocols/msn/session.c:320
+#: ../libpurple/protocols/msn/session.c:375
+#: ../libpurple/protocols/msnp9/session.c:328
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Não foi possível autenticar: %s"
 
-#: ../libpurple/protocols/msn/session.c:325
+#: ../libpurple/protocols/msn/session.c:381
+#: ../libpurple/protocols/msnp9/session.c:334
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 "Sua lista de amigos do MSN está temporariamente indisponível. Favor aguardar "
 "e tentar novamente."
 
-#: ../libpurple/protocols/msn/session.c:346
-#: ../libpurple/protocols/msn/session.c:348
+#: ../libpurple/protocols/msn/session.c:403
+#: ../libpurple/protocols/msn/session.c:405
+#: ../libpurple/protocols/msnp9/session.c:356
+#: ../libpurple/protocols/msnp9/session.c:358
 msgid "Handshaking"
 msgstr "Negociando"
 
-#: ../libpurple/protocols/msn/session.c:349
+#: ../libpurple/protocols/msn/session.c:406
+#: ../libpurple/protocols/msnp9/session.c:359
 msgid "Starting authentication"
 msgstr "Iniciando autenticação"
 
-#: ../libpurple/protocols/msn/session.c:350
+#: ../libpurple/protocols/msn/session.c:407
+#: ../libpurple/protocols/msnp9/session.c:360
 msgid "Getting cookie"
 msgstr "Recebendo o cookie"
 
-#: ../libpurple/protocols/msn/session.c:352
+#: ../libpurple/protocols/msn/session.c:409
+#: ../libpurple/protocols/msnp9/session.c:362
 msgid "Sending cookie"
 msgstr "Enviando o cookie"
 
-#: ../libpurple/protocols/msn/session.c:353
+#: ../libpurple/protocols/msn/session.c:410
+#: ../libpurple/protocols/msnp9/session.c:363
 msgid "Retrieving buddy list"
 msgstr "Recuperando lista de amigos"
 
 #: ../libpurple/protocols/msn/state.c:34
+#: ../libpurple/protocols/msnp9/state.c:34
 msgid "Away From Computer"
 msgstr "Ausente"
 
 #: ../libpurple/protocols/msn/state.c:35
+#: ../libpurple/protocols/msnp9/state.c:35
 msgid "On The Phone"
 msgstr "Ao telefone"
 
 #: ../libpurple/protocols/msn/state.c:36
+#: ../libpurple/protocols/msnp9/state.c:36
 msgid "Out To Lunch"
 msgstr "Em horário de almoço"
 
-#: ../libpurple/protocols/msn/switchboard.c:400
+#: ../libpurple/protocols/msn/switchboard.c:398
+#: ../libpurple/protocols/msnp9/switchboard.c:400
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr ""
 "A mensagem pode não ter sido enviada porque o tempo limite foi atingido:"
 
-#: ../libpurple/protocols/msn/switchboard.c:408
+#: ../libpurple/protocols/msn/switchboard.c:406
+#: ../libpurple/protocols/msnp9/switchboard.c:408
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr "A mensagem não foi enviada (isso não é permitido enquanto invisível):"
 
-#: ../libpurple/protocols/msn/switchboard.c:412
+#: ../libpurple/protocols/msn/switchboard.c:410
+#: ../libpurple/protocols/msnp9/switchboard.c:412
 msgid "Message could not be sent because the user is offline:"
 msgstr "A mensagem não pôde ser enviada porque o usuário está desconectado:"
 
-#: ../libpurple/protocols/msn/switchboard.c:416
+#: ../libpurple/protocols/msn/switchboard.c:414
+#: ../libpurple/protocols/msnp9/switchboard.c:416
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "A mensagem não pôde ser enviada porque um erro de conexão ocorreu:"
 
-#: ../libpurple/protocols/msn/switchboard.c:420
+#: ../libpurple/protocols/msn/switchboard.c:418
+#: ../libpurple/protocols/msnp9/switchboard.c:420
 msgid "Message could not be sent because we are sending too quickly:"
 msgstr ""
 "A mensagem não pôde ser enviada porque estamos enviando muito rapidamente:"
 
-#: ../libpurple/protocols/msn/switchboard.c:424
+#: ../libpurple/protocols/msn/switchboard.c:422
+#: ../libpurple/protocols/msnp9/switchboard.c:424
 msgid ""
 "Message could not be sent because we were unable to establish a session with "
 "the server. This is likely a server problem, try again in a few minutes:"
@@ -7267,34 +7557,62 @@
 "com o servidor. Isto é provavelmente um problema do mesmo, tente novamente "
 "em alguns minutos:"
 
-#: ../libpurple/protocols/msn/switchboard.c:431
+#: ../libpurple/protocols/msn/switchboard.c:429
+#: ../libpurple/protocols/msnp9/switchboard.c:431
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr "A mensagem não pôde ser enviada porque um erro ocorreu no switchboard:"
 
-#: ../libpurple/protocols/msn/switchboard.c:439
+#: ../libpurple/protocols/msn/switchboard.c:437
+#: ../libpurple/protocols/msnp9/switchboard.c:439
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "A mensagem pode não ter sido enviada devido a um erro desconhecido:"
 
-#: ../libpurple/protocols/msn/userlist.c:252
+#: ../libpurple/protocols/msn/userlist.c:243
+#: ../libpurple/protocols/msnp9/userlist.c:252
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "%s te adicionou à sua lista de contatos."
 
-#: ../libpurple/protocols/msn/userlist.c:321
+#: ../libpurple/protocols/msn/userlist.c:312
+#: ../libpurple/protocols/msnp9/userlist.c:321
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s te removeu da sua lista de contatos."
 
-#: ../libpurple/protocols/msn/userlist.c:643
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#: ../libpurple/protocols/msn/userlist.c:693
+#: ../libpurple/protocols/msnp9/userlist.c:643
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "Não foi possível adicionar \"%s\"."
 
-#: ../libpurple/protocols/msn/userlist.c:645
+#: ../libpurple/protocols/msn/userlist.c:696
+#: ../libpurple/protocols/msnp9/userlist.c:645
 msgid "The screen name specified is invalid."
 msgstr "O nome de usuário especificado é inválido."
 
+#: ../libpurple/protocols/msnp9/msn.c:549
+msgid "Has you"
+msgstr "Tem você"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/protocols/msnp9/msn.c:2159
+#: ../libpurple/protocols/msnp9/msn.c:2161
+msgid "MSN Protocol Plugin"
+msgstr "Plugin do protocolo MSN"
+
 #: ../libpurple/protocols/myspace/myspace.c:111
 msgid "Missing Cipher"
 msgstr "Cifra não encontrada"
@@ -7322,23 +7640,23 @@
 
 #. Notify an error message also, because this is important!
 #: ../libpurple/protocols/myspace/myspace.c:292
-#: ../libpurple/protocols/myspace/myspace.c:1801
+#: ../libpurple/protocols/myspace/myspace.c:1820
 msgid "MySpaceIM Error"
 msgstr "Erro do MySpace"
 
-#: ../libpurple/protocols/myspace/myspace.c:349
+#: ../libpurple/protocols/myspace/myspace.c:352
 msgid "Reading challenge"
 msgstr "Lendo negociação de criptografia"
 
-#: ../libpurple/protocols/myspace/myspace.c:355
+#: ../libpurple/protocols/myspace/myspace.c:360
 msgid "Unexpected challenge length from server"
 msgstr "Tamanho inesperado de challenge criptográfico vindo do servidor"
 
-#: ../libpurple/protocols/myspace/myspace.c:359
+#: ../libpurple/protocols/myspace/myspace.c:364
 msgid "Logging in"
 msgstr "Conectando"
 
-#: ../libpurple/protocols/myspace/myspace.c:1286
+#: ../libpurple/protocols/myspace/myspace.c:1296
 #, c-format
 msgid "Connection to server lost (no data received within %d seconds)"
 msgstr ""
@@ -7346,44 +7664,44 @@
 "segundos)"
 
 #. Can't write _()'d strings in array initializers. Workaround.
-#: ../libpurple/protocols/myspace/myspace.c:1328
+#: ../libpurple/protocols/myspace/myspace.c:1339
 msgid "New mail messages"
 msgstr "Novas mensagens de email"
 
-#: ../libpurple/protocols/myspace/myspace.c:1329
+#: ../libpurple/protocols/myspace/myspace.c:1340
 msgid "New blog comments"
 msgstr "Novos comentários no blog"
 
-#: ../libpurple/protocols/myspace/myspace.c:1330
+#: ../libpurple/protocols/myspace/myspace.c:1341
 msgid "New profile comments"
 msgstr "Novos comentários no perfil"
 
-#: ../libpurple/protocols/myspace/myspace.c:1331
+#: ../libpurple/protocols/myspace/myspace.c:1342
 msgid "New friend requests!"
 msgstr "Novos pedidos de amizade!"
 
-#: ../libpurple/protocols/myspace/myspace.c:1332
+#: ../libpurple/protocols/myspace/myspace.c:1343
 msgid "New picture comments"
 msgstr "Novos comentários nas fotos"
 
-#: ../libpurple/protocols/myspace/myspace.c:1360
+#: ../libpurple/protocols/myspace/myspace.c:1371
 msgid "MySpace"
 msgstr "MySpace"
 
 #. The session is now set up, ready to be connected. This emits the
 #. * signedOn signal, so clients can now do anything with msimprpl, and
 #. * we're ready for it (session key, userid, username all setup).
-#: ../libpurple/protocols/myspace/myspace.c:1543
-#: ../libpurple/protocols/sametime/sametime.c:1544
+#: ../libpurple/protocols/myspace/myspace.c:1554
+#: ../libpurple/protocols/sametime/sametime.c:1546
 msgid "Connected"
 msgstr "Conectado"
 
-#: ../libpurple/protocols/myspace/myspace.c:1554
-#: ../libpurple/protocols/myspace/myspace.c:1556
+#: ../libpurple/protocols/myspace/myspace.c:1565
+#: ../libpurple/protocols/myspace/myspace.c:1568
 msgid "No username set"
 msgstr "Nenhum nome de usuário definido"
 
-#: ../libpurple/protocols/myspace/myspace.c:1555
+#: ../libpurple/protocols/myspace/myspace.c:1566
 msgid ""
 "Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
 "username and choose a username and try to login again."
@@ -7391,72 +7709,71 @@
 "Favor visitar http://e<ditprofile.myspace.com/index.cfm?fuseaction=profile."
 "username e escolher um nome de usuário e tentar conectar novamente."
 
-#: ../libpurple/protocols/myspace/myspace.c:1782
+#: ../libpurple/protocols/myspace/myspace.c:1794
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Erro de protocolo, código %d: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:1972
-#: ../libpurple/protocols/myspace/myspace.c:2006
+#: ../libpurple/protocols/myspace/myspace.c:1990
+#: ../libpurple/protocols/myspace/myspace.c:2024
 msgid "Failed to add buddy"
 msgstr "Falha ao adicionar amigo"
 
-#: ../libpurple/protocols/myspace/myspace.c:1972
+#: ../libpurple/protocols/myspace/myspace.c:1990
 msgid "'addbuddy' command failed."
 msgstr "O comando 'addbuddy' falhou."
 
-#: ../libpurple/protocols/myspace/myspace.c:2006
-#: ../libpurple/protocols/myspace/myspace.c:2247
+#: ../libpurple/protocols/myspace/myspace.c:2024
+#: ../libpurple/protocols/myspace/myspace.c:2261
 msgid "persist command failed"
 msgstr "O comando 'persist' falhou"
 
-#: ../libpurple/protocols/myspace/myspace.c:2115
+#: ../libpurple/protocols/myspace/myspace.c:2129
 #, c-format
 msgid "No such user: %s"
 msgstr "Usuário não existe: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:2116
+#: ../libpurple/protocols/myspace/myspace.c:2130
 msgid "User lookup"
 msgstr "Procurar usuário"
 
-#: ../libpurple/protocols/myspace/myspace.c:2228
-#: ../libpurple/protocols/myspace/myspace.c:2247
-#: ../libpurple/protocols/myspace/myspace.c:2269
+#: ../libpurple/protocols/myspace/myspace.c:2242
+#: ../libpurple/protocols/myspace/myspace.c:2261
+#: ../libpurple/protocols/myspace/myspace.c:2283
 msgid "Failed to remove buddy"
 msgstr "Falha ao remover amigo"
 
-#: ../libpurple/protocols/myspace/myspace.c:2228
+#: ../libpurple/protocols/myspace/myspace.c:2242
 msgid "'delbuddy' command failed"
 msgstr "O comando 'delbuddy' falhou"
 
-#: ../libpurple/protocols/myspace/myspace.c:2269
+#: ../libpurple/protocols/myspace/myspace.c:2283
 msgid "blocklist command failed"
 msgstr "O comando 'blocklist' falhou"
 
-#: ../libpurple/protocols/myspace/myspace.c:2315
+#: ../libpurple/protocols/myspace/myspace.c:2331
 msgid "Invalid input condition"
 msgstr "Condição de entrada inválida"
 
-#. TODO: g_realloc like msn, yahoo, irc, jabber?
-#: ../libpurple/protocols/myspace/myspace.c:2333
-#: ../libpurple/protocols/myspace/myspace.c:2364
+#: ../libpurple/protocols/myspace/myspace.c:2351
+#: ../libpurple/protocols/myspace/myspace.c:2388
 msgid "Read buffer full"
 msgstr "Buffer de leitura cheio"
 
-#: ../libpurple/protocols/myspace/myspace.c:2402
+#: ../libpurple/protocols/myspace/myspace.c:2430
 msgid "Unparseable message"
 msgstr "Mensagem impossível de ser processada"
 
-#: ../libpurple/protocols/myspace/myspace.c:2471
+#: ../libpurple/protocols/myspace/myspace.c:2499
 #, c-format
 msgid "Couldn't connect to host: %s (%d)"
 msgstr "Não foi possível conectar ao host: %s (%d)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2642
+#: ../libpurple/protocols/myspace/myspace.c:2670
 msgid "IM Friends"
 msgstr "Amigos de MI"
 
-#: ../libpurple/protocols/myspace/myspace.c:2741
+#: ../libpurple/protocols/myspace/myspace.c:2769
 #, c-format
 msgid ""
 "%d buddies were added or updated from the server (including buddies already "
@@ -7465,59 +7782,59 @@
 "%d amigos foram adicionados ou atualizados do servidor (incluindo amigos que "
 "já estavam na lista de amigos do servidor)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2742
+#: ../libpurple/protocols/myspace/myspace.c:2770
 msgid "Add contacts from server"
 msgstr "Adicionar contatos do servidor"
 
-#: ../libpurple/protocols/myspace/myspace.c:2794
-#: ../libpurple/protocols/myspace/myspace.c:2859
+#: ../libpurple/protocols/myspace/myspace.c:2822
+#: ../libpurple/protocols/myspace/myspace.c:2887
 msgid "Add friends from MySpace.com"
 msgstr "Adicionar amigos do MySpace.com"
 
-#: ../libpurple/protocols/myspace/myspace.c:2795
+#: ../libpurple/protocols/myspace/myspace.c:2823
 msgid "Importing friends failed"
 msgstr "Falha ao importar amigos"
 
 #. TODO: find out how
-#: ../libpurple/protocols/myspace/myspace.c:2851
+#: ../libpurple/protocols/myspace/myspace.c:2879
 msgid "Find people..."
 msgstr "Encontrar pessoas..."
 
-#: ../libpurple/protocols/myspace/myspace.c:2854
+#: ../libpurple/protocols/myspace/myspace.c:2882
 msgid "Change IM name..."
 msgstr "Alterar nome da conversa..."
 
-#: ../libpurple/protocols/myspace/myspace.c:3156
+#: ../libpurple/protocols/myspace/myspace.c:3184
 msgid "myim URL handler"
 msgstr "Suporte a URLs myim"
 
-#: ../libpurple/protocols/myspace/myspace.c:3157
+#: ../libpurple/protocols/myspace/myspace.c:3185
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
 msgstr ""
 "Não foi possível encontrar uma conta adequada do MySpace para abrir esta URL "
 "myim."
 
-#: ../libpurple/protocols/myspace/myspace.c:3158
+#: ../libpurple/protocols/myspace/myspace.c:3186
 msgid "Enable the proper MySpaceIM account and try again."
 msgstr "Ative a conta do MySpace correta e tente novamente."
 
-#: ../libpurple/protocols/myspace/myspace.c:3281
+#: ../libpurple/protocols/myspace/myspace.c:3309
 msgid "Show display name in status text"
 msgstr "Exibir apelido na mensagem de status"
 
-#: ../libpurple/protocols/myspace/myspace.c:3284
+#: ../libpurple/protocols/myspace/myspace.c:3312
 msgid "Show headline in status text"
 msgstr "Exibir frase na mensagem de status"
 
-#: ../libpurple/protocols/myspace/myspace.c:3289
+#: ../libpurple/protocols/myspace/myspace.c:3317
 msgid "Send emoticons"
 msgstr "Enviar emoticons"
 
-#: ../libpurple/protocols/myspace/myspace.c:3294
+#: ../libpurple/protocols/myspace/myspace.c:3322
 msgid "Screen resolution (dots per inch)"
 msgstr "Resolução da tela (pontos por polegada)"
 
-#: ../libpurple/protocols/myspace/myspace.c:3297
+#: ../libpurple/protocols/myspace/myspace.c:3325
 msgid "Base font size (points)"
 msgstr "Tamanho base da fonte (pontos)"
 
@@ -7527,168 +7844,191 @@
 msgid "User"
 msgstr "Usuário"
 
-#. TODO: link to username, if available
-#: ../libpurple/protocols/myspace/user.c:102
-#: ../libpurple/protocols/oscar/oscar.c:2964
+#: ../libpurple/protocols/myspace/user.c:105
+#: ../libpurple/protocols/oscar/oscar.c:2974
 msgid "Profile"
 msgstr "Perfil"
 
-#: ../libpurple/protocols/myspace/user.c:124
+#: ../libpurple/protocols/myspace/user.c:128
 msgid "Headline"
 msgstr "Frase"
 
-#: ../libpurple/protocols/myspace/user.c:129
+#: ../libpurple/protocols/myspace/user.c:133
 msgid "Song"
 msgstr "Música"
 
-#: ../libpurple/protocols/myspace/user.c:134
+#: ../libpurple/protocols/myspace/user.c:141
 msgid "Total Friends"
 msgstr "Total de amigos"
 
-#: ../libpurple/protocols/myspace/user.c:145
-#: ../libpurple/protocols/myspace/user.c:148
-#: ../libpurple/protocols/myspace/user.c:151
+#: ../libpurple/protocols/myspace/user.c:159
 msgid "Client Version"
 msgstr "Versão do cliente"
 
 #. TODO: icons for each zap
-#: ../libpurple/protocols/myspace/zap.c:44
-#: ../libpurple/protocols/myspace/zap.c:177
+#. Lots of comments for translators:
+#. Zap means "to strike suddenly and forcefully as if with a
+#. * projectile or weapon."  This term often has an electrical
+#. * connotation, for example, "he was zapped by electricity when
+#. * he put a fork in the toaster."
+#: ../libpurple/protocols/myspace/zap.c:51
+#: ../libpurple/protocols/myspace/zap.c:214
 msgid "Zap"
 msgstr "Dar choque"
 
-#: ../libpurple/protocols/myspace/zap.c:44
+#: ../libpurple/protocols/myspace/zap.c:51
 #, c-format
 msgid "%s has zapped you!"
 msgstr "%s te deu um choque!"
 
-#: ../libpurple/protocols/myspace/zap.c:44
+#: ../libpurple/protocols/myspace/zap.c:51
 #, c-format
 msgid "Zapping %s..."
 msgstr "Dando um choque em %s..."
 
-#: ../libpurple/protocols/myspace/zap.c:45
+#. Whack means "to hit or strike someone with a sharp blow"
+#: ../libpurple/protocols/myspace/zap.c:54
 msgid "Whack"
 msgstr "Bater"
 
-#: ../libpurple/protocols/myspace/zap.c:45
+#: ../libpurple/protocols/myspace/zap.c:54
 #, c-format
 msgid "%s has whacked you!"
 msgstr "%s bateu em você!"
 
-#: ../libpurple/protocols/myspace/zap.c:45
+#: ../libpurple/protocols/myspace/zap.c:54
 #, c-format
 msgid "Whacking %s..."
 msgstr "Batendo em %s..."
 
-#: ../libpurple/protocols/myspace/zap.c:46
+#. Torch means "to set on fire."  Don't worry, this doesn't
+#. * make a whole lot of sense in English, either.  Feel free
+#. * to translate it literally.
+#: ../libpurple/protocols/myspace/zap.c:59
 msgid "Torch"
 msgstr "Queimar"
 
-#: ../libpurple/protocols/myspace/zap.c:46
+#: ../libpurple/protocols/myspace/zap.c:59
 #, c-format
 msgid "%s has torched you!"
 msgstr "%s queimou você!"
 
-#: ../libpurple/protocols/myspace/zap.c:46
+#: ../libpurple/protocols/myspace/zap.c:59
 #, c-format
 msgid "Torching %s..."
 msgstr "Queimando %s..."
 
-#: ../libpurple/protocols/myspace/zap.c:47
+#. Smooch means "to kiss someone, often enthusiastically"
+#: ../libpurple/protocols/myspace/zap.c:62
 msgid "Smooch"
 msgstr "Beijar"
 
-#: ../libpurple/protocols/myspace/zap.c:47
+#: ../libpurple/protocols/myspace/zap.c:62
 #, c-format
 msgid "%s has smooched you!"
 msgstr "%s te beijou!"
 
-#: ../libpurple/protocols/myspace/zap.c:47
+#: ../libpurple/protocols/myspace/zap.c:62
 #, c-format
 msgid "Smooching %s..."
 msgstr "Beijando %s..."
 
-#: ../libpurple/protocols/myspace/zap.c:48
+#. A hug is a display of affection; wrapping your arms around someone
+#: ../libpurple/protocols/myspace/zap.c:65
 msgid "Hug"
 msgstr "Abraçar"
 
-#: ../libpurple/protocols/myspace/zap.c:48
+#: ../libpurple/protocols/myspace/zap.c:65
 #, c-format
 msgid "%s has hugged you!"
 msgstr "%s te abraçou!"
 
-#: ../libpurple/protocols/myspace/zap.c:48
+#: ../libpurple/protocols/myspace/zap.c:65
 #, c-format
 msgid "Hugging %s..."
 msgstr "Abraçando %s..."
 
-#: ../libpurple/protocols/myspace/zap.c:49
+#. Slap means "to hit someone with an open/flat hand"
+#: ../libpurple/protocols/myspace/zap.c:68
 msgid "Slap"
 msgstr "Dar tapa"
 
-#: ../libpurple/protocols/myspace/zap.c:49
+#: ../libpurple/protocols/myspace/zap.c:68
 #, c-format
 msgid "%s has slapped you!"
 msgstr "%s te deu um tapa!"
 
-#: ../libpurple/protocols/myspace/zap.c:49
+#: ../libpurple/protocols/myspace/zap.c:68
 #, c-format
 msgid "Slapping %s..."
 msgstr "Dando um tapa em %s..."
 
-#: ../libpurple/protocols/myspace/zap.c:50
+#. Goose means "to pinch someone on their butt"
+#: ../libpurple/protocols/myspace/zap.c:71
 msgid "Goose"
 msgstr "Beliscar"
 
-#: ../libpurple/protocols/myspace/zap.c:50
+#: ../libpurple/protocols/myspace/zap.c:71
 #, c-format
 msgid "%s has goosed you!"
 msgstr "%s te beliscou!"
 
-#: ../libpurple/protocols/myspace/zap.c:50
+#: ../libpurple/protocols/myspace/zap.c:71
 #, c-format
 msgid "Goosing %s..."
 msgstr "Beliscando %s..."
 
-#: ../libpurple/protocols/myspace/zap.c:51
+#. A high-five is when two people's hands slap each other
+#. * in the air above their heads.  It is done to celebrate
+#. * something, often a victory, or to congratulate someone.
+#: ../libpurple/protocols/myspace/zap.c:76
 msgid "High-five"
 msgstr "Cumprimentar"
 
-#: ../libpurple/protocols/myspace/zap.c:51
+#: ../libpurple/protocols/myspace/zap.c:76
 #, c-format
 msgid "%s has high-fived you!"
 msgstr "%s te cumprimentou!"
 
-#: ../libpurple/protocols/myspace/zap.c:51
+#: ../libpurple/protocols/myspace/zap.c:76
 #, c-format
 msgid "High-fiving %s..."
 msgstr "Cumprimentando %s..."
 
-#: ../libpurple/protocols/myspace/zap.c:52
+#. We're not entirely sure what the MySpace people mean by
+#. * this... but we think it's the equivalent of "prank."  Or, for
+#. * someone to perform a mischievous trick or practical joke.
+#: ../libpurple/protocols/myspace/zap.c:81
 msgid "Punk"
 msgstr "Tirar onda"
 
-#: ../libpurple/protocols/myspace/zap.c:52
+#: ../libpurple/protocols/myspace/zap.c:81
 #, c-format
 msgid "%s has punk'd you!"
 msgstr "%s tirou onda de você!"
 
-#: ../libpurple/protocols/myspace/zap.c:52
+#: ../libpurple/protocols/myspace/zap.c:81
 #, c-format
 msgid "Punking %s..."
 msgstr "Tirando onda de %s..."
 
-#: ../libpurple/protocols/myspace/zap.c:53
+#. Raspberry is a slang term for the vibrating sound made
+#. * when you stick your tongue out of your mouth with your
+#. * lips closed and blow.  It is typically done when
+#. * gloating or bragging.  Nowadays it's a pretty silly
+#. * gesture, so it does not carry a harsh negative
+#. * connotation.  It is generally used in a playful tone
+#. * with friends.
+#: ../libpurple/protocols/myspace/zap.c:90
 msgid "Raspberry"
 msgstr "Dar língua"
 
-#: ../libpurple/protocols/myspace/zap.c:53
+#: ../libpurple/protocols/myspace/zap.c:90
 #, c-format
 msgid "%s has raspberried you!"
 msgstr "%s te deu língua!"
 
-#: ../libpurple/protocols/myspace/zap.c:53
+#: ../libpurple/protocols/myspace/zap.c:90
 #, c-format
 msgid "Raspberrying %s..."
 msgstr "Dar língua para %s..."
@@ -7826,44 +8166,44 @@
 msgid "Login failed (%s)."
 msgstr "A conexão falhou (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:247
+#: ../libpurple/protocols/novell/novell.c:255
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr ""
 "Não foi possível enviar mensagem. Não foi possível obter detalhes do usuário "
 "(%s)."
 
-#: ../libpurple/protocols/novell/novell.c:396
+#: ../libpurple/protocols/novell/novell.c:404
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "Não foi possível adicionar %s a sua lista de amigos (%s)."
 
 #. TODO: Improve this! message to who or for what conference?
-#: ../libpurple/protocols/novell/novell.c:422
+#: ../libpurple/protocols/novell/novell.c:430
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "Não foi possível enviar mensagem (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:493
-#: ../libpurple/protocols/novell/novell.c:985
+#: ../libpurple/protocols/novell/novell.c:501
+#: ../libpurple/protocols/novell/novell.c:993
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "Não foi possível convidar usuário (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:532
+#: ../libpurple/protocols/novell/novell.c:540
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr ""
 "Não foi possível enviar mensagem para %s. Não foi possível criar a "
 "conferência (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:537
+#: ../libpurple/protocols/novell/novell.c:545
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr ""
 "Não foi possível enviar mensagem. Não foi possível criar a conferência (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:584
+#: ../libpurple/protocols/novell/novell.c:592
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
@@ -7872,7 +8212,7 @@
 "Não foi possível mover usuário %s para a pasta %s na lista do servidor. Erro "
 "ao criar a pasta (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:632
+#: ../libpurple/protocols/novell/novell.c:640
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
@@ -7881,62 +8221,62 @@
 "Não foi possível adicionar %s à sua lista de amigos. Erro ao criar pasta na "
 "lista do servidor (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:705
+#: ../libpurple/protocols/novell/novell.c:713
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "Não foi possível obter detalhes do usuário %s (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:751
-#: ../libpurple/protocols/novell/novell.c:897
+#: ../libpurple/protocols/novell/novell.c:759
+#: ../libpurple/protocols/novell/novell.c:905
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "Não foi possível adicionar usuário a sua lista de privacidade (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:798
+#: ../libpurple/protocols/novell/novell.c:806
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "Não foi possível adicionar %s a sua lista de usuários bloqueados (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:851
+#: ../libpurple/protocols/novell/novell.c:859
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "Não foi possível adicionar %s a sua lista de amigos (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:919
+#: ../libpurple/protocols/novell/novell.c:927
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "Não foi possível remover %s da sua lista de privacidade (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:942
-#: ../libpurple/protocols/novell/novell.c:1647
+#: ../libpurple/protocols/novell/novell.c:950
+#: ../libpurple/protocols/novell/novell.c:1656
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "Não foi possível mudar configurações de privacidade no servidor (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:1012
+#: ../libpurple/protocols/novell/novell.c:1020
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "Não foi possível criar conferência (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:1121
-#: ../libpurple/protocols/novell/novell.c:1692
+#: ../libpurple/protocols/novell/novell.c:1131
+#: ../libpurple/protocols/novell/novell.c:1702
 msgid "Error communicating with server. Closing connection."
 msgstr "Erro na comunicação com o servidor. Fechando a conexão."
 
-#: ../libpurple/protocols/novell/novell.c:1476
+#: ../libpurple/protocols/novell/novell.c:1485
 msgid "Telephone Number"
 msgstr "Número de telefone"
 
-#: ../libpurple/protocols/novell/novell.c:1482
+#: ../libpurple/protocols/novell/novell.c:1491
 msgid "Personal Title"
 msgstr "Tratamento"
 
-#: ../libpurple/protocols/novell/novell.c:1486
+#: ../libpurple/protocols/novell/novell.c:1495
 msgid "Mailstop"
 msgstr "Mailstop"
 
-#: ../libpurple/protocols/novell/novell.c:1502
-#: ../libpurple/protocols/sametime/sametime.c:4122
+#: ../libpurple/protocols/novell/novell.c:1511
+#: ../libpurple/protocols/sametime/sametime.c:4168
 msgid "User ID"
 msgstr "ID do usuário"
 
@@ -7946,41 +8286,37 @@
 #. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: ../libpurple/protocols/novell/novell.c:1515
+#: ../libpurple/protocols/novell/novell.c:1524
 msgid "Full name"
 msgstr "Nome completo"
 
-#: ../libpurple/protocols/novell/novell.c:1637
+#: ../libpurple/protocols/novell/novell.c:1646
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "Conferência GroupWise %d"
 
-#: ../libpurple/protocols/novell/novell.c:1668
-msgid "Unable to make SSL connection to server."
-msgstr "Não foi possível criar conexão SSL com o servidor."
-
-#: ../libpurple/protocols/novell/novell.c:1720
+#: ../libpurple/protocols/novell/novell.c:1729
 msgid "Authenticating..."
 msgstr "Autenticando..."
 
-#: ../libpurple/protocols/novell/novell.c:1732
+#: ../libpurple/protocols/novell/novell.c:1743
 msgid "Unable to connect to server."
 msgstr "Não foi possível conectar ao servidor."
 
-#: ../libpurple/protocols/novell/novell.c:1735
+#: ../libpurple/protocols/novell/novell.c:1746
 msgid "Waiting for response..."
 msgstr "Esperando resposta..."
 
-#: ../libpurple/protocols/novell/novell.c:1870
+#: ../libpurple/protocols/novell/novell.c:1881
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s foi convidado para esta conversa."
 
-#: ../libpurple/protocols/novell/novell.c:1898
+#: ../libpurple/protocols/novell/novell.c:1909
 msgid "Invitation to Conversation"
 msgstr "Convite para conversa"
 
-#: ../libpurple/protocols/novell/novell.c:1899
+#: ../libpurple/protocols/novell/novell.c:1910
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -7991,16 +8327,15 @@
 "\n"
 "Enviado: %s"
 
-#: ../libpurple/protocols/novell/novell.c:1901
+#: ../libpurple/protocols/novell/novell.c:1912
 msgid "Would you like to join the conversation?"
 msgstr "Você deseja entrar na conversa?"
 
-#. we don't want to reconnect in this case
-#: ../libpurple/protocols/novell/novell.c:2012
+#: ../libpurple/protocols/novell/novell.c:2027
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "Você foi desconectado porque conectou em outra estação de trabalho."
 
-#: ../libpurple/protocols/novell/novell.c:2069
+#: ../libpurple/protocols/novell/novell.c:2084
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -8008,11 +8343,7 @@
 "%s parece estar desconectado e não recebeu a mensagem que você acabou de "
 "enviar."
 
-#. TODO: Would be nice to prompt if not set!
-#. *  purple_request_fields(gc, _("Server Address"),...);
-#.
-#. ...but for now just error out with a nice message.
-#: ../libpurple/protocols/novell/novell.c:2167
+#: ../libpurple/protocols/novell/novell.c:2184
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -8020,11 +8351,11 @@
 "Não foi possível conectar ao servidor. Por favor digite o endereço do "
 "servidor em que você deseja conectar."
 
-#: ../libpurple/protocols/novell/novell.c:2195
+#: ../libpurple/protocols/novell/novell.c:2213
 msgid "Error. SSL support is not installed."
 msgstr "Erro. O suporte a SSL não está instalado."
 
-#: ../libpurple/protocols/novell/novell.c:2504
+#: ../libpurple/protocols/novell/novell.c:2521
 #, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Esta conferência foi fechada. Não é possível enviar mais mensagens."
@@ -8039,33 +8370,33 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3518
-#: ../libpurple/protocols/novell/novell.c:3520
+#: ../libpurple/protocols/novell/novell.c:3535
+#: ../libpurple/protocols/novell/novell.c:3537
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Plugin de protocolo do mensageiro do Novell GroupWise"
 
-#: ../libpurple/protocols/novell/novell.c:3545
+#: ../libpurple/protocols/novell/novell.c:3562
 msgid "Server address"
 msgstr "Endereço do servidor"
 
-#: ../libpurple/protocols/novell/novell.c:3549
+#: ../libpurple/protocols/novell/novell.c:3566
 msgid "Server port"
 msgstr "Porta do servidor"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:387
-#: ../libpurple/protocols/yahoo/yahoo.c:2469
-#: ../libpurple/protocols/yahoo/yahoo.c:2636
-#: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:581
-#: ../libpurple/proxy.c:1116 ../libpurple/proxy.c:1225
-#: ../libpurple/proxy.c:1325 ../libpurple/proxy.c:1453
+#: ../libpurple/protocols/oscar/flap_connection.c:391
+#: ../libpurple/protocols/yahoo/yahoo.c:2473
+#: ../libpurple/protocols/yahoo/yahoo.c:2641
+#: ../libpurple/protocols/yahoo/ycht.c:482 ../libpurple/proxy.c:584
+#: ../libpurple/proxy.c:1129 ../libpurple/proxy.c:1238
+#: ../libpurple/proxy.c:1338 ../libpurple/proxy.c:1466
 msgid "Server closed the connection."
 msgstr "O servidor encerrou a conexão."
 
-#: ../libpurple/protocols/oscar/flap_connection.c:389
-#: ../libpurple/protocols/yahoo/yahoo.c:2463
-#: ../libpurple/protocols/yahoo/yahoo.c:2630 ../libpurple/proxy.c:593
-#: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1237
-#: ../libpurple/proxy.c:1337 ../libpurple/proxy.c:1465
+#: ../libpurple/protocols/oscar/flap_connection.c:393
+#: ../libpurple/protocols/yahoo/yahoo.c:2466
+#: ../libpurple/protocols/yahoo/yahoo.c:2634 ../libpurple/proxy.c:596
+#: ../libpurple/proxy.c:1141 ../libpurple/proxy.c:1250
+#: ../libpurple/proxy.c:1350 ../libpurple/proxy.c:1478
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -8074,10 +8405,10 @@
 "A conexão com o servidor foi perdida: \n"
 "%s"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:392
-#: ../libpurple/proxy.c:1145 ../libpurple/proxy.c:1250
-#: ../libpurple/proxy.c:1349 ../libpurple/proxy.c:1421
-#: ../libpurple/proxy.c:1478
+#: ../libpurple/protocols/oscar/flap_connection.c:396
+#: ../libpurple/proxy.c:1158 ../libpurple/proxy.c:1263
+#: ../libpurple/proxy.c:1362 ../libpurple/proxy.c:1434
+#: ../libpurple/proxy.c:1491
 msgid "Received invalid data on connection with server."
 msgstr "Dados inválidos foram recebidos na conexão com o servidor."
 
@@ -8112,36 +8443,45 @@
 msgstr "Plugin do protocolo ICQ"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4410
+#: ../libpurple/protocols/yahoo/yahoo.c:4421
 #: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "Codificação"
 
-#: ../libpurple/protocols/oscar/odc.c:40
+#: ../libpurple/protocols/oscar/odc.c:42
 msgid "The remote user has closed the connection."
 msgstr "O usuário remoto encerrou a conexão."
 
-#: ../libpurple/protocols/oscar/odc.c:42
+#: ../libpurple/protocols/oscar/odc.c:44
 msgid "The remote user has declined your request."
 msgstr "O usuário remoto recusou seu pedido."
 
-#: ../libpurple/protocols/oscar/odc.c:44
+#: ../libpurple/protocols/oscar/odc.c:46
 #, c-format
 msgid "Lost connection with the remote user:<br>%s"
 msgstr "Conexão com o usuário remoto perdida:<br>%s"
 
-#: ../libpurple/protocols/oscar/odc.c:47
+#: ../libpurple/protocols/oscar/odc.c:49
 msgid "Received invalid data on connection with remote user."
 msgstr "Dados inválidos foram recebidos na conexão com o usuário remoto."
 
-#: ../libpurple/protocols/oscar/odc.c:49
+#: ../libpurple/protocols/oscar/odc.c:51
 msgid "Could not establish a connection with the remote user."
 msgstr "Não foi possível estabelecer conexão com o usuário remoto."
 
-#: ../libpurple/protocols/oscar/odc.c:560
+#: ../libpurple/protocols/oscar/odc.c:562
 msgid "Direct IM established"
 msgstr "Mensagem instantânea direta estabelecida"
 
+#: ../libpurple/protocols/oscar/odc.c:600
+#, c-format
+msgid ""
+"%s tried to send you a %s file, but we only allow files up to %s over Direct "
+"IM.  Try using file transfer instead.\n"
+msgstr ""
+"%s tentou te enviar um arquivo %s, mas nós só permitimos arquivos de até %s "
+"pelo MI Direto. Tente usar a transferência de arquivos.\n"
+
 #: ../libpurple/protocols/oscar/oft.c:656
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
@@ -8265,8 +8605,8 @@
 "codificações diferentes, ou %s usa um cliente com defeito.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2387
-#: ../pidgin/gtkutils.c:2417
+#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2392
+#: ../pidgin/gtkutils.c:2422
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:332
 msgid "Buddy Icon"
 msgstr "Ícone de exibição"
@@ -8280,15 +8620,15 @@
 msgstr "Mensagem instantânea direta do AIM"
 
 #: ../libpurple/protocols/oscar/oscar.c:648
-#: ../libpurple/protocols/silc/silc.c:768
-#: ../libpurple/protocols/silc/util.c:553
+#: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc/util.c:559
 #: ../libpurple/protocols/silc10/silc.c:679
 #: ../libpurple/protocols/silc10/util.c:549
 msgid "Chat"
 msgstr "Bate-papo"
 
 #: ../libpurple/protocols/oscar/oscar.c:651
-#: ../libpurple/protocols/oscar/oscar.c:6010
+#: ../libpurple/protocols/oscar/oscar.c:6060
 msgid "Get File"
 msgstr "Receber arquivo"
 
@@ -8361,19 +8701,19 @@
 msgstr "Câmera"
 
 #: ../libpurple/protocols/oscar/oscar.c:725
-#: ../libpurple/protocols/oscar/oscar.c:5780
+#: ../libpurple/protocols/oscar/oscar.c:5830
 #, c-format
 msgid "Free For Chat"
 msgstr "Livre para conversa"
 
 #: ../libpurple/protocols/oscar/oscar.c:729
-#: ../libpurple/protocols/oscar/oscar.c:5815
+#: ../libpurple/protocols/oscar/oscar.c:5865
 #, c-format
 msgid "Not Available"
 msgstr "Não disponível"
 
 #: ../libpurple/protocols/oscar/oscar.c:731
-#: ../libpurple/protocols/oscar/oscar.c:5801
+#: ../libpurple/protocols/oscar/oscar.c:5851
 #, c-format
 msgid "Occupied"
 msgstr "Ocupado"
@@ -8383,10 +8723,10 @@
 msgid "Web Aware"
 msgstr "Permitir que outros vejam seu status pela Web"
 
-#: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:183
-#: ../libpurple/protocols/qq/qq.c:288
-#: ../libpurple/protocols/yahoo/yahoo.c:3095 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1060
+#: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:184
+#: ../libpurple/protocols/qq/qq.c:289
+#: ../libpurple/protocols/yahoo/yahoo.c:3106 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:557 ../pidgin/gtkstatusbox.c:1060
 #, c-format
 msgid "Invisible"
 msgstr "Invisível"
@@ -8397,13 +8737,13 @@
 msgstr "Conectado"
 
 #: ../libpurple/protocols/oscar/oscar.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3707
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1126
+#: ../libpurple/protocols/oscar/oscar.c:3717
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1156
 msgid "IP Address"
 msgstr "Endereço IP"
 
 #: ../libpurple/protocols/oscar/oscar.c:845
-#: ../libpurple/protocols/oscar/oscar.c:2891
+#: ../libpurple/protocols/oscar/oscar.c:2901
 msgid "Warning Level"
 msgstr "Nível de alerta"
 
@@ -8442,7 +8782,7 @@
 msgid "Finalizing connection"
 msgstr "Finalizando a conexão"
 
-#: ../libpurple/protocols/oscar/oscar.c:1260
+#: ../libpurple/protocols/oscar/oscar.c:1262
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -8454,18 +8794,20 @@
 "uma letra e conter apenas letras, números e espaços, ou conter apenas "
 "números."
 
-#: ../libpurple/protocols/oscar/oscar.c:1345
-#: ../libpurple/protocols/yahoo/yahoo.c:2105
+#. Unregistered screen name
+#: ../libpurple/protocols/oscar/oscar.c:1347
+#: ../libpurple/protocols/yahoo/yahoo.c:2108
 msgid "Invalid screen name."
 msgstr "Nome de usuário inválido."
 
-#: ../libpurple/protocols/oscar/oscar.c:1352
-#: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1045
-#: ../libpurple/protocols/yahoo/yahoo.c:2126
+#: ../libpurple/protocols/oscar/oscar.c:1353
+#: ../libpurple/protocols/qq/login_logout.c:485
+#: ../libpurple/protocols/simple/simple.c:1112
+#: ../libpurple/protocols/yahoo/yahoo.c:2130
 msgid "Incorrect password."
 msgstr "Senha incorreta."
 
+#. Suspended account
 #: ../libpurple/protocols/oscar/oscar.c:1357
 msgid "Your account is currently suspended."
 msgstr "Atualmente, sua conta está suspensa."
@@ -8475,8 +8817,10 @@
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "O serviço AOL Instant Messenger está temporariamente indisponível."
 
-#: ../libpurple/protocols/oscar/oscar.c:1366
-#: ../libpurple/protocols/oscar/oscar.c:1377
+#. screen name connecting too frequently
+#. IP address connecting too frequently
+#: ../libpurple/protocols/oscar/oscar.c:1365
+#: ../libpurple/protocols/oscar/oscar.c:1374
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -8485,46 +8829,55 @@
 "minutos e tente novamente. Se você continuar tentando, vai ter que esperar "
 "ainda mais."
 
-#: ../libpurple/protocols/oscar/oscar.c:1371
+#. client too old
+#: ../libpurple/protocols/oscar/oscar.c:1369
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "A versão do cliente que você está usando é velha demais. Favor atualizar em %"
 "s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1410
+#: ../libpurple/protocols/oscar/oscar.c:1407
 msgid "Could Not Connect"
 msgstr "Não foi possível conectar"
 
-#: ../libpurple/protocols/oscar/oscar.c:1414
+#: ../libpurple/protocols/oscar/oscar.c:1411
 msgid "Received authorization"
 msgstr "Autorização recebida"
 
-#: ../libpurple/protocols/oscar/oscar.c:1436
+#: ../libpurple/protocols/oscar/oscar.c:1434
 msgid "The SecurID key entered is invalid."
 msgstr "A chave SecurID digitada é inválida."
 
-#: ../libpurple/protocols/oscar/oscar.c:1449
+#: ../libpurple/protocols/oscar/oscar.c:1447
 msgid "Enter SecurID"
 msgstr "Digite o SecurID"
 
-#: ../libpurple/protocols/oscar/oscar.c:1450
+#: ../libpurple/protocols/oscar/oscar.c:1448
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Digite o número de 6 dígitos do visor digital."
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#. *
+#. * @since 2.3.0
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1452
-#: ../libpurple/protocols/oscar/oscar.c:2232
-#: ../libpurple/protocols/oscar/oscar.c:2281
-#: ../libpurple/protocols/oscar/oscar.c:5885
-#: ../libpurple/protocols/oscar/oscar.c:6166 ../libpurple/request.h:1388
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#. *
+#. * @deprecated Please use purple_request_ok_cancel_with_hint instead.
+#.
+#: ../libpurple/protocols/oscar/oscar.c:1450
+#: ../libpurple/protocols/oscar/oscar.c:2242
+#: ../libpurple/protocols/oscar/oscar.c:2291
+#: ../libpurple/protocols/oscar/oscar.c:5935
+#: ../libpurple/protocols/oscar/oscar.c:6216 ../libpurple/request.h:1828
+#: ../libpurple/request.h:1841
 msgid "_OK"
 msgstr "_OK"
 
-#: ../libpurple/protocols/oscar/oscar.c:1491
-#: ../libpurple/protocols/oscar/oscar.c:1534
+#: ../libpurple/protocols/oscar/oscar.c:1489
+#: ../libpurple/protocols/oscar/oscar.c:1532
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -8533,56 +8886,56 @@
 "Você pode ser desconectado num curto período de tempo. Você pode querer usar "
 "o TOC até que isso esteja corrigido. Verifique por atualizações em %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:1494
-#: ../libpurple/protocols/oscar/oscar.c:1537
+#: ../libpurple/protocols/oscar/oscar.c:1492
+#: ../libpurple/protocols/oscar/oscar.c:1535
 msgid "Unable to get a valid AIM login hash."
 msgstr "Não foi possível conseguir um hash de conexão AIM válido."
 
-#: ../libpurple/protocols/oscar/oscar.c:1622
+#: ../libpurple/protocols/oscar/oscar.c:1620
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr ""
 "Você pode ser desconectado daqui a pouco. Verifique atualizações em %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:1625
+#: ../libpurple/protocols/oscar/oscar.c:1623
 msgid "Unable to get a valid login hash."
 msgstr "Não foi possível conseguir um hash de conexão válido."
 
-#: ../libpurple/protocols/oscar/oscar.c:1655
+#: ../libpurple/protocols/oscar/oscar.c:1653
 msgid "Password sent"
 msgstr "Senha enviada"
 
-#: ../libpurple/protocols/oscar/oscar.c:1711
+#: ../libpurple/protocols/oscar/oscar.c:1709
 msgid "Unable to initialize connection"
 msgstr "Não foi possível inicializar conexão"
 
-#: ../libpurple/protocols/oscar/oscar.c:2202
+#: ../libpurple/protocols/oscar/oscar.c:2200
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr ""
 "Por favor me autorize para que eu possa adicioná-lo(a) à minha lista de "
 "amigos."
 
-#: ../libpurple/protocols/oscar/oscar.c:2230
+#: ../libpurple/protocols/oscar/oscar.c:2240
 msgid "Authorization Request Message:"
 msgstr "Mensagem para pedido de autorização:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2231
+#: ../libpurple/protocols/oscar/oscar.c:2241
 msgid "Please authorize me!"
 msgstr "Por favor me autorize!"
 
-#: ../libpurple/protocols/oscar/oscar.c:2272
-#: ../libpurple/protocols/oscar/oscar.c:2280
-#: ../libpurple/protocols/oscar/oscar.c:2407
-#: ../libpurple/protocols/oscar/oscar.c:5263
-#: ../libpurple/protocols/yahoo/yahoo.c:1030
+#: ../libpurple/protocols/oscar/oscar.c:2282
+#: ../libpurple/protocols/oscar/oscar.c:2290
+#: ../libpurple/protocols/oscar/oscar.c:2417
+#: ../libpurple/protocols/oscar/oscar.c:5311
+#: ../libpurple/protocols/yahoo/yahoo.c:1032
 msgid "No reason given."
 msgstr "Nenhum motivo foi dado."
 
-#: ../libpurple/protocols/oscar/oscar.c:2279
+#: ../libpurple/protocols/oscar/oscar.c:2289
 msgid "Authorization Denied Message:"
 msgstr "Mensagem de recusa de autorização:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2407
+#: ../libpurple/protocols/oscar/oscar.c:2417
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -8593,18 +8946,18 @@
 "o seguinte motivo:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2408
+#: ../libpurple/protocols/oscar/oscar.c:2418
 msgid "ICQ authorization denied."
 msgstr "Autorização do ICQ negada."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2415
+#: ../libpurple/protocols/oscar/oscar.c:2425
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 "O usuário %u aceitou seu pedido para adicioná-lo(a) à sua lista de amigos."
 
-#: ../libpurple/protocols/oscar/oscar.c:2423
+#: ../libpurple/protocols/oscar/oscar.c:2433
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8617,7 +8970,7 @@
 "De: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2431
+#: ../libpurple/protocols/oscar/oscar.c:2441
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8630,7 +8983,7 @@
 "De: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2439
+#: ../libpurple/protocols/oscar/oscar.c:2449
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -8643,38 +8996,38 @@
 "A mensagem é: \n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2460
+#: ../libpurple/protocols/oscar/oscar.c:2470
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "O usuário de ICQ %u lhe mandou um amigo: %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2466
+#: ../libpurple/protocols/oscar/oscar.c:2476
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Você quer adicionar este amigo à sua lista de amigos?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2471 ../pidgin/gtkroomlist.c:309
+#: ../libpurple/protocols/oscar/oscar.c:2481 ../pidgin/gtkroomlist.c:318
 msgid "_Add"
 msgstr "_Adicionar"
 
-#: ../libpurple/protocols/oscar/oscar.c:2472
+#: ../libpurple/protocols/oscar/oscar.c:2482
 msgid "_Decline"
 msgstr "_Rejeitar"
 
-#: ../libpurple/protocols/oscar/oscar.c:2596
+#: ../libpurple/protocols/oscar/oscar.c:2606
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "Você perdeu %hu mensagem de %s por que ela era inválida."
 msgstr[1] "Você perdeu %hu mensagens de %s por que elas eram inválidas."
 
-#: ../libpurple/protocols/oscar/oscar.c:2605
+#: ../libpurple/protocols/oscar/oscar.c:2615
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "Você perdeu %hu mensagem de %s porque ela era muito extensa."
 msgstr[1] "Você perdeu %hu mensagens de %s porque elas eram muito extensas."
 
-#: ../libpurple/protocols/oscar/oscar.c:2614
+#: ../libpurple/protocols/oscar/oscar.c:2624
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -8685,21 +9038,21 @@
 msgstr[1] ""
 "Você perdeu %hu mensagens de %s porque o limite de freqüência foi excedido."
 
-#: ../libpurple/protocols/oscar/oscar.c:2623
+#: ../libpurple/protocols/oscar/oscar.c:2633
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "Você perdeu %hu mensagem de %s porque ele(a) foi muito malvado(a)."
 msgstr[1] "Você perdeu %hu mensagens de %s porque ele(a) foi muito malvado(a)."
 
-#: ../libpurple/protocols/oscar/oscar.c:2632
+#: ../libpurple/protocols/oscar/oscar.c:2642
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "Você perdeu %hu mensagem de %s porque você é muito malvado(a)."
 msgstr[1] "Você perdeu %hu mensagens de %s porque você é muito malvado(a)."
 
-#: ../libpurple/protocols/oscar/oscar.c:2641
+#: ../libpurple/protocols/oscar/oscar.c:2651
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
@@ -8707,47 +9060,47 @@
 msgstr[1] "Você perdeu %hu mensagens de %s por um motivo desconhecido."
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2796
+#: ../libpurple/protocols/oscar/oscar.c:2806
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Não foi possível enviar mensagem: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2796
-#: ../libpurple/protocols/oscar/oscar.c:2801
-#: ../libpurple/protocols/oscar/oscar.c:2865
+#: ../libpurple/protocols/oscar/oscar.c:2806
+#: ../libpurple/protocols/oscar/oscar.c:2811
+#: ../libpurple/protocols/oscar/oscar.c:2875
 msgid "Unknown reason."
 msgstr "Motivo desconhecido."
 
-#: ../libpurple/protocols/oscar/oscar.c:2799
-#: ../libpurple/protocols/sametime/sametime.c:2409
+#: ../libpurple/protocols/oscar/oscar.c:2809
+#: ../libpurple/protocols/sametime/sametime.c:2451
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Não foi possível enviar mensagem para %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2865
+#: ../libpurple/protocols/oscar/oscar.c:2875
 #, c-format
 msgid "User information not available: %s"
 msgstr "Informação do usuário indisponível: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2896
+#: ../libpurple/protocols/oscar/oscar.c:2906
 msgid "Online Since"
 msgstr "Conectado desde"
 
-#: ../libpurple/protocols/oscar/oscar.c:2901
+#: ../libpurple/protocols/oscar/oscar.c:2911
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr "Membro desde"
 
-#: ../libpurple/protocols/oscar/oscar.c:2936
+#: ../libpurple/protocols/oscar/oscar.c:2946
 msgid "Available Message"
 msgstr "Mensagem de 'Disponível':"
 
-#: ../libpurple/protocols/oscar/oscar.c:3044
+#: ../libpurple/protocols/oscar/oscar.c:3054
 msgid "Your AIM connection may be lost."
 msgstr "Sua conexão AIM pode ter sido perdida."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3232
+#: ../libpurple/protocols/oscar/oscar.c:3242
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -8755,7 +9108,7 @@
 "[Não foi possível exibir uma mensagem deste usuário porque ela continha "
 "caracteres inválidos.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3396
+#: ../libpurple/protocols/oscar/oscar.c:3406
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -8763,83 +9116,83 @@
 "A última ação que você tentou não pôde ser executada porque você excedeu a "
 "taxa limite. Por favor espere 10 segundos e tente novamente."
 
-#: ../libpurple/protocols/oscar/oscar.c:3479
+#: ../libpurple/protocols/oscar/oscar.c:3489
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Você foi desconectado da sala %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3729
-#: ../libpurple/protocols/silc/util.c:585
+#: ../libpurple/protocols/oscar/oscar.c:3739
+#: ../libpurple/protocols/silc/util.c:591
 #: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "Telefone móvel"
 
-#: ../libpurple/protocols/oscar/oscar.c:3759
+#: ../libpurple/protocols/oscar/oscar.c:3769
 msgid "Personal Web Page"
 msgstr "Página da web pessoal"
 
-#: ../libpurple/protocols/oscar/oscar.c:3783
+#: ../libpurple/protocols/oscar/oscar.c:3793
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Informações adicionais"
 
-#: ../libpurple/protocols/oscar/oscar.c:3791
-#: ../libpurple/protocols/oscar/oscar.c:3804
+#: ../libpurple/protocols/oscar/oscar.c:3801
+#: ../libpurple/protocols/oscar/oscar.c:3814
 msgid "Zip Code"
 msgstr "Código Postal (CEP)"
 
-#: ../libpurple/protocols/oscar/oscar.c:3815
+#: ../libpurple/protocols/oscar/oscar.c:3825
 msgid "Division"
 msgstr "Divisão"
 
-#: ../libpurple/protocols/oscar/oscar.c:3816
+#: ../libpurple/protocols/oscar/oscar.c:3826
 msgid "Position"
 msgstr "Posição"
 
-#: ../libpurple/protocols/oscar/oscar.c:3818
+#: ../libpurple/protocols/oscar/oscar.c:3828
 msgid "Web Page"
 msgstr "Página da web"
 
-#: ../libpurple/protocols/oscar/oscar.c:3821
+#: ../libpurple/protocols/oscar/oscar.c:3831
 msgid "Work Information"
 msgstr "Informações do trabalho"
 
-#: ../libpurple/protocols/oscar/oscar.c:3877
+#: ../libpurple/protocols/oscar/oscar.c:3887
 msgid "Pop-Up Message"
 msgstr "Mensagem pop-up"
 
-#: ../libpurple/protocols/oscar/oscar.c:3917
+#: ../libpurple/protocols/oscar/oscar.c:3927
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "O seguinte nomes de usuário está associado com %s"
 msgstr[1] "Os seguintes nomes de usuário estão associados com %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3922
+#: ../libpurple/protocols/oscar/oscar.c:3932
 msgid "Screen name"
 msgstr "Nome de usuário"
 
-#: ../libpurple/protocols/oscar/oscar.c:3948
+#: ../libpurple/protocols/oscar/oscar.c:3958
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "Nenhum resultado encontrado para o endereço de e-mail %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3969
+#: ../libpurple/protocols/oscar/oscar.c:3979
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Você deve receber um e-mail pedindo para confirmar %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3971
+#: ../libpurple/protocols/oscar/oscar.c:3981
 msgid "Account Confirmation Requested"
 msgstr "Confirmação de conta recebida"
 
-#: ../libpurple/protocols/oscar/oscar.c:4002
+#: ../libpurple/protocols/oscar/oscar.c:4012
 #, c-format
 msgid "Error Changing Account Info"
 msgstr "Erro ao mudar informações da conta"
 
-#: ../libpurple/protocols/oscar/oscar.c:4005
+#: ../libpurple/protocols/oscar/oscar.c:4015
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8848,13 +9201,13 @@
 "Erro 0x%04x: Não foi possível formatar nome de usuário pois o nome "
 "requisitado difere do original."
 
-#: ../libpurple/protocols/oscar/oscar.c:4008
+#: ../libpurple/protocols/oscar/oscar.c:4018
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr ""
 "Erro 0x%04x: Não foi possível formatar nome de usuário pois este é inválido."
 
-#: ../libpurple/protocols/oscar/oscar.c:4011
+#: ../libpurple/protocols/oscar/oscar.c:4021
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8863,7 +9216,7 @@
 "Erro 0x%04x: Não foi possível formatar nome de usuário pois o nome "
 "requisitado é muito extenso."
 
-#: ../libpurple/protocols/oscar/oscar.c:4014
+#: ../libpurple/protocols/oscar/oscar.c:4024
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -8872,7 +9225,7 @@
 "Erro 0x%04x: Não foi possível mudar endereço de e-mail porque já existe um "
 "pedido pendente para esse nome de usuário."
 
-#: ../libpurple/protocols/oscar/oscar.c:4017
+#: ../libpurple/protocols/oscar/oscar.c:4027
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -8881,7 +9234,7 @@
 "Erro 0x%04x: Não foi possível mudar o endereço de e-mail porque este já "
 "possui muitos nomes de usuário associados a ele."
 
-#: ../libpurple/protocols/oscar/oscar.c:4020
+#: ../libpurple/protocols/oscar/oscar.c:4030
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -8890,32 +9243,32 @@
 "Erro 0x%04x: Não foi possível mudar o endereço de e-mail porque este é "
 "inválido."
 
-#: ../libpurple/protocols/oscar/oscar.c:4023
+#: ../libpurple/protocols/oscar/oscar.c:4033
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Erro 0x%04x: Erro desconhecido."
 
-#: ../libpurple/protocols/oscar/oscar.c:4033
+#: ../libpurple/protocols/oscar/oscar.c:4043
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "O endereço de e-mail de %s é %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4035
+#: ../libpurple/protocols/oscar/oscar.c:4045
 msgid "Account Info"
 msgstr "Informações da conta"
 
-#: ../libpurple/protocols/oscar/oscar.c:4218
+#: ../libpurple/protocols/oscar/oscar.c:4228
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "Sua imagem da mensagem instantânea não foi enviada. Você precisa estar "
 "conectado diretamente para enviar imagens por mensagens instantâneas."
 
-#: ../libpurple/protocols/oscar/oscar.c:4489
+#: ../libpurple/protocols/oscar/oscar.c:4499
 msgid "Unable to set AIM profile."
 msgstr "Não foi possível definir perfil AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:4490
+#: ../libpurple/protocols/oscar/oscar.c:4500
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
@@ -8925,7 +9278,7 @@
 "procedimento de conexão ser concluído. Seu perfil continua o mesmo; tente "
 "defini-lo novamente quando você estiver totalmente conectado."
 
-#: ../libpurple/protocols/oscar/oscar.c:4504
+#: ../libpurple/protocols/oscar/oscar.c:4514
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -8940,11 +9293,11 @@
 "O tamanho máximo de %d bytes do seu perfil foi excedido. Ele foi truncado "
 "para você."
 
-#: ../libpurple/protocols/oscar/oscar.c:4509
+#: ../libpurple/protocols/oscar/oscar.c:4519
 msgid "Profile too long."
 msgstr "Perfil muito extenso."
 
-#: ../libpurple/protocols/oscar/oscar.c:4554
+#: ../libpurple/protocols/oscar/oscar.c:4564
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -8959,11 +9312,11 @@
 "O tamanho máximo de %d bytes da mensagem de ausência foi excedido. Ele foi "
 "truncado para você."
 
-#: ../libpurple/protocols/oscar/oscar.c:4559
+#: ../libpurple/protocols/oscar/oscar.c:4569
 msgid "Away message too long."
 msgstr "Mensagem de ausência muito extensa."
 
-#: ../libpurple/protocols/oscar/oscar.c:4628
+#: ../libpurple/protocols/oscar/oscar.c:4642
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -8974,34 +9327,34 @@
 "Nomes de usuário têm que ser um email válido, começar com uma letra e conter "
 "apenas letras, números e espaços, ou conter apenas números."
 
-#: ../libpurple/protocols/oscar/oscar.c:4630
-#: ../libpurple/protocols/oscar/oscar.c:5060
-#: ../libpurple/protocols/oscar/oscar.c:5075
+#: ../libpurple/protocols/oscar/oscar.c:4644
+#: ../libpurple/protocols/oscar/oscar.c:5097
+#: ../libpurple/protocols/oscar/oscar.c:5112
 msgid "Unable To Add"
 msgstr "Não foi possível adicionar"
 
-#: ../libpurple/protocols/oscar/oscar.c:4739
+#: ../libpurple/protocols/oscar/oscar.c:4763
 msgid "Unable To Retrieve Buddy List"
 msgstr "Não foi possível recuperar lista de amigos"
 
-#: ../libpurple/protocols/oscar/oscar.c:4740
+#: ../libpurple/protocols/oscar/oscar.c:4764
 msgid ""
 "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."
+"list is not lost, and will probably become available in a few minutes."
 msgstr ""
 "Os servidores AIM não estão conseguindo enviar sua lista de amigos no "
 "momento. Sua lista de amigos não foi perdida, e provavelmente estará "
 "disponível em algumas horas."
 
-#: ../libpurple/protocols/oscar/oscar.c:4922
-#: ../libpurple/protocols/oscar/oscar.c:4924
-#: ../libpurple/protocols/oscar/oscar.c:5140
-#: ../libpurple/protocols/oscar/oscar.c:5141
-#: ../libpurple/protocols/oscar/oscar.c:5146
+#: ../libpurple/protocols/oscar/oscar.c:4947
+#: ../libpurple/protocols/oscar/oscar.c:4949
+#: ../libpurple/protocols/oscar/oscar.c:5177
+#: ../libpurple/protocols/oscar/oscar.c:5178
+#: ../libpurple/protocols/oscar/oscar.c:5183
 msgid "Orphans"
 msgstr "Órfãos"
 
-#: ../libpurple/protocols/oscar/oscar.c:5058
+#: ../libpurple/protocols/oscar/oscar.c:5095
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -9010,17 +9363,17 @@
 "Não foi possível adicionar o amigo %s porque você tem muitos amigos na sua "
 "lista de amigos. Por favor remova um e tente novamente."
 
-#: ../libpurple/protocols/oscar/oscar.c:5058
-#: ../libpurple/protocols/oscar/oscar.c:5073
+#: ../libpurple/protocols/oscar/oscar.c:5095
+#: ../libpurple/protocols/oscar/oscar.c:5110
 msgid "(no name)"
 msgstr "(sem nome)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5072
+#: ../libpurple/protocols/oscar/oscar.c:5109
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason."
 msgstr "Não foi possível adicionar o amigo %s por um motivo desconhecido."
 
-#: ../libpurple/protocols/oscar/oscar.c:5178
+#: ../libpurple/protocols/oscar/oscar.c:5226
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -9029,23 +9382,23 @@
 "O usuário %s lhe deu permissão para adicioná-lo à sua lista de amigos. Você "
 "deseja adicioná-lo?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5186
+#: ../libpurple/protocols/oscar/oscar.c:5234
 msgid "Authorization Given"
 msgstr "Autorização concedida"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5259
+#: ../libpurple/protocols/oscar/oscar.c:5307
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 "O usuário %s aceitou seu pedido para adicioná-lo à sua lista de amigos."
 
-#: ../libpurple/protocols/oscar/oscar.c:5260
+#: ../libpurple/protocols/oscar/oscar.c:5308
 msgid "Authorization Granted"
 msgstr "Autorização concedida"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5263
+#: ../libpurple/protocols/oscar/oscar.c:5311
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -9056,53 +9409,53 @@
 "seguinte motivo: \n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5264
+#: ../libpurple/protocols/oscar/oscar.c:5312
 msgid "Authorization Denied"
 msgstr "Autorização negada"
 
-#: ../libpurple/protocols/oscar/oscar.c:5300
+#: ../libpurple/protocols/oscar/oscar.c:5348
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Troca:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5340
+#: ../libpurple/protocols/oscar/oscar.c:5388
 msgid "Invalid chat name specified."
 msgstr "Nome de bate-papo inválido especificado."
 
-#: ../libpurple/protocols/oscar/oscar.c:5409
+#: ../libpurple/protocols/oscar/oscar.c:5457
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "Sua imagem da mensagem instantânea não foi enviada. Você não pode enviar "
 "imagens por mensagens instantâneas em bate-papos do AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:5569
-#: ../libpurple/protocols/oscar/oscar.c:5574
+#: ../libpurple/protocols/oscar/oscar.c:5619
+#: ../libpurple/protocols/oscar/oscar.c:5624
 msgid "Away Message"
 msgstr "Mensagem de ausência"
 
-#: ../libpurple/protocols/oscar/oscar.c:5574
+#: ../libpurple/protocols/oscar/oscar.c:5624
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(obtendo)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5774
+#: ../libpurple/protocols/oscar/oscar.c:5824
 msgid "iTunes Music Store Link"
 msgstr "Link para a loja de música do iTunes"
 
-#: ../libpurple/protocols/oscar/oscar.c:5882
+#: ../libpurple/protocols/oscar/oscar.c:5932
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Comentário do amigo %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5883
+#: ../libpurple/protocols/oscar/oscar.c:5933
 msgid "Buddy Comment:"
 msgstr "Comentário do amigo:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5930
+#: ../libpurple/protocols/oscar/oscar.c:5980
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Você selecionou abrir uma mensagem instantânea direta com %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:5934
+#: ../libpurple/protocols/oscar/oscar.c:5984
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -9110,66 +9463,66 @@
 "Por revelar seu endereço IP, isto pode ser considerado um risco de "
 "privacidade. Deseja continuar?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5940
-#: ../libpurple/protocols/oscar/peer.c:1045
+#: ../libpurple/protocols/oscar/oscar.c:5990
+#: ../libpurple/protocols/oscar/peer.c:1047
 msgid "C_onnect"
 msgstr "C_onectar"
 
-#: ../libpurple/protocols/oscar/oscar.c:5975
+#: ../libpurple/protocols/oscar/oscar.c:6025
 msgid "Get AIM Info"
 msgstr "Ver informações do AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:5981
+#: ../libpurple/protocols/oscar/oscar.c:6031
 msgid "Edit Buddy Comment"
 msgstr "Editar comentário do amigo"
 
-#: ../libpurple/protocols/oscar/oscar.c:5989
+#: ../libpurple/protocols/oscar/oscar.c:6039
 msgid "Get Status Msg"
 msgstr "Ver mensagem de status"
 
-#: ../libpurple/protocols/oscar/oscar.c:6002
+#: ../libpurple/protocols/oscar/oscar.c:6052
 msgid "Direct IM"
 msgstr "Mensagem instantânea direta"
 
-#: ../libpurple/protocols/oscar/oscar.c:6024
+#: ../libpurple/protocols/oscar/oscar.c:6074
 msgid "Re-request Authorization"
 msgstr "Re-requisitar autorização"
 
-#: ../libpurple/protocols/oscar/oscar.c:6083
+#: ../libpurple/protocols/oscar/oscar.c:6133
 msgid "Require authorization"
 msgstr "Pedir autorização"
 
-#: ../libpurple/protocols/oscar/oscar.c:6086
+#: ../libpurple/protocols/oscar/oscar.c:6136
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Disponível na Web (você vai receber SPAM ao ativar isto!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6091
+#: ../libpurple/protocols/oscar/oscar.c:6141
 msgid "ICQ Privacy Options"
 msgstr "Opções de privacidade do ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:6110
+#: ../libpurple/protocols/oscar/oscar.c:6160
 msgid "The new formatting is invalid."
 msgstr "A nova formatação é inválida."
 
-#: ../libpurple/protocols/oscar/oscar.c:6111
+#: ../libpurple/protocols/oscar/oscar.c:6161
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "A formatação do nome do usuário pode mudar apenas a capitalização e os "
 "espaços."
 
-#: ../libpurple/protocols/oscar/oscar.c:6164
+#: ../libpurple/protocols/oscar/oscar.c:6214
 msgid "Change Address To:"
 msgstr "Mudar endereço para:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6210
+#: ../libpurple/protocols/oscar/oscar.c:6260
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>você não está esperando autorização</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6213
+#: ../libpurple/protocols/oscar/oscar.c:6263
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Você está esperando autorização dos seguintes amigos"
 
-#: ../libpurple/protocols/oscar/oscar.c:6214
+#: ../libpurple/protocols/oscar/oscar.c:6264
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -9177,73 +9530,73 @@
 "Você pode re-requisitar autorização destes amigos clicando com o botão "
 "direito neles e selecionando \"Re-requisitar autorização.\""
 
-#: ../libpurple/protocols/oscar/oscar.c:6231
+#: ../libpurple/protocols/oscar/oscar.c:6281
 msgid "Find Buddy by E-Mail"
 msgstr "Encontrar amigo por e-mail"
 
-#: ../libpurple/protocols/oscar/oscar.c:6232
+#: ../libpurple/protocols/oscar/oscar.c:6282
 msgid "Search for a buddy by e-mail address"
 msgstr "Procurar por um amigo pelo endereço de e-mail"
 
-#: ../libpurple/protocols/oscar/oscar.c:6233
+#: ../libpurple/protocols/oscar/oscar.c:6283
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Digite o endereço de e-mail do amigo que você está procurando."
 
-#: ../libpurple/protocols/oscar/oscar.c:6236
+#: ../libpurple/protocols/oscar/oscar.c:6286
 msgid "_Search"
 msgstr "_Procurar"
 
-#: ../libpurple/protocols/oscar/oscar.c:6394
+#: ../libpurple/protocols/oscar/oscar.c:6444
 msgid "Set User Info (URL)..."
 msgstr "Definir informações de usuário (URL)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6405
+#: ../libpurple/protocols/oscar/oscar.c:6455
 msgid "Change Password (URL)"
 msgstr "Mudar senha (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6409
+#: ../libpurple/protocols/oscar/oscar.c:6459
 msgid "Configure IM Forwarding (URL)"
 msgstr "Configurar encaminhamento de mensagens (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6419
+#: ../libpurple/protocols/oscar/oscar.c:6469
 msgid "Set Privacy Options..."
 msgstr "Definir opções de privacidade..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6426
+#: ../libpurple/protocols/oscar/oscar.c:6476
 msgid "Confirm Account"
 msgstr "Confirmar conta"
 
-#: ../libpurple/protocols/oscar/oscar.c:6430
+#: ../libpurple/protocols/oscar/oscar.c:6480
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Mostrar o endereço de E-Mail registrado atualmente"
 
-#: ../libpurple/protocols/oscar/oscar.c:6434
+#: ../libpurple/protocols/oscar/oscar.c:6484
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Mudar o endereço de E-Mail registrado atualmente..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6441
+#: ../libpurple/protocols/oscar/oscar.c:6491
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Mostrar amigos esperando autorização"
 
-#: ../libpurple/protocols/oscar/oscar.c:6447
+#: ../libpurple/protocols/oscar/oscar.c:6497
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Procurar por amigos pelo endereço de E-Mail..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6452
+#: ../libpurple/protocols/oscar/oscar.c:6502
 msgid "Search for Buddy by Information"
 msgstr "Procurar por amigos por informações"
 
-#: ../libpurple/protocols/oscar/oscar.c:6520
+#: ../libpurple/protocols/oscar/oscar.c:6570
 msgid "Use recent buddies group"
 msgstr "Mostrar grupo \"Amigos Recentes\""
 
-#: ../libpurple/protocols/oscar/oscar.c:6523
+#: ../libpurple/protocols/oscar/oscar.c:6573
 msgid "Show how long you have been idle"
 msgstr "Mostra por quanto tempo você esteve inativo"
 
-#: ../libpurple/protocols/oscar/oscar.c:6678
+#: ../libpurple/protocols/oscar/oscar.c:6728
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -9251,28 +9604,28 @@
 "Sempre usar o proxy do servidor ICQ para transferências de arquivo\n"
 "(mais lento, mas não revela seu endereço IP)"
 
-#: ../libpurple/protocols/oscar/peer.c:697
+#: ../libpurple/protocols/oscar/peer.c:699
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr ""
 "Pedindo para %s conectar a nós em %s:%hu para mensagem instantânea direta."
 
-#: ../libpurple/protocols/oscar/peer.c:782
+#: ../libpurple/protocols/oscar/peer.c:784
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "Tentando conectar a %s:%hu."
 
-#: ../libpurple/protocols/oscar/peer.c:856
+#: ../libpurple/protocols/oscar/peer.c:858
 #, c-format
 msgid "Attempting to connect via proxy server."
 msgstr "Tentando conectar pelo servidor proxy."
 
-#: ../libpurple/protocols/oscar/peer.c:1033
+#: ../libpurple/protocols/oscar/peer.c:1035
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s acabou de pedir para fazer uma conexão direta com %s"
 
-#: ../libpurple/protocols/oscar/peer.c:1037
+#: ../libpurple/protocols/oscar/peer.c:1039
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
@@ -9434,20 +9787,20 @@
 msgid "Other"
 msgstr "Outro"
 
-#: ../libpurple/protocols/qq/buddy_info.c:481
-#: ../libpurple/protocols/qq/buddy_info.c:482
+#: ../libpurple/protocols/qq/buddy_info.c:522
+#: ../libpurple/protocols/qq/buddy_info.c:523
 msgid "Modify my information"
 msgstr "Modificar minhas informações"
 
-#: ../libpurple/protocols/qq/buddy_info.c:483
+#: ../libpurple/protocols/qq/buddy_info.c:524
 msgid "Update my information"
 msgstr "Atualizar minhas informações"
 
-#: ../libpurple/protocols/qq/buddy_info.c:507
+#: ../libpurple/protocols/qq/buddy_info.c:548
 msgid "Your information has been updated"
 msgstr "Suas informações foram atualizadas"
 
-#: ../libpurple/protocols/qq/buddy_info.c:560
+#: ../libpurple/protocols/qq/buddy_info.c:601
 #, c-format
 msgid ""
 "Setting custom faces is not currently supported. Please choose an image from "
@@ -9456,8 +9809,8 @@
 "A definição de rostos personalizados não é suportada no momento. Favor "
 "escolher uma imagem de %s."
 
-#: ../libpurple/protocols/qq/buddy_info.c:577
-#: ../libpurple/protocols/qq/buddy_info.c:590
+#: ../libpurple/protocols/qq/buddy_info.c:618
+#: ../libpurple/protocols/qq/buddy_info.c:631
 msgid "Invalid QQ Face"
 msgstr "Rosto do QQ"
 
@@ -9720,7 +10073,7 @@
 msgid "Failed to send IM."
 msgstr "Falha ao enviar mensagem."
 
-#: ../libpurple/protocols/qq/keep_alive.c:87
+#: ../libpurple/protocols/qq/keep_alive.c:88
 msgid "Keep alive error"
 msgstr "Erro de keep-alive"
 
@@ -9728,100 +10081,100 @@
 msgid "Error requesting login token"
 msgstr "Erro ao solicitar token de conexão"
 
-#: ../libpurple/protocols/qq/login_logout.c:486
+#: ../libpurple/protocols/qq/login_logout.c:489
 msgid "Unable to login, check debug log"
 msgstr "Não foi possível conectar, verifique o log de depuração"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
+#: ../libpurple/protocols/qq/qq.c:140 ../libpurple/protocols/toc/toc.c:173
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:109
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:189
-#: ../libpurple/protocols/yahoo/ycht.c:549
+#: ../libpurple/protocols/yahoo/ycht.c:550
 msgid "Unable to connect."
 msgstr "Não foi possível conectar."
 
-#: ../libpurple/protocols/qq/qq.c:186
+#: ../libpurple/protocols/qq/qq.c:187
 #, c-format
 msgid "Unknown-%d"
 msgstr "Desconhecido-%d"
 
-#: ../libpurple/protocols/qq/qq.c:211
+#: ../libpurple/protocols/qq/qq.c:212
 msgid "TCP Address"
 msgstr "Endereço TCP"
 
-#: ../libpurple/protocols/qq/qq.c:213
+#: ../libpurple/protocols/qq/qq.c:214
 msgid "UDP Address"
 msgstr "Endereço UDP"
 
-#: ../libpurple/protocols/qq/qq.c:242
+#: ../libpurple/protocols/qq/qq.c:243
 msgid "Level"
 msgstr "Nível"
 
-#: ../libpurple/protocols/qq/qq.c:373
+#: ../libpurple/protocols/qq/qq.c:374
 msgid "Invalid name"
 msgstr "Nome inválido"
 
-#: ../libpurple/protocols/qq/qq.c:439
+#: ../libpurple/protocols/qq/qq.c:440
 #, c-format
 msgid "<b>Current Online</b>: %d<br>\n"
 msgstr "<b>Atualmente online</b>: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:440
+#: ../libpurple/protocols/qq/qq.c:441
 #, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr "<b>Última atualização</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:444
+#: ../libpurple/protocols/qq/qq.c:445
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>Tipo de conexão:</b> %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:445
+#: ../libpurple/protocols/qq/qq.c:446
 #, c-format
 msgid "<b>Server IP</b>: %s: %d<br>\n"
 msgstr "<b>IP do Servidor</b>: %s: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:446
+#: ../libpurple/protocols/qq/qq.c:447
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
 msgstr "<b>Meu IP público:</b> %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:451
+#: ../libpurple/protocols/qq/qq.c:452
 #, c-format
 msgid "<b>Login Time</b>: %s<br>\n"
 msgstr "<b>Hora de conexão:</b> %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:452
+#: ../libpurple/protocols/qq/qq.c:453
 #, c-format
 msgid "<b>Last Login IP</b>: %s<br>\n"
 msgstr "<b>Último IP a conectar</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:453
+#: ../libpurple/protocols/qq/qq.c:454
 #, c-format
 msgid "<b>Last Login Time</b>: %s\n"
 msgstr "<b>Última hora de conexão</b>: %s\n"
 
-#: ../libpurple/protocols/qq/qq.c:457
+#: ../libpurple/protocols/qq/qq.c:458
 msgid "Login Information"
 msgstr "Informações de conexão"
 
-#: ../libpurple/protocols/qq/qq.c:533
+#: ../libpurple/protocols/qq/qq.c:534
 msgid "Set My Information"
 msgstr "Mudar minhas informações"
 
-#: ../libpurple/protocols/qq/qq.c:536 ../libpurple/protocols/toc/toc.c:1680
+#: ../libpurple/protocols/qq/qq.c:537 ../libpurple/protocols/toc/toc.c:1680
 msgid "Change Password"
 msgstr "Alterar senha"
 
-#: ../libpurple/protocols/qq/qq.c:539
+#: ../libpurple/protocols/qq/qq.c:540
 msgid "Show Login Information"
 msgstr "Exibir informações de conexão"
 
-#: ../libpurple/protocols/qq/qq.c:560
+#: ../libpurple/protocols/qq/qq.c:561
 msgid "Leave this QQ Qun"
 msgstr "Sair deste Qun QQ"
 
-#: ../libpurple/protocols/qq/qq.c:584
+#: ../libpurple/protocols/qq/qq.c:585
 msgid "Block this buddy"
 msgstr "Bloquear este amigo"
 
@@ -9835,19 +10188,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/qq/qq.c:725 ../libpurple/protocols/qq/qq.c:727
+#: ../libpurple/protocols/qq/qq.c:726 ../libpurple/protocols/qq/qq.c:728
 msgid "QQ Protocol\tPlugin"
 msgstr "Plugin do protocolo QQ"
 
-#: ../libpurple/protocols/qq/qq.c:752
+#: ../libpurple/protocols/qq/qq.c:753
 msgid "Connect using TCP"
 msgstr "Conectar usando TCP"
 
-#: ../libpurple/protocols/qq/recv_core.c:309
+#: ../libpurple/protocols/qq/recv_core.c:310
 msgid "Socket error"
 msgstr "Erro de socket"
 
-#: ../libpurple/protocols/qq/recv_core.c:319
+#: ../libpurple/protocols/qq/recv_core.c:321
 msgid "Unable to read from socket"
 msgstr "Não foi possível ler do socket"
 
@@ -9866,12 +10219,11 @@
 msgid "%d canceled the transfer of %s"
 msgstr "%d cancelou a transferência de %s"
 
-#: ../libpurple/protocols/qq/sendqueue.c:123
+#: ../libpurple/protocols/qq/sendqueue.c:124
 msgid "Connection lost"
 msgstr "Conexão perdida"
 
-#. cancel login progress
-#: ../libpurple/protocols/qq/sendqueue.c:131
+#: ../libpurple/protocols/qq/sendqueue.c:133
 msgid "Login failed, no reply"
 msgstr "Falha ao conectar: não houve resposta"
 
@@ -9921,139 +10273,139 @@
 msgid "%s is not in your buddy list"
 msgstr "%s não está na sua lista de amigos"
 
-#: ../libpurple/protocols/sametime/sametime.c:417
+#: ../libpurple/protocols/sametime/sametime.c:419
 msgid "Connection closed (writing)"
 msgstr "Conexão fechada (escrevendo)"
 
-#: ../libpurple/protocols/sametime/sametime.c:1290
+#: ../libpurple/protocols/sametime/sametime.c:1292
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Título do grupo:</b> %s<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:1291
+#: ../libpurple/protocols/sametime/sametime.c:1293
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr "<b>ID do Grupo Notes:</b> %s<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:1293
+#: ../libpurple/protocols/sametime/sametime.c:1295
 #, c-format
 msgid "Info for Group %s"
 msgstr "Informações do grupo %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1295
+#: ../libpurple/protocols/sametime/sametime.c:1297
 msgid "Notes Address Book Information"
 msgstr "Informações do catálogo de endereços do Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:1327
+#: ../libpurple/protocols/sametime/sametime.c:1329
 msgid "Invite Group to Conference..."
 msgstr "Convidar grupo para conferência"
 
-#: ../libpurple/protocols/sametime/sametime.c:1337
+#: ../libpurple/protocols/sametime/sametime.c:1339
 msgid "Get Notes Address Book Info"
 msgstr "Obter informações do catálogo de endereços do Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:1504
+#: ../libpurple/protocols/sametime/sametime.c:1506
 msgid "Sending Handshake"
 msgstr "Enviando requisição"
 
-#: ../libpurple/protocols/sametime/sametime.c:1509
+#: ../libpurple/protocols/sametime/sametime.c:1511
 msgid "Waiting for Handshake Acknowledgement"
 msgstr "Esperando a aceitação da requisição"
 
-#: ../libpurple/protocols/sametime/sametime.c:1514
+#: ../libpurple/protocols/sametime/sametime.c:1516
 msgid "Handshake Acknowledged, Sending Login"
 msgstr "Requisição aceita, enviando dados de conexão"
 
-#: ../libpurple/protocols/sametime/sametime.c:1519
+#: ../libpurple/protocols/sametime/sametime.c:1521
 msgid "Waiting for Login Acknowledgement"
 msgstr "Esperando a aceitação dos dados"
 
-#: ../libpurple/protocols/sametime/sametime.c:1524
+#: ../libpurple/protocols/sametime/sametime.c:1526
 msgid "Login Redirected"
 msgstr "Conexão redirecionada"
 
-#: ../libpurple/protocols/sametime/sametime.c:1530
+#: ../libpurple/protocols/sametime/sametime.c:1532
 msgid "Forcing Login"
 msgstr "Forçando conexão"
 
-#: ../libpurple/protocols/sametime/sametime.c:1534
+#: ../libpurple/protocols/sametime/sametime.c:1536
 msgid "Login Acknowledged"
 msgstr "Conexão aceita"
 
-#: ../libpurple/protocols/sametime/sametime.c:1539
+#: ../libpurple/protocols/sametime/sametime.c:1541
 msgid "Starting Services"
 msgstr "Iniciando serviços"
 
-#: ../libpurple/protocols/sametime/sametime.c:1645
+#: ../libpurple/protocols/sametime/sametime.c:1678
 #, c-format
 msgid ""
 "A Sametime administrator has issued the following announcement on server %s"
 msgstr ""
 "Um administrador do Sametime publicou o seguinte anúncio no servidor %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1650
+#: ../libpurple/protocols/sametime/sametime.c:1683
 msgid "Sametime Administrator Announcement"
 msgstr "Anúncio do administrador do Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:1702
+#: ../libpurple/protocols/sametime/sametime.c:1734
 msgid "Connection reset"
 msgstr "Conexão redefinida"
 
-#: ../libpurple/protocols/sametime/sametime.c:1709
+#: ../libpurple/protocols/sametime/sametime.c:1746
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr "Erro ao ler do socket: %s"
 
 #. this is a regular connect, error out
-#: ../libpurple/protocols/sametime/sametime.c:1732
-#: ../libpurple/protocols/sametime/sametime.c:3726
+#: ../libpurple/protocols/sametime/sametime.c:1771
+#: ../libpurple/protocols/sametime/sametime.c:3772
 msgid "Unable to connect to host"
 msgstr "Não foi possível conectar ao servidor."
 
-#: ../libpurple/protocols/sametime/sametime.c:1770
+#: ../libpurple/protocols/sametime/sametime.c:1812
 #, c-format
 msgid "Announcement from %s"
 msgstr "Anúncio de %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1944
+#: ../libpurple/protocols/sametime/sametime.c:1986
 msgid "Conference Closed"
 msgstr "Conferência fechada"
 
-#: ../libpurple/protocols/sametime/sametime.c:2403
+#: ../libpurple/protocols/sametime/sametime.c:2445
 msgid "Unable to send message: "
 msgstr "Não foi possível enviar mensagem: "
 
-#: ../libpurple/protocols/sametime/sametime.c:2959
+#: ../libpurple/protocols/sametime/sametime.c:3001
 msgid "Place Closed"
 msgstr "Local fechado"
 
-#: ../libpurple/protocols/sametime/sametime.c:3229
+#: ../libpurple/protocols/sametime/sametime.c:3271
 msgid "Microphone"
 msgstr "Microfone"
 
-#: ../libpurple/protocols/sametime/sametime.c:3230
+#: ../libpurple/protocols/sametime/sametime.c:3272
 msgid "Speakers"
 msgstr "Caixas de som"
 
-#: ../libpurple/protocols/sametime/sametime.c:3231
+#: ../libpurple/protocols/sametime/sametime.c:3273
 msgid "Video Camera"
 msgstr "Câmera de vídeo"
 
-#: ../libpurple/protocols/sametime/sametime.c:3269
-#: ../libpurple/protocols/sametime/sametime.c:4145
+#: ../libpurple/protocols/sametime/sametime.c:3311
+#: ../libpurple/protocols/sametime/sametime.c:4191
 msgid "Supports"
 msgstr "Suporta"
 
-#: ../libpurple/protocols/sametime/sametime.c:3274
-#: ../libpurple/protocols/sametime/sametime.c:4119
+#: ../libpurple/protocols/sametime/sametime.c:3316
+#: ../libpurple/protocols/sametime/sametime.c:4165
 msgid "External User"
 msgstr "Usuário externo"
 
-#: ../libpurple/protocols/sametime/sametime.c:3380
+#: ../libpurple/protocols/sametime/sametime.c:3422
 msgid "Create conference with user"
 msgstr "Criar conferência com usuário"
 
-#: ../libpurple/protocols/sametime/sametime.c:3381
+#: ../libpurple/protocols/sametime/sametime.c:3423
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
@@ -10062,27 +10414,27 @@
 "Favor digitar um tópico para a nova conferência, e uma mensagem de convite "
 "para ser enviada para %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:3385
+#: ../libpurple/protocols/sametime/sametime.c:3427
 msgid "New Conference"
 msgstr "Nova conferência"
 
-#: ../libpurple/protocols/sametime/sametime.c:3387
+#: ../libpurple/protocols/sametime/sametime.c:3429
 msgid "Create"
 msgstr "Criar"
 
-#: ../libpurple/protocols/sametime/sametime.c:3452
+#: ../libpurple/protocols/sametime/sametime.c:3494
 msgid "Available Conferences"
 msgstr "Conferências disponíveis"
 
-#: ../libpurple/protocols/sametime/sametime.c:3458
+#: ../libpurple/protocols/sametime/sametime.c:3500
 msgid "Create New Conference..."
 msgstr "Criar nova conferência..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3465
+#: ../libpurple/protocols/sametime/sametime.c:3507
 msgid "Invite user to a conference"
 msgstr "Convidar usuário para uma conferência"
 
-#: ../libpurple/protocols/sametime/sametime.c:3466
+#: ../libpurple/protocols/sametime/sametime.c:3508
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -10093,27 +10445,27 @@
 "usuário %s. Selecione \"Criar nova conferência\" se você deseja criar uma "
 "nova conferência e convidar este usuário para ela."
 
-#: ../libpurple/protocols/sametime/sametime.c:3471
+#: ../libpurple/protocols/sametime/sametime.c:3513
 msgid "Invite to Conference"
 msgstr "Convidar para uma conferência"
 
-#: ../libpurple/protocols/sametime/sametime.c:3562
+#: ../libpurple/protocols/sametime/sametime.c:3604
 msgid "Invite to Conference..."
 msgstr "Convidar para conferência..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3567
+#: ../libpurple/protocols/sametime/sametime.c:3609
 msgid "Send TEST Announcement"
 msgstr "Enviar anúncio TEST"
 
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4354
+#: ../libpurple/protocols/sametime/sametime.c:3628 ../pidgin/gtkconv.c:4437
 msgid "Topic:"
 msgstr "Tópico:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3614
+#: ../libpurple/protocols/sametime/sametime.c:3656
 msgid "No Sametime Community Server specified"
 msgstr "Nenhum servidor comunitário do Sametime especificado"
 
-#: ../libpurple/protocols/sametime/sametime.c:3636
+#: ../libpurple/protocols/sametime/sametime.c:3681
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
@@ -10122,42 +10474,42 @@
 "Nenhum servidor ou endereço IP foi configurado para a conta %s do Meanwhile. "
 "Favor digitar um abaixo para continuar o processo de conexão."
 
-#: ../libpurple/protocols/sametime/sametime.c:3641
+#: ../libpurple/protocols/sametime/sametime.c:3686
 msgid "Meanwhile Connection Setup"
 msgstr "Configuração da conexão do Meanwhile"
 
-#: ../libpurple/protocols/sametime/sametime.c:3642
+#: ../libpurple/protocols/sametime/sametime.c:3687
 msgid "No Sametime Community Server Specified"
 msgstr "Nenhum servidor comunitário do Sametime especificado"
 
-#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4041
+#: ../libpurple/protocols/sametime/sametime.c:3689
 msgid "Connect"
 msgstr "Conectar"
 
-#: ../libpurple/protocols/sametime/sametime.c:4135
+#: ../libpurple/protocols/sametime/sametime.c:4181
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Desconhecido (0x%04x)<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:4137
+#: ../libpurple/protocols/sametime/sametime.c:4183
 msgid "Last Known Client"
 msgstr "Último cliente conhecido"
 
-#: ../libpurple/protocols/sametime/sametime.c:4301
-#: ../libpurple/protocols/sametime/sametime.c:5506
+#: ../libpurple/protocols/sametime/sametime.c:4347
+#: ../libpurple/protocols/sametime/sametime.c:5552
 msgid "User Name"
 msgstr "Nome do usuário"
 
-#: ../libpurple/protocols/sametime/sametime.c:4304
-#: ../libpurple/protocols/sametime/sametime.c:5509
+#: ../libpurple/protocols/sametime/sametime.c:4350
+#: ../libpurple/protocols/sametime/sametime.c:5555
 msgid "Sametime ID"
 msgstr "ID do Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:4328
+#: ../libpurple/protocols/sametime/sametime.c:4374
 msgid "An ambiguous user ID was entered"
 msgstr "Um ID de usuário ambíguo foi digitado"
 
-#: ../libpurple/protocols/sametime/sametime.c:4329
+#: ../libpurple/protocols/sametime/sametime.c:4375
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -10167,15 +10519,15 @@
 "Por favor selecione o usuário correto a partir da lista abaixo para adicioná-"
 "lo a sua lista de amigos."
 
-#: ../libpurple/protocols/sametime/sametime.c:4334
+#: ../libpurple/protocols/sametime/sametime.c:4380
 msgid "Select User"
 msgstr "Selecionar usuário"
 
-#: ../libpurple/protocols/sametime/sametime.c:4418
+#: ../libpurple/protocols/sametime/sametime.c:4464
 msgid "Unable to add user: user not found"
 msgstr "Não foi possível adicionar usuário: usuário não encontrado"
 
-#: ../libpurple/protocols/sametime/sametime.c:4420
+#: ../libpurple/protocols/sametime/sametime.c:4466
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
@@ -10184,11 +10536,7 @@
 "O identificador '%s' não corresponde a nenhum usuário na sua comunidade do "
 "Sametime. Esta entrada foi removida da sua lista de amigos."
 
-#: ../libpurple/protocols/sametime/sametime.c:4425
-msgid "Unable to add user"
-msgstr "Não foi possível adicionar usuário"
-
-#: ../libpurple/protocols/sametime/sametime.c:5011
+#: ../libpurple/protocols/sametime/sametime.c:5057
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -10197,63 +10545,63 @@
 "Erro ao ler arquivo %s: \n"
 "%s\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5146
+#: ../libpurple/protocols/sametime/sametime.c:5192
 msgid "Remotely Stored Buddy List"
 msgstr "Lista de amigos armazenada remotamente"
 
-#: ../libpurple/protocols/sametime/sametime.c:5151
+#: ../libpurple/protocols/sametime/sametime.c:5197
 msgid "Buddy List Storage Mode"
 msgstr "Modo de armazenamento da lista de amigos"
 
-#: ../libpurple/protocols/sametime/sametime.c:5154
+#: ../libpurple/protocols/sametime/sametime.c:5200
 msgid "Local Buddy List Only"
 msgstr "Apenas lista de amigos local"
 
-#: ../libpurple/protocols/sametime/sametime.c:5156
+#: ../libpurple/protocols/sametime/sametime.c:5202
 msgid "Merge List from Server"
 msgstr "Mesclar lista do servidor"
 
-#: ../libpurple/protocols/sametime/sametime.c:5158
+#: ../libpurple/protocols/sametime/sametime.c:5204
 msgid "Merge and Save List to Server"
 msgstr "Mesclar e salvar lista do servidor"
 
-#: ../libpurple/protocols/sametime/sametime.c:5160
+#: ../libpurple/protocols/sametime/sametime.c:5206
 msgid "Synchronize List with Server"
 msgstr "Sincronizar lista com o servidor"
 
-#: ../libpurple/protocols/sametime/sametime.c:5215
+#: ../libpurple/protocols/sametime/sametime.c:5261
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Importar lista do Sametime da conta %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5255
+#: ../libpurple/protocols/sametime/sametime.c:5301
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Exportar lista do Sametime da conta %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5309
+#: ../libpurple/protocols/sametime/sametime.c:5355
 msgid "Unable to add group: group exists"
 msgstr "Não foi possível adicionar grupo: o grupo existe"
 
-#: ../libpurple/protocols/sametime/sametime.c:5310
+#: ../libpurple/protocols/sametime/sametime.c:5356
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "Um grupo com o nome '%s' já existe na sua lista de amigos."
 
-#: ../libpurple/protocols/sametime/sametime.c:5313
-#: ../libpurple/protocols/sametime/sametime.c:5443
+#: ../libpurple/protocols/sametime/sametime.c:5359
+#: ../libpurple/protocols/sametime/sametime.c:5489
 msgid "Unable to add group"
 msgstr "Não foi possível adicionar grupo"
 
-#: ../libpurple/protocols/sametime/sametime.c:5372
+#: ../libpurple/protocols/sametime/sametime.c:5418
 msgid "Possible Matches"
 msgstr "Possíveis resultados"
 
-#: ../libpurple/protocols/sametime/sametime.c:5388
+#: ../libpurple/protocols/sametime/sametime.c:5434
 msgid "Notes Address Book group results"
 msgstr "Resultados dos grupos do catálogo de endereços do Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:5389
+#: ../libpurple/protocols/sametime/sametime.c:5435
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -10264,15 +10612,15 @@
 "endereços do Notes a seguir. Favor selecionar o grupo correto da lista "
 "abaixo para adicioná-lo à sua lista de amigos."
 
-#: ../libpurple/protocols/sametime/sametime.c:5394
+#: ../libpurple/protocols/sametime/sametime.c:5440
 msgid "Select Notes Address Book"
 msgstr "Selecionar catálogo de endereços do Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:5437
+#: ../libpurple/protocols/sametime/sametime.c:5483
 msgid "Unable to add group: group not found"
 msgstr "Não foi possível adicionar grupo: grupo não encontrado"
 
-#: ../libpurple/protocols/sametime/sametime.c:5439
+#: ../libpurple/protocols/sametime/sametime.c:5485
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
@@ -10281,11 +10629,11 @@
 "O identificador '%s' não corresponde a nenhum grupo do catálogo de endereços "
 "Notes da sua comunidade Sametime."
 
-#: ../libpurple/protocols/sametime/sametime.c:5480
+#: ../libpurple/protocols/sametime/sametime.c:5526
 msgid "Notes Address Book Group"
 msgstr "Grupo do catálogo de endereços Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:5481
+#: ../libpurple/protocols/sametime/sametime.c:5527
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
@@ -10293,12 +10641,12 @@
 "Digite o nome de um grupo do catálogo de endereços do Notes no campo abaixo "
 "para adicionar o grupo e seus membros à sua lista de contatos."
 
-#: ../libpurple/protocols/sametime/sametime.c:5530
+#: ../libpurple/protocols/sametime/sametime.c:5576
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Resultados da busca por '%s'"
 
-#: ../libpurple/protocols/sametime/sametime.c:5531
+#: ../libpurple/protocols/sametime/sametime.c:5577
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -10309,30 +10657,30 @@
 "Você pode adicioná-los à lista de amigos ou enviá-los mensagens com os "
 "botões de ação abaixo."
 
-#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:756
+#: ../libpurple/protocols/sametime/sametime.c:5584 ../pidgin/gtknotify.c:763
 msgid "Search Results"
 msgstr "Resultados da procura"
 
-#: ../libpurple/protocols/sametime/sametime.c:5563
+#: ../libpurple/protocols/sametime/sametime.c:5609
 msgid "No matches"
 msgstr "Nenhum resultado"
 
-#: ../libpurple/protocols/sametime/sametime.c:5564
+#: ../libpurple/protocols/sametime/sametime.c:5610
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr ""
 "O identificador '%s' não corresponde a nenhum usuário da sua comunidade "
 "Sametime."
 
-#: ../libpurple/protocols/sametime/sametime.c:5568
+#: ../libpurple/protocols/sametime/sametime.c:5614
 msgid "No Matches"
 msgstr "Nenhum resultado"
 
-#: ../libpurple/protocols/sametime/sametime.c:5605
+#: ../libpurple/protocols/sametime/sametime.c:5651
 msgid "Search for a user"
 msgstr "Procurar por um usuário"
 
-#: ../libpurple/protocols/sametime/sametime.c:5606
+#: ../libpurple/protocols/sametime/sametime.c:5652
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
@@ -10340,32 +10688,32 @@
 "Digite um nome o ID parcial no campo abaixo para procurar por usuários "
 "correspondentes na sua comunidade do Sametime."
 
-#: ../libpurple/protocols/sametime/sametime.c:5609
+#: ../libpurple/protocols/sametime/sametime.c:5655
 msgid "User Search"
 msgstr "Procurar por usuário"
 
-#: ../libpurple/protocols/sametime/sametime.c:5622
+#: ../libpurple/protocols/sametime/sametime.c:5668
 msgid "Import Sametime List..."
 msgstr "Importar lista do Sametime..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5626
+#: ../libpurple/protocols/sametime/sametime.c:5672
 msgid "Export Sametime List..."
 msgstr "Exportar lista do Sametime..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5630
+#: ../libpurple/protocols/sametime/sametime.c:5676
 msgid "Add Notes Address Book Group..."
 msgstr "Adicionar grupo do catálogo de endereços do Notes..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5634
+#: ../libpurple/protocols/sametime/sametime.c:5680
 msgid "User Search..."
 msgstr "Busca por usuários..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5740
+#: ../libpurple/protocols/sametime/sametime.c:5786
 msgid "Force login (ignore server redirects)"
 msgstr "Forçar conexão (ignorar redirecionamentos do servidor)"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5750
+#: ../libpurple/protocols/sametime/sametime.c:5796
 msgid "Hide client identity"
 msgstr "Esconder identidade do cliente"
 
@@ -10496,8 +10844,8 @@
 #: ../libpurple/protocols/silc/buddy.c:496
 #: ../libpurple/protocols/silc/buddy.c:507
 #: ../libpurple/protocols/silc/buddy.c:540
-#: ../libpurple/protocols/silc/ops.c:1499
-#: ../libpurple/protocols/silc/ops.c:1510
+#: ../libpurple/protocols/silc/ops.c:1503
+#: ../libpurple/protocols/silc/ops.c:1514
 #: ../libpurple/protocols/silc10/buddy.c:513
 #: ../libpurple/protocols/silc10/buddy.c:548
 #: ../libpurple/protocols/silc10/ops.c:1494
@@ -10506,8 +10854,8 @@
 msgstr "Obter chave pública"
 
 #: ../libpurple/protocols/silc/buddy.c:541
-#: ../libpurple/protocols/silc/ops.c:1500
-#: ../libpurple/protocols/silc/ops.c:1511
+#: ../libpurple/protocols/silc/ops.c:1504
+#: ../libpurple/protocols/silc/ops.c:1515
 #: ../libpurple/protocols/silc10/buddy.c:549
 #: ../libpurple/protocols/silc10/ops.c:1495
 #: ../libpurple/protocols/silc10/ops.c:1506
@@ -10515,17 +10863,17 @@
 msgstr "Não foi possível obter chave pública"
 
 #: ../libpurple/protocols/silc/buddy.c:622
-#: ../libpurple/protocols/silc/buddy.c:1655
+#: ../libpurple/protocols/silc/buddy.c:1658
 #: ../libpurple/protocols/silc10/buddy.c:635
-#: ../libpurple/protocols/silc10/buddy.c:1654
+#: ../libpurple/protocols/silc10/buddy.c:1657
 msgid "Show Public Key"
 msgstr "Exibir chave pública"
 
 #: ../libpurple/protocols/silc/buddy.c:623
-#: ../libpurple/protocols/silc/buddy.c:1027
-#: ../libpurple/protocols/silc/chat.c:237
+#: ../libpurple/protocols/silc/buddy.c:1030
+#: ../libpurple/protocols/silc/chat.c:239
 #: ../libpurple/protocols/silc10/buddy.c:636
-#: ../libpurple/protocols/silc10/buddy.c:1033
+#: ../libpurple/protocols/silc10/buddy.c:1036
 #: ../libpurple/protocols/silc10/chat.c:237
 msgid "Could not load public key"
 msgstr "Não foi possível carregar chave pública"
@@ -10533,9 +10881,9 @@
 #: ../libpurple/protocols/silc/buddy.c:701
 #: ../libpurple/protocols/silc/ops.c:1053
 #: ../libpurple/protocols/silc/ops.c:1168
-#: ../libpurple/protocols/silc/ops.c:1288
-#: ../libpurple/protocols/silc/ops.c:1289
-#: ../libpurple/protocols/silc/ops.c:1307
+#: ../libpurple/protocols/silc/ops.c:1290
+#: ../libpurple/protocols/silc/ops.c:1291
+#: ../libpurple/protocols/silc/ops.c:1309
 #: ../libpurple/protocols/silc10/buddy.c:713
 #: ../libpurple/protocols/silc10/ops.c:1087
 #: ../libpurple/protocols/silc10/ops.c:1159
@@ -10547,7 +10895,7 @@
 
 #: ../libpurple/protocols/silc/buddy.c:702
 #: ../libpurple/protocols/silc/ops.c:1169
-#: ../libpurple/protocols/silc/ops.c:1308
+#: ../libpurple/protocols/silc/ops.c:1310
 #: ../libpurple/protocols/silc10/buddy.c:714
 #: ../libpurple/protocols/silc10/ops.c:1160
 #: ../libpurple/protocols/silc10/ops.c:1314
@@ -10570,19 +10918,19 @@
 "deste. Você pode usar o comando Obter Chave Pública para fazê-lo."
 
 #. Open file selector to select the public key.
-#: ../libpurple/protocols/silc/buddy.c:1059
-#: ../libpurple/protocols/silc10/buddy.c:1067
+#: ../libpurple/protocols/silc/buddy.c:1062
+#: ../libpurple/protocols/silc10/buddy.c:1070
 msgid "Open..."
 msgstr "Abrir..."
 
-#: ../libpurple/protocols/silc/buddy.c:1070
-#: ../libpurple/protocols/silc10/buddy.c:1078
+#: ../libpurple/protocols/silc/buddy.c:1073
+#: ../libpurple/protocols/silc10/buddy.c:1081
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "O amigo %s não está presente na rede"
 
-#: ../libpurple/protocols/silc/buddy.c:1073
-#: ../libpurple/protocols/silc10/buddy.c:1081
+#: ../libpurple/protocols/silc/buddy.c:1076
+#: ../libpurple/protocols/silc10/buddy.c:1084
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
@@ -10590,18 +10938,18 @@
 "Para adicionar um amigo você precisa importar a chave pública desde. "
 "Pressione importar para importar uma chave pública."
 
-#: ../libpurple/protocols/silc/buddy.c:1077
-#: ../libpurple/protocols/silc10/buddy.c:1085
+#: ../libpurple/protocols/silc/buddy.c:1080
+#: ../libpurple/protocols/silc10/buddy.c:1088
 msgid "_Import..."
 msgstr "_Importar..."
 
-#: ../libpurple/protocols/silc/buddy.c:1183
-#: ../libpurple/protocols/silc10/buddy.c:1181
+#: ../libpurple/protocols/silc/buddy.c:1186
+#: ../libpurple/protocols/silc10/buddy.c:1184
 msgid "Select correct user"
 msgstr "Selecione o usuário correto"
 
-#: ../libpurple/protocols/silc/buddy.c:1185
-#: ../libpurple/protocols/silc10/buddy.c:1183
+#: ../libpurple/protocols/silc/buddy.c:1188
+#: ../libpurple/protocols/silc10/buddy.c:1186
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
@@ -10609,8 +10957,8 @@
 "Mais de um usuário foi encontrado com a mesma chave pública. Selecione o "
 "usuário correto da lista para adicioná-lo à sua lista de amigos."
 
-#: ../libpurple/protocols/silc/buddy.c:1187
-#: ../libpurple/protocols/silc10/buddy.c:1185
+#: ../libpurple/protocols/silc/buddy.c:1190
+#: ../libpurple/protocols/silc10/buddy.c:1188
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
@@ -10618,208 +10966,208 @@
 "Mais de um usuário foi encontrado com o mesmo nome. Selecione o usuário "
 "correto da lista para adicioná-lo à sua lista de amigos."
 
-#: ../libpurple/protocols/silc/buddy.c:1474
-#: ../libpurple/protocols/silc10/buddy.c:1474
+#: ../libpurple/protocols/silc/buddy.c:1477
+#: ../libpurple/protocols/silc10/buddy.c:1477
 msgid "Detached"
 msgstr "Desconectado, mas na rede"
 
-#: ../libpurple/protocols/silc/buddy.c:1478
+#: ../libpurple/protocols/silc/buddy.c:1481
 #: ../libpurple/protocols/silc/silc.c:58
-#: ../libpurple/protocols/silc10/buddy.c:1478
+#: ../libpurple/protocols/silc10/buddy.c:1481
 #: ../libpurple/protocols/silc10/silc.c:49
 msgid "Indisposed"
 msgstr "Indisposto"
 
-#: ../libpurple/protocols/silc/buddy.c:1482
+#: ../libpurple/protocols/silc/buddy.c:1485
 #: ../libpurple/protocols/silc/silc.c:60
-#: ../libpurple/protocols/silc10/buddy.c:1482
+#: ../libpurple/protocols/silc10/buddy.c:1485
 #: ../libpurple/protocols/silc10/silc.c:51
 msgid "Wake Me Up"
 msgstr "Me acorde"
 
-#: ../libpurple/protocols/silc/buddy.c:1484
+#: ../libpurple/protocols/silc/buddy.c:1487
 #: ../libpurple/protocols/silc/silc.c:52
-#: ../libpurple/protocols/silc10/buddy.c:1484
+#: ../libpurple/protocols/silc10/buddy.c:1487
 #: ../libpurple/protocols/silc10/silc.c:43
 msgid "Hyper Active"
 msgstr "Hiperativo"
 
-#: ../libpurple/protocols/silc/buddy.c:1486
-#: ../libpurple/protocols/silc10/buddy.c:1486
+#: ../libpurple/protocols/silc/buddy.c:1489
+#: ../libpurple/protocols/silc10/buddy.c:1489
 msgid "Robot"
 msgstr "Robô"
 
-#: ../libpurple/protocols/silc/buddy.c:1493
-#: ../libpurple/protocols/silc/silc.c:743
-#: ../libpurple/protocols/silc/util.c:516
-#: ../libpurple/protocols/silc10/buddy.c:1493
+#: ../libpurple/protocols/silc/buddy.c:1496
+#: ../libpurple/protocols/silc/silc.c:886
+#: ../libpurple/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc10/buddy.c:1496
 #: ../libpurple/protocols/silc10/silc.c:654
 #: ../libpurple/protocols/silc10/util.c:512
 msgid "Happy"
 msgstr "Feliz"
 
-#: ../libpurple/protocols/silc/buddy.c:1495
-#: ../libpurple/protocols/silc/silc.c:745
-#: ../libpurple/protocols/silc/util.c:518
-#: ../libpurple/protocols/silc10/buddy.c:1495
+#: ../libpurple/protocols/silc/buddy.c:1498
+#: ../libpurple/protocols/silc/silc.c:888
+#: ../libpurple/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc10/buddy.c:1498
 #: ../libpurple/protocols/silc10/silc.c:656
 #: ../libpurple/protocols/silc10/util.c:514
 msgid "Sad"
 msgstr "Triste"
 
-#: ../libpurple/protocols/silc/buddy.c:1497
-#: ../libpurple/protocols/silc/silc.c:747
-#: ../libpurple/protocols/silc/util.c:520
-#: ../libpurple/protocols/silc10/buddy.c:1497
+#: ../libpurple/protocols/silc/buddy.c:1500
+#: ../libpurple/protocols/silc/silc.c:890
+#: ../libpurple/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc10/buddy.c:1500
 #: ../libpurple/protocols/silc10/silc.c:658
 #: ../libpurple/protocols/silc10/util.c:516
 msgid "Angry"
 msgstr "Furioso"
 
-#: ../libpurple/protocols/silc/buddy.c:1499
-#: ../libpurple/protocols/silc/silc.c:749
-#: ../libpurple/protocols/silc/util.c:522
-#: ../libpurple/protocols/silc10/buddy.c:1499
+#: ../libpurple/protocols/silc/buddy.c:1502
+#: ../libpurple/protocols/silc/silc.c:892
+#: ../libpurple/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc10/buddy.c:1502
 #: ../libpurple/protocols/silc10/silc.c:660
 #: ../libpurple/protocols/silc10/util.c:518
 msgid "Jealous"
 msgstr "Enciumado"
 
-#: ../libpurple/protocols/silc/buddy.c:1501
-#: ../libpurple/protocols/silc/silc.c:751
-#: ../libpurple/protocols/silc/util.c:524
-#: ../libpurple/protocols/silc10/buddy.c:1501
+#: ../libpurple/protocols/silc/buddy.c:1504
+#: ../libpurple/protocols/silc/silc.c:894
+#: ../libpurple/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc10/buddy.c:1504
 #: ../libpurple/protocols/silc10/silc.c:662
 #: ../libpurple/protocols/silc10/util.c:520
 msgid "Ashamed"
 msgstr "Envergonhado"
 
-#: ../libpurple/protocols/silc/buddy.c:1503
-#: ../libpurple/protocols/silc/silc.c:753
-#: ../libpurple/protocols/silc/util.c:526
-#: ../libpurple/protocols/silc10/buddy.c:1503
+#: ../libpurple/protocols/silc/buddy.c:1506
+#: ../libpurple/protocols/silc/silc.c:896
+#: ../libpurple/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc10/buddy.c:1506
 #: ../libpurple/protocols/silc10/silc.c:664
 #: ../libpurple/protocols/silc10/util.c:522
 msgid "Invincible"
 msgstr "Invencível"
 
-#: ../libpurple/protocols/silc/buddy.c:1505
-#: ../libpurple/protocols/silc/util.c:528
-#: ../libpurple/protocols/silc10/buddy.c:1505
+#: ../libpurple/protocols/silc/buddy.c:1508
+#: ../libpurple/protocols/silc/util.c:534
+#: ../libpurple/protocols/silc10/buddy.c:1508
 #: ../libpurple/protocols/silc10/util.c:524
 msgid "In Love"
 msgstr "Apaixonado"
 
-#: ../libpurple/protocols/silc/buddy.c:1507
-#: ../libpurple/protocols/silc/silc.c:757
-#: ../libpurple/protocols/silc/util.c:530
-#: ../libpurple/protocols/silc10/buddy.c:1507
+#: ../libpurple/protocols/silc/buddy.c:1510
+#: ../libpurple/protocols/silc/silc.c:900
+#: ../libpurple/protocols/silc/util.c:536
+#: ../libpurple/protocols/silc10/buddy.c:1510
 #: ../libpurple/protocols/silc10/silc.c:668
 #: ../libpurple/protocols/silc10/util.c:526
 msgid "Sleepy"
 msgstr "Sonolento"
 
-#: ../libpurple/protocols/silc/buddy.c:1509
-#: ../libpurple/protocols/silc/silc.c:759
-#: ../libpurple/protocols/silc/util.c:532
-#: ../libpurple/protocols/silc10/buddy.c:1509
+#: ../libpurple/protocols/silc/buddy.c:1512
+#: ../libpurple/protocols/silc/silc.c:902
+#: ../libpurple/protocols/silc/util.c:538
+#: ../libpurple/protocols/silc10/buddy.c:1512
 #: ../libpurple/protocols/silc10/silc.c:670
 #: ../libpurple/protocols/silc10/util.c:528
 msgid "Bored"
 msgstr "Chateado"
 
-#: ../libpurple/protocols/silc/buddy.c:1511
-#: ../libpurple/protocols/silc/silc.c:761
-#: ../libpurple/protocols/silc/util.c:534
-#: ../libpurple/protocols/silc10/buddy.c:1511
+#: ../libpurple/protocols/silc/buddy.c:1514
+#: ../libpurple/protocols/silc/silc.c:904
+#: ../libpurple/protocols/silc/util.c:540
+#: ../libpurple/protocols/silc10/buddy.c:1514
 #: ../libpurple/protocols/silc10/silc.c:672
 #: ../libpurple/protocols/silc10/util.c:530
 msgid "Excited"
 msgstr "Empolgado"
 
-#: ../libpurple/protocols/silc/buddy.c:1513
-#: ../libpurple/protocols/silc/silc.c:763
-#: ../libpurple/protocols/silc/util.c:536
-#: ../libpurple/protocols/silc10/buddy.c:1513
+#: ../libpurple/protocols/silc/buddy.c:1516
+#: ../libpurple/protocols/silc/silc.c:906
+#: ../libpurple/protocols/silc/util.c:542
+#: ../libpurple/protocols/silc10/buddy.c:1516
 #: ../libpurple/protocols/silc10/silc.c:674
 #: ../libpurple/protocols/silc10/util.c:532
 msgid "Anxious"
 msgstr "Ansioso"
 
-#: ../libpurple/protocols/silc/buddy.c:1545
+#: ../libpurple/protocols/silc/buddy.c:1548
 #: ../libpurple/protocols/silc/ops.c:1207
-#: ../libpurple/protocols/silc10/buddy.c:1545
+#: ../libpurple/protocols/silc10/buddy.c:1548
 #: ../libpurple/protocols/silc10/ops.c:1202
 msgid "User Modes"
 msgstr "Modos do usuário"
 
-#: ../libpurple/protocols/silc/buddy.c:1562
+#: ../libpurple/protocols/silc/buddy.c:1565
 #: ../libpurple/protocols/silc/ops.c:1224
-#: ../libpurple/protocols/silc10/buddy.c:1562
+#: ../libpurple/protocols/silc10/buddy.c:1565
 #: ../libpurple/protocols/silc10/ops.c:1219
 msgid "Preferred Contact"
 msgstr "Remover contato"
 
-#: ../libpurple/protocols/silc/buddy.c:1567
+#: ../libpurple/protocols/silc/buddy.c:1570
 #: ../libpurple/protocols/silc/ops.c:1229
-#: ../libpurple/protocols/silc10/buddy.c:1567
+#: ../libpurple/protocols/silc10/buddy.c:1570
 #: ../libpurple/protocols/silc10/ops.c:1224
 msgid "Preferred Language"
 msgstr "Linguagem preferida"
 
-#: ../libpurple/protocols/silc/buddy.c:1572
+#: ../libpurple/protocols/silc/buddy.c:1575
 #: ../libpurple/protocols/silc/ops.c:1234
-#: ../libpurple/protocols/silc10/buddy.c:1572
+#: ../libpurple/protocols/silc10/buddy.c:1575
 #: ../libpurple/protocols/silc10/ops.c:1229
 msgid "Device"
 msgstr "Dispositivo"
 
-#: ../libpurple/protocols/silc/buddy.c:1577
+#: ../libpurple/protocols/silc/buddy.c:1580
 #: ../libpurple/protocols/silc/ops.c:1239
-#: ../libpurple/protocols/silc10/buddy.c:1577
+#: ../libpurple/protocols/silc10/buddy.c:1580
 #: ../libpurple/protocols/silc10/ops.c:1234
 #: ../libpurple/protocols/silc10/silc.c:722
 #: ../libpurple/protocols/silc10/silc.c:724
 msgid "Timezone"
 msgstr "Fuso horário"
 
-#: ../libpurple/protocols/silc/buddy.c:1582
+#: ../libpurple/protocols/silc/buddy.c:1585
 #: ../libpurple/protocols/silc/ops.c:1244
-#: ../libpurple/protocols/silc10/buddy.c:1582
+#: ../libpurple/protocols/silc10/buddy.c:1585
 #: ../libpurple/protocols/silc10/ops.c:1239
 msgid "Geolocation"
 msgstr "Localização geográfica"
 
-#: ../libpurple/protocols/silc/buddy.c:1638
-#: ../libpurple/protocols/silc10/buddy.c:1636
+#: ../libpurple/protocols/silc/buddy.c:1641
+#: ../libpurple/protocols/silc10/buddy.c:1639
 msgid "Reset IM Key"
 msgstr "Redefinir chave de mensagens instantâneas"
 
-#: ../libpurple/protocols/silc/buddy.c:1643
-#: ../libpurple/protocols/silc10/buddy.c:1642
+#: ../libpurple/protocols/silc/buddy.c:1646
+#: ../libpurple/protocols/silc10/buddy.c:1645
 msgid "IM with Key Exchange"
 msgstr "Mensagem instantânea com troca de chaves"
 
-#: ../libpurple/protocols/silc/buddy.c:1648
-#: ../libpurple/protocols/silc10/buddy.c:1647
+#: ../libpurple/protocols/silc/buddy.c:1651
+#: ../libpurple/protocols/silc10/buddy.c:1650
 msgid "IM with Password"
 msgstr "Mensagem instantânea com senha"
 
-#: ../libpurple/protocols/silc/buddy.c:1661
-#: ../libpurple/protocols/silc10/buddy.c:1660
+#: ../libpurple/protocols/silc/buddy.c:1664
+#: ../libpurple/protocols/silc10/buddy.c:1663
 msgid "Get Public Key..."
 msgstr "Obter chave pública..."
 
-#: ../libpurple/protocols/silc/buddy.c:1668
-#: ../libpurple/protocols/silc/ops.c:1608
-#: ../libpurple/protocols/silc10/buddy.c:1667
+#: ../libpurple/protocols/silc/buddy.c:1671
+#: ../libpurple/protocols/silc/ops.c:1612
+#: ../libpurple/protocols/silc10/buddy.c:1670
 #: ../libpurple/protocols/silc10/ops.c:1624
 msgid "Kill User"
 msgstr "Expulsar usuário do servidor"
 
-#: ../libpurple/protocols/silc/buddy.c:1678
-#: ../libpurple/protocols/silc/chat.c:993
-#: ../libpurple/protocols/silc10/buddy.c:1677
+#: ../libpurple/protocols/silc/buddy.c:1681
+#: ../libpurple/protocols/silc/chat.c:997
+#: ../libpurple/protocols/silc10/buddy.c:1680
 #: ../libpurple/protocols/silc10/chat.c:977
 msgid "Draw On Whiteboard"
 msgstr "Desenhar no quadro de atividades"
@@ -10836,7 +11184,7 @@
 msgstr "O canal %s não existe na rede"
 
 #: ../libpurple/protocols/silc/chat.c:81
-#: ../libpurple/protocols/silc/chat.c:175
+#: ../libpurple/protocols/silc/chat.c:177
 #: ../libpurple/protocols/silc10/chat.c:81
 #: ../libpurple/protocols/silc10/chat.c:174
 msgid "Channel Information"
@@ -10890,40 +11238,40 @@
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Modos do canal:</b> "
 
-#: ../libpurple/protocols/silc/chat.c:166
+#: ../libpurple/protocols/silc/chat.c:167
 #: ../libpurple/protocols/silc10/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>Impressão digital da chave do fundador:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:167
+#: ../libpurple/protocols/silc/chat.c:168
 #: ../libpurple/protocols/silc10/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>Impressão digital legível da chave do fundador:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:236
+#: ../libpurple/protocols/silc/chat.c:238
 #: ../libpurple/protocols/silc10/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "Adicionar chave pública do canal"
 
 #. Add new public key
-#: ../libpurple/protocols/silc/chat.c:304
+#: ../libpurple/protocols/silc/chat.c:306
 #: ../libpurple/protocols/silc10/chat.c:291
 msgid "Open Public Key..."
 msgstr "Abrir chave pública..."
 
-#: ../libpurple/protocols/silc/chat.c:423
+#: ../libpurple/protocols/silc/chat.c:425
 #: ../libpurple/protocols/silc10/chat.c:401
 msgid "Channel Passphrase"
 msgstr "Frase-senha do canal"
 
-#: ../libpurple/protocols/silc/chat.c:430
+#: ../libpurple/protocols/silc/chat.c:432
 #: ../libpurple/protocols/silc10/chat.c:408
 msgid "Channel Public Keys List"
 msgstr "Lista de chaves públicas do canal"
 
-#: ../libpurple/protocols/silc/chat.c:435
+#: ../libpurple/protocols/silc/chat.c:437
 #: ../libpurple/protocols/silc10/chat.c:413
 #, c-format
 msgid ""
@@ -10940,11 +11288,11 @@
 "apenas usuários cujas chaves públicas estiverem listadas podem entrar no "
 "canal."
 
-#: ../libpurple/protocols/silc/chat.c:444
-#: ../libpurple/protocols/silc/chat.c:445
-#: ../libpurple/protocols/silc/chat.c:479
-#: ../libpurple/protocols/silc/chat.c:480
-#: ../libpurple/protocols/silc/chat.c:927
+#: ../libpurple/protocols/silc/chat.c:446
+#: ../libpurple/protocols/silc/chat.c:447
+#: ../libpurple/protocols/silc/chat.c:483
+#: ../libpurple/protocols/silc/chat.c:484
+#: ../libpurple/protocols/silc/chat.c:931
 #: ../libpurple/protocols/silc10/chat.c:422
 #: ../libpurple/protocols/silc10/chat.c:423
 #: ../libpurple/protocols/silc10/chat.c:461
@@ -10953,145 +11301,145 @@
 msgid "Channel Authentication"
 msgstr "Autenticação do canal"
 
-#: ../libpurple/protocols/silc/chat.c:446
-#: ../libpurple/protocols/silc/chat.c:481
+#: ../libpurple/protocols/silc/chat.c:448
+#: ../libpurple/protocols/silc/chat.c:485
 #: ../libpurple/protocols/silc10/chat.c:424
 #: ../libpurple/protocols/silc10/chat.c:463
 msgid "Add / Remove"
 msgstr "Adicionar/remover"
 
-#: ../libpurple/protocols/silc/chat.c:597
+#: ../libpurple/protocols/silc/chat.c:601
 #: ../libpurple/protocols/silc10/chat.c:581
 msgid "Group Name"
 msgstr "nome do grupo"
 
-#: ../libpurple/protocols/silc/chat.c:601
-#: ../libpurple/protocols/silc/ops.c:1813
-#: ../libpurple/protocols/silc/silc.c:1020
+#: ../libpurple/protocols/silc/chat.c:605
+#: ../libpurple/protocols/silc/ops.c:1817
+#: ../libpurple/protocols/silc/silc.c:1163
 #: ../libpurple/protocols/silc10/chat.c:585
 #: ../libpurple/protocols/silc10/ops.c:1901
 #: ../libpurple/protocols/silc10/silc.c:931
 msgid "Passphrase"
 msgstr "Frase-senha"
 
-#: ../libpurple/protocols/silc/chat.c:612
+#: ../libpurple/protocols/silc/chat.c:616
 #: ../libpurple/protocols/silc10/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "Por favor digite o nome do grupo privado do canal %s e a frase-senha."
 
-#: ../libpurple/protocols/silc/chat.c:614
+#: ../libpurple/protocols/silc/chat.c:618
 #: ../libpurple/protocols/silc10/chat.c:598
 msgid "Add Channel Private Group"
 msgstr "Adicionar grupo privado no canal"
 
-#: ../libpurple/protocols/silc/chat.c:742
+#: ../libpurple/protocols/silc/chat.c:746
 #: ../libpurple/protocols/silc10/chat.c:726
 msgid "User Limit"
 msgstr "Lista de usuários"
 
-#: ../libpurple/protocols/silc/chat.c:743
+#: ../libpurple/protocols/silc/chat.c:747
 #: ../libpurple/protocols/silc10/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 "Defina o limite de usuários do canal. Defina para zero para redefinir o "
 "limite de usuários."
 
-#: ../libpurple/protocols/silc/chat.c:907
+#: ../libpurple/protocols/silc/chat.c:911
 #: ../libpurple/protocols/silc10/chat.c:891
 msgid "Invite List"
 msgstr "Lista de convidados"
 
-#: ../libpurple/protocols/silc/chat.c:912
+#: ../libpurple/protocols/silc/chat.c:916
 #: ../libpurple/protocols/silc10/chat.c:896
 msgid "Ban List"
 msgstr "Lista de banidos"
 
-#: ../libpurple/protocols/silc/chat.c:920
+#: ../libpurple/protocols/silc/chat.c:924
 #: ../libpurple/protocols/silc10/chat.c:904
 msgid "Add Private Group"
 msgstr "Adicionar grupo privado"
 
-#: ../libpurple/protocols/silc/chat.c:933
+#: ../libpurple/protocols/silc/chat.c:937
 #: ../libpurple/protocols/silc10/chat.c:917
 msgid "Reset Permanent"
 msgstr "Redefinir permanente"
 
-#: ../libpurple/protocols/silc/chat.c:938
+#: ../libpurple/protocols/silc/chat.c:942
 #: ../libpurple/protocols/silc10/chat.c:922
 msgid "Set Permanent"
 msgstr "Definir permanente"
 
-#: ../libpurple/protocols/silc/chat.c:946
+#: ../libpurple/protocols/silc/chat.c:950
 #: ../libpurple/protocols/silc10/chat.c:930
 msgid "Set User Limit"
 msgstr "Definir limite de usuários"
 
-#: ../libpurple/protocols/silc/chat.c:952
+#: ../libpurple/protocols/silc/chat.c:956
 #: ../libpurple/protocols/silc10/chat.c:936
 msgid "Reset Topic Restriction"
 msgstr "Redefinir restrição de tópico"
 
-#: ../libpurple/protocols/silc/chat.c:957
+#: ../libpurple/protocols/silc/chat.c:961
 #: ../libpurple/protocols/silc10/chat.c:941
 msgid "Set Topic Restriction"
 msgstr "Definir restrição de tópico"
 
-#: ../libpurple/protocols/silc/chat.c:964
+#: ../libpurple/protocols/silc/chat.c:968
 #: ../libpurple/protocols/silc10/chat.c:948
 msgid "Reset Private Channel"
 msgstr "Redefinir canal privado"
 
-#: ../libpurple/protocols/silc/chat.c:969
+#: ../libpurple/protocols/silc/chat.c:973
 #: ../libpurple/protocols/silc10/chat.c:953
 msgid "Set Private Channel"
 msgstr "Definir canal privado"
 
-#: ../libpurple/protocols/silc/chat.c:976
+#: ../libpurple/protocols/silc/chat.c:980
 #: ../libpurple/protocols/silc10/chat.c:960
 msgid "Reset Secret Channel"
 msgstr "Redefinir canal secreto"
 
-#: ../libpurple/protocols/silc/chat.c:981
+#: ../libpurple/protocols/silc/chat.c:985
 #: ../libpurple/protocols/silc10/chat.c:965
 msgid "Set Secret Channel"
 msgstr "Definir canal secreto"
 
-#: ../libpurple/protocols/silc/chat.c:1045
+#: ../libpurple/protocols/silc/chat.c:1046
 #: ../libpurple/protocols/silc10/chat.c:1102
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr "Você tem que entrar no canal %s antes de poder entrar no grupo privado"
 
-#: ../libpurple/protocols/silc/chat.c:1047
+#: ../libpurple/protocols/silc/chat.c:1048
 #: ../libpurple/protocols/silc10/chat.c:1104
 msgid "Join Private Group"
 msgstr "Entrar em grupo privado"
 
-#: ../libpurple/protocols/silc/chat.c:1048
+#: ../libpurple/protocols/silc/chat.c:1049
 #: ../libpurple/protocols/silc10/chat.c:1105
 msgid "Cannot join private group"
 msgstr "Não foi possível entrar em grupo privado"
 
-#: ../libpurple/protocols/silc/chat.c:1260
-#: ../libpurple/protocols/silc/silc.c:1217
+#: ../libpurple/protocols/silc/chat.c:1245
+#: ../libpurple/protocols/silc/silc.c:1360
 #: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1137
+#: ../libpurple/protocols/silc10/silc.c:1140
 msgid "Call Command"
 msgstr "Chamar comando"
 
-#: ../libpurple/protocols/silc/chat.c:1260
-#: ../libpurple/protocols/silc/silc.c:1218
+#: ../libpurple/protocols/silc/chat.c:1245
+#: ../libpurple/protocols/silc/silc.c:1361
 #: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1137
+#: ../libpurple/protocols/silc10/silc.c:1140
 msgid "Cannot call command"
 msgstr "Não foi possível chamar comando"
 
-#: ../libpurple/protocols/silc/chat.c:1261
-#: ../libpurple/protocols/silc/silc.c:1219
+#: ../libpurple/protocols/silc/chat.c:1246
+#: ../libpurple/protocols/silc/silc.c:1362
 #: ../libpurple/protocols/silc10/chat.c:1300
-#: ../libpurple/protocols/silc10/silc.c:1138
+#: ../libpurple/protocols/silc10/silc.c:1141
 msgid "Unknown command"
 msgstr "Comando desconhecido"
 
@@ -11249,7 +11597,7 @@
 msgstr "Função de trabalho"
 
 #: ../libpurple/protocols/silc/ops.c:1018
-#: ../libpurple/protocols/silc/silc.c:1013
+#: ../libpurple/protocols/silc/silc.c:1156
 #: ../libpurple/protocols/silc10/ops.c:1052
 #: ../libpurple/protocols/silc10/silc.c:924
 msgid "Organization"
@@ -11283,7 +11631,7 @@
 msgstr "O fundador do canal em <I>%s</I> é <I>%s</I>"
 
 #: ../libpurple/protocols/silc/ops.c:1190
-#: ../libpurple/protocols/silc/ops.c:1326
+#: ../libpurple/protocols/silc/ops.c:1328
 #: ../libpurple/protocols/silc10/ops.c:1183
 #: ../libpurple/protocols/silc10/ops.c:1332
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1071
@@ -11295,90 +11643,90 @@
 msgid "Status Text"
 msgstr "Texto de status"
 
-#: ../libpurple/protocols/silc/ops.c:1279
-#: ../libpurple/protocols/silc/ops.c:1351
+#: ../libpurple/protocols/silc/ops.c:1280
+#: ../libpurple/protocols/silc/ops.c:1354
 #: ../libpurple/protocols/silc10/ops.c:1285
 #: ../libpurple/protocols/silc10/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr "Impressão digital da chave pública"
 
-#: ../libpurple/protocols/silc/ops.c:1280
-#: ../libpurple/protocols/silc/ops.c:1352
+#: ../libpurple/protocols/silc/ops.c:1281
+#: ../libpurple/protocols/silc/ops.c:1355
 #: ../libpurple/protocols/silc10/ops.c:1286
 #: ../libpurple/protocols/silc10/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr "Impressão digital legível da chave pública"
 
-#: ../libpurple/protocols/silc/ops.c:1292
+#: ../libpurple/protocols/silc/ops.c:1294
 #: ../libpurple/protocols/silc10/ops.c:1298
 msgid "_More..."
 msgstr "_Mais..."
 
-#: ../libpurple/protocols/silc/ops.c:1369
-#: ../libpurple/protocols/silc/silc.c:1077
+#: ../libpurple/protocols/silc/ops.c:1373
+#: ../libpurple/protocols/silc/silc.c:1220
 #: ../libpurple/protocols/silc10/ops.c:1371
-#: ../libpurple/protocols/silc10/silc.c:988
+#: ../libpurple/protocols/silc10/silc.c:991
 msgid "Detach From Server"
 msgstr "Desconectar do servidor sem sair"
 
-#: ../libpurple/protocols/silc/ops.c:1369
+#: ../libpurple/protocols/silc/ops.c:1373
 #: ../libpurple/protocols/silc10/ops.c:1371
 msgid "Cannot detach"
 msgstr "Não foi possível desconectar sem sair"
 
-#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/silc/ops.c:1393
 #: ../libpurple/protocols/silc10/ops.c:1382
 msgid "Cannot set topic"
 msgstr "Não foi possível definir tópico"
 
-#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/silc/ops.c:1422
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Failed to change nickname"
 msgstr "Falha ao mudar apelido"
 
-#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc/ops.c:1471
 #: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Roomlist"
 msgstr "Lista de salas"
 
-#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc/ops.c:1471
 #: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Cannot get room list"
 msgstr "Não foi possível obter lista de salas"
 
-#: ../libpurple/protocols/silc/ops.c:1468
+#: ../libpurple/protocols/silc/ops.c:1472
 msgid "Network is empty"
 msgstr "A rede está vazia"
 
-#: ../libpurple/protocols/silc/ops.c:1512
+#: ../libpurple/protocols/silc/ops.c:1516
 #: ../libpurple/protocols/silc10/ops.c:1507
 msgid "No public key was received"
 msgstr "Nenhuma chave pública foi recebida"
 
-#: ../libpurple/protocols/silc/ops.c:1524
-#: ../libpurple/protocols/silc/ops.c:1537
+#: ../libpurple/protocols/silc/ops.c:1528
+#: ../libpurple/protocols/silc/ops.c:1541
 #: ../libpurple/protocols/silc10/ops.c:1519
 #: ../libpurple/protocols/silc10/ops.c:1532
 msgid "Server Information"
 msgstr "Informações do servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1525
+#: ../libpurple/protocols/silc/ops.c:1529
 #: ../libpurple/protocols/silc10/ops.c:1520
 msgid "Cannot get server information"
 msgstr "Não foi possível obter informações do servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1548
+#: ../libpurple/protocols/silc/ops.c:1552
 #: ../libpurple/protocols/silc10/ops.c:1549
 #: ../libpurple/protocols/silc10/ops.c:1558
 msgid "Server Statistics"
 msgstr "Estatísticas do servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1549
+#: ../libpurple/protocols/silc/ops.c:1553
 #: ../libpurple/protocols/silc10/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr "Não foi possível obter estatísticas do servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1556
+#: ../libpurple/protocols/silc/ops.c:1560
 #: ../libpurple/protocols/silc10/ops.c:1581
 #, c-format
 msgid ""
@@ -11414,54 +11762,54 @@
 "Total de operadores de servidor: %d\n"
 "Total de servidores de roteador: %d\n"
 
-#: ../libpurple/protocols/silc/ops.c:1588
+#: ../libpurple/protocols/silc/ops.c:1592
 #: ../libpurple/protocols/silc10/ops.c:1604
 msgid "Network Statistics"
 msgstr "Estatísticas da rede"
 
-#: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc/ops.c:1600
 #: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "Falha no ping"
 
-#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc/ops.c:1605
 #: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping reply received from server"
 msgstr "O servidor retornou a resposta do ping"
 
-#: ../libpurple/protocols/silc/ops.c:1609
+#: ../libpurple/protocols/silc/ops.c:1613
 #: ../libpurple/protocols/silc10/ops.c:1625
 msgid "Could not kill user"
 msgstr "Não foi possível 'killar' usuário"
 
-#: ../libpurple/protocols/silc/ops.c:1648
+#: ../libpurple/protocols/silc/ops.c:1652
 msgid "WATCH"
 msgstr "MONITORAR"
 
-#: ../libpurple/protocols/silc/ops.c:1648
+#: ../libpurple/protocols/silc/ops.c:1652
 msgid "Cannot watch user"
 msgstr "Não é possível monitorar o usuário"
 
-#: ../libpurple/protocols/silc/ops.c:1724
-#: ../libpurple/protocols/silc/ops.c:1775
-#: ../libpurple/protocols/silc/silc.c:277
+#: ../libpurple/protocols/silc/ops.c:1728
+#: ../libpurple/protocols/silc/ops.c:1779
+#: ../libpurple/protocols/silc/silc.c:385
 #: ../libpurple/protocols/silc10/ops.c:1811
 #: ../libpurple/protocols/silc10/ops.c:1858
 #: ../libpurple/protocols/silc10/silc.c:190
 msgid "Resuming session"
 msgstr "Recuperando sessão"
 
-#: ../libpurple/protocols/silc/ops.c:1726
+#: ../libpurple/protocols/silc/ops.c:1730
 #: ../libpurple/protocols/silc10/ops.c:1813
 msgid "Authenticating connection"
 msgstr "Autenticando conexão"
 
-#: ../libpurple/protocols/silc/ops.c:1777
+#: ../libpurple/protocols/silc/ops.c:1781
 #: ../libpurple/protocols/silc10/ops.c:1860
 msgid "Verifying server public key"
 msgstr "Verificando a chave pública do servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1814
+#: ../libpurple/protocols/silc/ops.c:1818
 #: ../libpurple/protocols/silc10/ops.c:1902
 msgid "Passphrase required"
 msgstr "Frase-senha requerida"
@@ -11507,22 +11855,22 @@
 msgid "Unsupported public key type"
 msgstr "Tipo de chave pública não suportada"
 
-#: ../libpurple/protocols/silc/silc.c:217
+#: ../libpurple/protocols/silc/silc.c:319
 #: ../libpurple/protocols/silc10/ops.c:1749
 msgid "Disconnected by server"
 msgstr "Desconectado pelo servidor"
 
-#: ../libpurple/protocols/silc/silc.c:224
+#: ../libpurple/protocols/silc/silc.c:327
 #: ../libpurple/protocols/silc10/ops.c:1700
 msgid "Error during connecting to SILC Server"
 msgstr "Erro ao conectar no servidor SILC"
 
-#: ../libpurple/protocols/silc/silc.c:229
+#: ../libpurple/protocols/silc/silc.c:333
 #: ../libpurple/protocols/silc10/ops.c:1705
 msgid "Key Exchange failed"
 msgstr "Falha na troca de chaves"
 
-#: ../libpurple/protocols/silc/silc.c:238
+#: ../libpurple/protocols/silc/silc.c:343
 #: ../libpurple/protocols/silc10/ops.c:1714
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
@@ -11530,64 +11878,63 @@
 "Falha ao tentar recuperar sessão desconectada, mas não saída. Pressione "
 "Reconectar para criar uma nova sessão."
 
-#: ../libpurple/protocols/silc/silc.c:265
-#: ../libpurple/protocols/silc/silc.c:311
+#: ../libpurple/protocols/silc/silc.c:373
+#: ../libpurple/protocols/silc/silc.c:420
 #: ../libpurple/protocols/silc10/silc.c:161
 msgid "Connection failed"
 msgstr "Falha na conexão"
 
-#: ../libpurple/protocols/silc/silc.c:280
+#: ../libpurple/protocols/silc/silc.c:388
 #: ../libpurple/protocols/silc10/silc.c:193
 msgid "Performing key exchange"
 msgstr "Fazendo troca de chaves"
 
 #. Progress
-#: ../libpurple/protocols/silc/silc.c:343
+#: ../libpurple/protocols/silc/silc.c:445
 #: ../libpurple/protocols/silc10/silc.c:325
 msgid "Connecting to SILC Server"
 msgstr "Conectando ao servidor SILC"
 
-#: ../libpurple/protocols/silc/silc.c:352
-#, c-format
+#: ../libpurple/protocols/silc/silc.c:455
 msgid "Could not load SILC key pair"
 msgstr "Não foi possível carregar par de chaves SILC"
 
-#: ../libpurple/protocols/silc/silc.c:366
+#: ../libpurple/protocols/silc/silc.c:469
 #: ../libpurple/protocols/silc10/silc.c:355
 msgid "Unable to create connection"
 msgstr "Não foi possível criar conexão."
 
-#: ../libpurple/protocols/silc/silc.c:395
+#: ../libpurple/protocols/silc/silc.c:499
 #: ../libpurple/protocols/silc10/silc.c:267
 msgid "Out of memory"
 msgstr "Sem memória"
 
-#: ../libpurple/protocols/silc/silc.c:438
+#: ../libpurple/protocols/silc/silc.c:550
 #: ../libpurple/protocols/silc10/silc.c:313
 msgid "Cannot initialize SILC protocol"
 msgstr "Não foi possível iniciar protocolo SILC"
 
-#: ../libpurple/protocols/silc/silc.c:445
+#: ../libpurple/protocols/silc/silc.c:559
 msgid "Error loading SILC key pair"
 msgstr "Erro ao carregar par de chaves do SILC"
 
-#: ../libpurple/protocols/silc/silc.c:739
+#: ../libpurple/protocols/silc/silc.c:882
 #: ../libpurple/protocols/silc10/silc.c:650
 msgid "Your Current Mood"
 msgstr "Seu humor atual"
 
-#: ../libpurple/protocols/silc/silc.c:741
-#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1641
+#: ../libpurple/protocols/silc/silc.c:884
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1741
 #, c-format
 msgid "Normal"
 msgstr "Normal"
 
-#: ../libpurple/protocols/silc/silc.c:755
+#: ../libpurple/protocols/silc/silc.c:898
 #: ../libpurple/protocols/silc10/silc.c:666
 msgid "In love"
 msgstr "Apaixonado"
 
-#: ../libpurple/protocols/silc/silc.c:766
+#: ../libpurple/protocols/silc/silc.c:909
 #: ../libpurple/protocols/silc10/silc.c:677
 msgid ""
 "\n"
@@ -11596,62 +11943,62 @@
 "\n"
 "Seu método preferido de contatos"
 
-#: ../libpurple/protocols/silc/silc.c:774
-#: ../libpurple/protocols/silc/util.c:561
+#: ../libpurple/protocols/silc/silc.c:917
+#: ../libpurple/protocols/silc/util.c:567
 #: ../libpurple/protocols/silc10/silc.c:685
 #: ../libpurple/protocols/silc10/util.c:557
 msgid "SMS"
 msgstr "SMS"
 
-#: ../libpurple/protocols/silc/silc.c:776
-#: ../libpurple/protocols/silc/util.c:563
+#: ../libpurple/protocols/silc/silc.c:919
+#: ../libpurple/protocols/silc/util.c:569
 #: ../libpurple/protocols/silc10/silc.c:687
 #: ../libpurple/protocols/silc10/util.c:559
 msgid "MMS"
 msgstr "MMS"
 
-#: ../libpurple/protocols/silc/silc.c:778
+#: ../libpurple/protocols/silc/silc.c:921
 #: ../libpurple/protocols/silc10/silc.c:689
 msgid "Video conferencing"
 msgstr "Videoconferência"
 
-#: ../libpurple/protocols/silc/silc.c:783
+#: ../libpurple/protocols/silc/silc.c:926
 #: ../libpurple/protocols/silc10/silc.c:694
 msgid "Your Current Status"
 msgstr "Seu status atual"
 
-#: ../libpurple/protocols/silc/silc.c:790
+#: ../libpurple/protocols/silc/silc.c:933
 #: ../libpurple/protocols/silc10/silc.c:701
 msgid "Online Services"
 msgstr "Serviços online"
 
-#: ../libpurple/protocols/silc/silc.c:793
+#: ../libpurple/protocols/silc/silc.c:936
 #: ../libpurple/protocols/silc10/silc.c:704
 msgid "Let others see what services you are using"
 msgstr "Permitir que os outros vejam os serviços que você está usando"
 
-#: ../libpurple/protocols/silc/silc.c:799
+#: ../libpurple/protocols/silc/silc.c:942
 #: ../libpurple/protocols/silc10/silc.c:710
 msgid "Let others see what computer you are using"
 msgstr "Permitir que os outros vejam qual computador você está usando"
 
-#: ../libpurple/protocols/silc/silc.c:806
+#: ../libpurple/protocols/silc/silc.c:949
 #: ../libpurple/protocols/silc10/silc.c:717
 msgid "Your VCard File"
 msgstr "Seu arquivo VCard"
 
-#: ../libpurple/protocols/silc/silc.c:812
+#: ../libpurple/protocols/silc/silc.c:955
 msgid "Timezone (UTC)"
 msgstr "Fuso horário (GMT)"
 
-#: ../libpurple/protocols/silc/silc.c:816
-#: ../libpurple/protocols/silc/silc.c:817
+#: ../libpurple/protocols/silc/silc.c:959
+#: ../libpurple/protocols/silc/silc.c:960
 #: ../libpurple/protocols/silc10/silc.c:729
 #: ../libpurple/protocols/silc10/silc.c:730
 msgid "User Online Status Attributes"
 msgstr "Atributos de status online do usuário"
 
-#: ../libpurple/protocols/silc/silc.c:818
+#: ../libpurple/protocols/silc/silc.c:961
 #: ../libpurple/protocols/silc10/silc.c:731
 msgid ""
 "You can let other users see your online status information and your personal "
@@ -11662,31 +12009,31 @@
 "e suas informações pessoais. Por favor preencha as informações que você "
 "deseja que seja vista por outros usuários vejam sobre você."
 
-#: ../libpurple/protocols/silc/silc.c:859
-#: ../libpurple/protocols/silc/silc.c:865
-#: ../libpurple/protocols/silc/silc.c:1486
+#: ../libpurple/protocols/silc/silc.c:1002
+#: ../libpurple/protocols/silc/silc.c:1008
+#: ../libpurple/protocols/silc/silc.c:1629
 #: ../libpurple/protocols/silc10/silc.c:772
 #: ../libpurple/protocols/silc10/silc.c:778
-#: ../libpurple/protocols/silc10/silc.c:1415
+#: ../libpurple/protocols/silc10/silc.c:1418
 msgid "Message of the Day"
 msgstr "Mensagem do dia"
 
-#: ../libpurple/protocols/silc/silc.c:859
+#: ../libpurple/protocols/silc/silc.c:1002
 #: ../libpurple/protocols/silc10/silc.c:772
 msgid "No Message of the Day available"
 msgstr "Não há mensagem do dia disponível"
 
-#: ../libpurple/protocols/silc/silc.c:860
-#: ../libpurple/protocols/silc/silc.c:1481
+#: ../libpurple/protocols/silc/silc.c:1003
+#: ../libpurple/protocols/silc/silc.c:1624
 #: ../libpurple/protocols/silc10/silc.c:773
-#: ../libpurple/protocols/silc10/silc.c:1410
+#: ../libpurple/protocols/silc10/silc.c:1413
 msgid "There is no Message of the Day associated with this connection"
 msgstr "Não há mensagem do dia associada com esta conexão."
 
-#: ../libpurple/protocols/silc/silc.c:911
-#: ../libpurple/protocols/silc/silc.c:957
-#: ../libpurple/protocols/silc/silc.c:1028
-#: ../libpurple/protocols/silc/silc.c:1029
+#: ../libpurple/protocols/silc/silc.c:1054
+#: ../libpurple/protocols/silc/silc.c:1100
+#: ../libpurple/protocols/silc/silc.c:1171
+#: ../libpurple/protocols/silc/silc.c:1172
 #: ../libpurple/protocols/silc10/silc.c:824
 #: ../libpurple/protocols/silc10/silc.c:868
 #: ../libpurple/protocols/silc10/silc.c:939
@@ -11694,185 +12041,185 @@
 msgid "Create New SILC Key Pair"
 msgstr "Criar novo par de chaves do SILC"
 
-#: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc/silc.c:1054
 #: ../libpurple/protocols/silc10/silc.c:824
 msgid "Passphrases do not match"
 msgstr "As frases-senha não conferem"
 
-#: ../libpurple/protocols/silc/silc.c:957
+#: ../libpurple/protocols/silc/silc.c:1100
 #: ../libpurple/protocols/silc10/silc.c:868
 msgid "Key Pair Generation failed"
 msgstr "Falha ao gerar par de chaves"
 
-#: ../libpurple/protocols/silc/silc.c:996
+#: ../libpurple/protocols/silc/silc.c:1139
 #: ../libpurple/protocols/silc10/silc.c:907
 msgid "Key length"
 msgstr "Tamanho da chave"
 
-#: ../libpurple/protocols/silc/silc.c:998
+#: ../libpurple/protocols/silc/silc.c:1141
 #: ../libpurple/protocols/silc10/silc.c:909
 msgid "Public key file"
 msgstr "Arquivo da chave pública"
 
-#: ../libpurple/protocols/silc/silc.c:1000
+#: ../libpurple/protocols/silc/silc.c:1143
 #: ../libpurple/protocols/silc10/silc.c:911
 msgid "Private key file"
 msgstr "Arquivo da chave privada"
 
-#: ../libpurple/protocols/silc/silc.c:1023
+#: ../libpurple/protocols/silc/silc.c:1166
 #: ../libpurple/protocols/silc10/silc.c:934
 msgid "Passphrase (retype)"
 msgstr "Frase-senha (redigitar)"
 
-#: ../libpurple/protocols/silc/silc.c:1030
+#: ../libpurple/protocols/silc/silc.c:1173
 #: ../libpurple/protocols/silc10/silc.c:941
 msgid "Generate Key Pair"
 msgstr "Gerar par de chaves"
 
-#: ../libpurple/protocols/silc/silc.c:1073
-#: ../libpurple/protocols/silc10/silc.c:984
+#: ../libpurple/protocols/silc/silc.c:1216
+#: ../libpurple/protocols/silc10/silc.c:987
 msgid "Online Status"
 msgstr "Status online"
 
-#: ../libpurple/protocols/silc/silc.c:1081
-#: ../libpurple/protocols/silc10/silc.c:992
+#: ../libpurple/protocols/silc/silc.c:1224
+#: ../libpurple/protocols/silc10/silc.c:995
 msgid "View Message of the Day"
 msgstr "Ver mensagem do dia"
 
-#: ../libpurple/protocols/silc/silc.c:1085
-#: ../libpurple/protocols/silc10/silc.c:996
+#: ../libpurple/protocols/silc/silc.c:1228
+#: ../libpurple/protocols/silc10/silc.c:999
 msgid "Create SILC Key Pair..."
 msgstr "Criar par de chaves do SILC..."
 
-#: ../libpurple/protocols/silc/silc.c:1177
-#: ../libpurple/protocols/silc10/silc.c:1095
+#: ../libpurple/protocols/silc/silc.c:1320
+#: ../libpurple/protocols/silc10/silc.c:1098
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "O usuário <I>%s</I> não está presente na rede"
 
-#: ../libpurple/protocols/silc/silc.c:1357
-#: ../libpurple/protocols/silc10/silc.c:1286
+#: ../libpurple/protocols/silc/silc.c:1500
+#: ../libpurple/protocols/silc10/silc.c:1289
 msgid "Topic too long"
 msgstr "Tópico muito extenso"
 
-#: ../libpurple/protocols/silc/silc.c:1438
-#: ../libpurple/protocols/silc10/silc.c:1367
+#: ../libpurple/protocols/silc/silc.c:1581
+#: ../libpurple/protocols/silc10/silc.c:1370
 msgid "You must specify a nick"
 msgstr "Você precisa especificar um apelido"
 
-#: ../libpurple/protocols/silc/silc.c:1540
-#: ../libpurple/protocols/silc10/silc.c:1469
+#: ../libpurple/protocols/silc/silc.c:1683
+#: ../libpurple/protocols/silc10/silc.c:1472
 #, c-format
 msgid "channel %s not found"
 msgstr "canal %s não encontrado"
 
-#: ../libpurple/protocols/silc/silc.c:1545
-#: ../libpurple/protocols/silc10/silc.c:1474
+#: ../libpurple/protocols/silc/silc.c:1688
+#: ../libpurple/protocols/silc10/silc.c:1477
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "modos do canal de %s: %s"
 
-#: ../libpurple/protocols/silc/silc.c:1547
-#: ../libpurple/protocols/silc10/silc.c:1476
+#: ../libpurple/protocols/silc/silc.c:1690
+#: ../libpurple/protocols/silc10/silc.c:1479
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "nenhum modo de canal está definido em %s"
 
-#: ../libpurple/protocols/silc/silc.c:1560
-#: ../libpurple/protocols/silc10/silc.c:1489
+#: ../libpurple/protocols/silc/silc.c:1703
+#: ../libpurple/protocols/silc10/silc.c:1492
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "Falha ao definir cmodes de %s"
 
-#: ../libpurple/protocols/silc/silc.c:1590
-#: ../libpurple/protocols/silc10/silc.c:1519
+#: ../libpurple/protocols/silc/silc.c:1733
+#: ../libpurple/protocols/silc10/silc.c:1522
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
 msgstr "Comando desconhecido: %s, (Pode ser uma falha do cliente)"
 
-#: ../libpurple/protocols/silc/silc.c:1653
-#: ../libpurple/protocols/silc10/silc.c:1582
+#: ../libpurple/protocols/silc/silc.c:1796
+#: ../libpurple/protocols/silc10/silc.c:1585
 msgid "part [channel]:  Leave the chat"
 msgstr "part [canal]:  Sai do bate-papo"
 
-#: ../libpurple/protocols/silc/silc.c:1657
-#: ../libpurple/protocols/silc10/silc.c:1586
+#: ../libpurple/protocols/silc/silc.c:1800
+#: ../libpurple/protocols/silc10/silc.c:1589
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [canal]:  Sai do bate-papo"
 
-#: ../libpurple/protocols/silc/silc.c:1661
-#: ../libpurple/protocols/silc10/silc.c:1590
+#: ../libpurple/protocols/silc/silc.c:1804
+#: ../libpurple/protocols/silc10/silc.c:1593
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;novo tópico&gt;]:  Vê ou altera o tópico"
 
-#: ../libpurple/protocols/silc/silc.c:1666
-#: ../libpurple/protocols/silc10/silc.c:1595
+#: ../libpurple/protocols/silc/silc.c:1809
+#: ../libpurple/protocols/silc10/silc.c:1598
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "join &lt;canal&gt; [&lt;senha&gt;]:  Entra em um canal nesta rede"
 
-#: ../libpurple/protocols/silc/silc.c:1670
-#: ../libpurple/protocols/silc10/silc.c:1599
+#: ../libpurple/protocols/silc/silc.c:1813
+#: ../libpurple/protocols/silc10/silc.c:1602
 msgid "list:  List channels on this network"
 msgstr "list:  Lista os canais desta rede"
 
-#: ../libpurple/protocols/silc/silc.c:1674
-#: ../libpurple/protocols/silc10/silc.c:1603
+#: ../libpurple/protocols/silc/silc.c:1817
+#: ../libpurple/protocols/silc10/silc.c:1606
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;usuário&gt;:  Exibe informações do usuário"
 
-#: ../libpurple/protocols/silc/silc.c:1678
-#: ../libpurple/protocols/silc10/silc.c:1607
+#: ../libpurple/protocols/silc/silc.c:1821
+#: ../libpurple/protocols/silc10/silc.c:1610
 #: ../libpurple/protocols/zephyr/zephyr.c:2685
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
 "msg &lt;usuário&gt; &lt;mensagem&gt;:  Manda uma mensagem privada para um "
 "usuário"
 
-#: ../libpurple/protocols/silc/silc.c:1682
-#: ../libpurple/protocols/silc10/silc.c:1611
+#: ../libpurple/protocols/silc/silc.c:1825
+#: ../libpurple/protocols/silc10/silc.c:1614
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
 "query &lt;usuário&gt; [&lt;mensagem&gt;]:  Manda uma mensagem privada para "
 "um usuário"
 
-#: ../libpurple/protocols/silc/silc.c:1686
-#: ../libpurple/protocols/silc10/silc.c:1615
+#: ../libpurple/protocols/silc/silc.c:1829
+#: ../libpurple/protocols/silc10/silc.c:1618
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  Exibe a mensagem do dia do servidor"
 
-#: ../libpurple/protocols/silc/silc.c:1690
-#: ../libpurple/protocols/silc10/silc.c:1619
+#: ../libpurple/protocols/silc/silc.c:1833
+#: ../libpurple/protocols/silc10/silc.c:1622
 msgid "detach:  Detach this session"
 msgstr "detach:  Desconecta do servidor sem sair do mesmo"
 
-#: ../libpurple/protocols/silc/silc.c:1694
-#: ../libpurple/protocols/silc10/silc.c:1623
+#: ../libpurple/protocols/silc/silc.c:1837
+#: ../libpurple/protocols/silc10/silc.c:1626
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [mensagem]:  Desconecta do servidor, com uma mensagem opcional"
 
-#: ../libpurple/protocols/silc/silc.c:1698
-#: ../libpurple/protocols/silc10/silc.c:1627
+#: ../libpurple/protocols/silc/silc.c:1841
+#: ../libpurple/protocols/silc10/silc.c:1630
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;comando&gt;:  Chama qualquer comando de cliente do SILC"
 
-#: ../libpurple/protocols/silc/silc.c:1704
-#: ../libpurple/protocols/silc10/silc.c:1633
+#: ../libpurple/protocols/silc/silc.c:1847
+#: ../libpurple/protocols/silc10/silc.c:1636
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr ""
 "kill &lt;usuário&gt; [-pubkey|&lt;motivo&gt;]: Expulsa o usuário do servidor"
 
-#: ../libpurple/protocols/silc/silc.c:1708
-#: ../libpurple/protocols/silc10/silc.c:1637
+#: ../libpurple/protocols/silc/silc.c:1851
+#: ../libpurple/protocols/silc10/silc.c:1640
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;novo apelido&gt;:  Muda seu apelido"
 
-#: ../libpurple/protocols/silc/silc.c:1712
-#: ../libpurple/protocols/silc10/silc.c:1641
+#: ../libpurple/protocols/silc/silc.c:1855
+#: ../libpurple/protocols/silc10/silc.c:1644
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;usuário&gt;:  Exibe informações do usuário"
 
-#: ../libpurple/protocols/silc/silc.c:1716
-#: ../libpurple/protocols/silc10/silc.c:1645
+#: ../libpurple/protocols/silc/silc.c:1859
+#: ../libpurple/protocols/silc10/silc.c:1648
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -11880,8 +12227,8 @@
 "cmode &lt;canal&gt; [+|-&lt;modos&gt]; [argumentos]: Define ou exibe os "
 "modos do canal."
 
-#: ../libpurple/protocols/silc/silc.c:1720
-#: ../libpurple/protocols/silc10/silc.c:1649
+#: ../libpurple/protocols/silc/silc.c:1863
+#: ../libpurple/protocols/silc10/silc.c:1652
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -11889,19 +12236,19 @@
 "cumode &lt;usuário|canal&gt; +|-&lt;modos&gt; &lt;usuário&gt;: Muda os modos "
 "do usuário no canal"
 
-#: ../libpurple/protocols/silc/silc.c:1724
-#: ../libpurple/protocols/silc10/silc.c:1653
+#: ../libpurple/protocols/silc/silc.c:1867
+#: ../libpurple/protocols/silc10/silc.c:1656
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;modos de usuário&gt;: Define seus modos na rede"
 
-#: ../libpurple/protocols/silc/silc.c:1728
-#: ../libpurple/protocols/silc10/silc.c:1657
+#: ../libpurple/protocols/silc/silc.c:1871
+#: ../libpurple/protocols/silc10/silc.c:1660
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr ""
 "oper &lt;usuário&gt; [-pubkey]: Obtém privilégios de operador do servidor"
 
-#: ../libpurple/protocols/silc/silc.c:1732
-#: ../libpurple/protocols/silc10/silc.c:1661
+#: ../libpurple/protocols/silc/silc.c:1875
+#: ../libpurple/protocols/silc10/silc.c:1664
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -11909,46 +12256,46 @@
 "invite &lt;canal&gt; [-|+]&lt;usuário&gt;:  convida um usuário ou adiciona/"
 "remove-o da lista de convites do canal"
 
-#: ../libpurple/protocols/silc/silc.c:1736
-#: ../libpurple/protocols/silc10/silc.c:1665
+#: ../libpurple/protocols/silc/silc.c:1879
+#: ../libpurple/protocols/silc10/silc.c:1668
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 "kick &lt;canal&gt; &ltusuário&gt; [comentário]:  Expulsa o usuário do canal"
 
-#: ../libpurple/protocols/silc/silc.c:1740
-#: ../libpurple/protocols/silc10/silc.c:1669
+#: ../libpurple/protocols/silc/silc.c:1883
+#: ../libpurple/protocols/silc10/silc.c:1672
 msgid "info [server]:  View server administrative details"
 msgstr "info [servidor]: Exibe detalhes administrativos do servidor"
 
-#: ../libpurple/protocols/silc/silc.c:1744
-#: ../libpurple/protocols/silc10/silc.c:1673
+#: ../libpurple/protocols/silc/silc.c:1887
+#: ../libpurple/protocols/silc10/silc.c:1676
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;canal&gt; +|-&lt;usuário&gt;]:  Bane o usuário do canal"
 
-#: ../libpurple/protocols/silc/silc.c:1748
-#: ../libpurple/protocols/silc10/silc.c:1677
+#: ../libpurple/protocols/silc/silc.c:1891
+#: ../libpurple/protocols/silc10/silc.c:1680
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 "getkey &lt;usuário|servidor&gt;:  Obtém a chave pública do servidor ou do "
 "usuário"
 
-#: ../libpurple/protocols/silc/silc.c:1752
-#: ../libpurple/protocols/silc10/silc.c:1681
+#: ../libpurple/protocols/silc/silc.c:1895
+#: ../libpurple/protocols/silc10/silc.c:1684
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Exibe as estatísticas do servidor e da rede"
 
-#: ../libpurple/protocols/silc/silc.c:1756
-#: ../libpurple/protocols/silc10/silc.c:1685
+#: ../libpurple/protocols/silc/silc.c:1899
+#: ../libpurple/protocols/silc10/silc.c:1688
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Envia um PING para o servidor conectado"
 
-#: ../libpurple/protocols/silc/silc.c:1761
-#: ../libpurple/protocols/silc10/silc.c:1690
+#: ../libpurple/protocols/silc/silc.c:1904
+#: ../libpurple/protocols/silc10/silc.c:1693
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;canal&gt;:  Lista os usuários no canal"
 
-#: ../libpurple/protocols/silc/silc.c:1765
-#: ../libpurple/protocols/silc10/silc.c:1694
+#: ../libpurple/protocols/silc/silc.c:1908
+#: ../libpurple/protocols/silc10/silc.c:1697
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -11965,142 +12312,142 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:1876
-#: ../libpurple/protocols/silc10/silc.c:1819
+#: ../libpurple/protocols/silc/silc.c:2019
+#: ../libpurple/protocols/silc10/silc.c:1822
 msgid "SILC Protocol Plugin"
 msgstr "Plugin do protocolo SILC"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:1878
-#: ../libpurple/protocols/silc10/silc.c:1821
+#: ../libpurple/protocols/silc/silc.c:2021
+#: ../libpurple/protocols/silc10/silc.c:1824
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr ""
 "Plugin do protocolo de conferência segura em tempo-real na internet (Secure "
 "Internet Live Conferencing - SILC)"
 
-#: ../libpurple/protocols/silc/silc.c:1910
-#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2036
+#: ../libpurple/protocols/silc/silc.c:2053
+#: ../libpurple/protocols/silc10/silc.c:1856 ../pidgin/gtkprefs.c:2138
 msgid "Network"
 msgstr "Rede"
 
-#: ../libpurple/protocols/silc/silc.c:1921
-#: ../libpurple/protocols/silc10/silc.c:1864
+#: ../libpurple/protocols/silc/silc.c:2064
+#: ../libpurple/protocols/silc10/silc.c:1867
 msgid "Public Key file"
 msgstr "Arquivo da chave pública"
 
-#: ../libpurple/protocols/silc/silc.c:1925
-#: ../libpurple/protocols/silc10/silc.c:1868
+#: ../libpurple/protocols/silc/silc.c:2068
+#: ../libpurple/protocols/silc10/silc.c:1871
 msgid "Private Key file"
 msgstr "Arquivo da chave privada"
 
-#: ../libpurple/protocols/silc/silc.c:1935
-#: ../libpurple/protocols/silc10/silc.c:1878
+#: ../libpurple/protocols/silc/silc.c:2078
+#: ../libpurple/protocols/silc10/silc.c:1881
 msgid "Cipher"
 msgstr "Cifra"
 
-#: ../libpurple/protocols/silc/silc.c:1945
-#: ../libpurple/protocols/silc10/silc.c:1888
+#: ../libpurple/protocols/silc/silc.c:2088
+#: ../libpurple/protocols/silc10/silc.c:1891
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../libpurple/protocols/silc/silc.c:1948
+#: ../libpurple/protocols/silc/silc.c:2091
 msgid "Use Perfect Forward Secrecy"
 msgstr "Usar \"Perfect Forward Secrecy\""
 
-#: ../libpurple/protocols/silc/silc.c:1952
-#: ../libpurple/protocols/silc10/silc.c:1891
+#: ../libpurple/protocols/silc/silc.c:2095
+#: ../libpurple/protocols/silc10/silc.c:1894
 msgid "Public key authentication"
 msgstr "Autenticação via chave pública"
 
-#: ../libpurple/protocols/silc/silc.c:1955
-#: ../libpurple/protocols/silc10/silc.c:1894
+#: ../libpurple/protocols/silc/silc.c:2098
+#: ../libpurple/protocols/silc10/silc.c:1897
 msgid "Block IMs without Key Exchange"
 msgstr "Bloquear mensagens instantâneas sem troca de chaves"
 
-#: ../libpurple/protocols/silc/silc.c:1958
-#: ../libpurple/protocols/silc10/silc.c:1897
+#: ../libpurple/protocols/silc/silc.c:2101
+#: ../libpurple/protocols/silc10/silc.c:1900
 msgid "Block messages to whiteboard"
 msgstr "Bloquear mensagens no quadro de atividades"
 
-#: ../libpurple/protocols/silc/silc.c:1961
-#: ../libpurple/protocols/silc10/silc.c:1900
+#: ../libpurple/protocols/silc/silc.c:2104
+#: ../libpurple/protocols/silc10/silc.c:1903
 msgid "Automatically open whiteboard"
 msgstr "Expandir contatos _automaticamente"
 
-#: ../libpurple/protocols/silc/silc.c:1964
-#: ../libpurple/protocols/silc10/silc.c:1903
+#: ../libpurple/protocols/silc/silc.c:2107
+#: ../libpurple/protocols/silc10/silc.c:1906
 msgid "Digitally sign and verify all messages"
 msgstr "Assinar digitalmente e verificar todas as mensagens"
 
 #: ../libpurple/protocols/silc/util.c:207
-#: ../libpurple/protocols/silc/util.c:249
+#: ../libpurple/protocols/silc/util.c:250
 #: ../libpurple/protocols/silc10/util.c:207
 #: ../libpurple/protocols/silc10/util.c:247
 msgid "Creating SILC key pair..."
 msgstr "Criando par de chaves do SILC..."
 
-#: ../libpurple/protocols/silc/util.c:215
-#: ../libpurple/protocols/silc/util.c:257
+#: ../libpurple/protocols/silc/util.c:216
+#: ../libpurple/protocols/silc/util.c:259
 msgid "Cannot create SILC key pair\n"
 msgstr "Não foi possível criar par de chaves do SILC\n"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: ../libpurple/protocols/silc/util.c:358
+#: ../libpurple/protocols/silc/util.c:364
 #: ../libpurple/protocols/silc10/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Nome real: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:360
+#: ../libpurple/protocols/silc/util.c:366
 #: ../libpurple/protocols/silc10/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Nome do usuário: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:362
+#: ../libpurple/protocols/silc/util.c:368
 #: ../libpurple/protocols/silc10/util.c:359
 #, c-format
 msgid "E-Mail: \t\t%s\n"
 msgstr "E-Mail: \t\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:364
+#: ../libpurple/protocols/silc/util.c:370
 #: ../libpurple/protocols/silc10/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Nome do host: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:366
+#: ../libpurple/protocols/silc/util.c:372
 #: ../libpurple/protocols/silc10/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "Organização: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:368
+#: ../libpurple/protocols/silc/util.c:374
 #: ../libpurple/protocols/silc10/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "País: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:369
+#: ../libpurple/protocols/silc/util.c:375
 #: ../libpurple/protocols/silc10/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Algoritmo: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc/util.c:376
 #: ../libpurple/protocols/silc10/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "Tamanho da chave: \t%d bits\n"
 
-#: ../libpurple/protocols/silc/util.c:372
+#: ../libpurple/protocols/silc/util.c:378
 #, c-format
 msgid "Version: \t%s\n"
 msgstr "Versão: %s\n"
 
-#: ../libpurple/protocols/silc/util.c:374
+#: ../libpurple/protocols/silc/util.c:380
 #: ../libpurple/protocols/silc10/util.c:369
 #, c-format
 msgid ""
@@ -12112,7 +12459,7 @@
 "%s\n"
 "\n"
 
-#: ../libpurple/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc/util.c:381
 #: ../libpurple/protocols/silc10/util.c:370
 #, c-format
 msgid ""
@@ -12122,44 +12469,44 @@
 "Impressão digital legível da chave pública:\n"
 "%s"
 
-#: ../libpurple/protocols/silc/util.c:379
-#: ../libpurple/protocols/silc/util.c:380
+#: ../libpurple/protocols/silc/util.c:385
+#: ../libpurple/protocols/silc/util.c:386
 #: ../libpurple/protocols/silc10/util.c:374
 #: ../libpurple/protocols/silc10/util.c:375
 msgid "Public Key Information"
 msgstr "Informações da chave pública"
 
-#: ../libpurple/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc/util.c:565
 #: ../libpurple/protocols/silc10/util.c:555
 msgid "Paging"
 msgstr "Pager"
 
-#: ../libpurple/protocols/silc/util.c:565
+#: ../libpurple/protocols/silc/util.c:571
 #: ../libpurple/protocols/silc10/util.c:561
 msgid "Video Conferencing"
 msgstr "Videoconferência"
 
-#: ../libpurple/protocols/silc/util.c:583
+#: ../libpurple/protocols/silc/util.c:589
 #: ../libpurple/protocols/silc10/util.c:579
 msgid "Computer"
 msgstr "Computador"
 
-#: ../libpurple/protocols/silc/util.c:587
+#: ../libpurple/protocols/silc/util.c:593
 #: ../libpurple/protocols/silc10/util.c:583
 msgid "PDA"
 msgstr "PDA"
 
-#: ../libpurple/protocols/silc/util.c:589
+#: ../libpurple/protocols/silc/util.c:595
 #: ../libpurple/protocols/silc10/util.c:585
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../libpurple/protocols/silc/wb.c:284 ../libpurple/protocols/silc10/wb.c:284
+#: ../libpurple/protocols/silc/wb.c:288 ../libpurple/protocols/silc10/wb.c:287
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr "%s mandou uma mensagem para o quadro de atividades. Deseja abri-lo?"
 
-#: ../libpurple/protocols/silc/wb.c:288 ../libpurple/protocols/silc10/wb.c:288
+#: ../libpurple/protocols/silc/wb.c:292 ../libpurple/protocols/silc10/wb.c:291
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
@@ -12168,7 +12515,7 @@
 "%s mandou uma mensagem para o quadro de atividades no canal %s. Você deseja "
 "abri-lo?"
 
-#: ../libpurple/protocols/silc/wb.c:302 ../libpurple/protocols/silc10/wb.c:302
+#: ../libpurple/protocols/silc/wb.c:306 ../libpurple/protocols/silc10/wb.c:305
 msgid "Whiteboard"
 msgstr "Quadro de atividades"
 
@@ -12243,36 +12590,35 @@
 msgid "Could not load SILC key pair: %s"
 msgstr "Não foi possível carregar par de chaves SILC: %s"
 
-#. TODO: do we really want to disconnect on a failure to write?
-#: ../libpurple/protocols/simple/simple.c:416
+#: ../libpurple/protocols/simple/simple.c:419
 msgid "Could not write"
 msgstr "Não foi possível enviar"
 
-#: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1529
+#: ../libpurple/protocols/simple/simple.c:443
+#: ../libpurple/protocols/simple/simple.c:1691
 msgid "Could not connect"
 msgstr "Não foi possível conectar"
 
-#: ../libpurple/protocols/simple/simple.c:1059
+#: ../libpurple/protocols/simple/simple.c:1127
 msgid "Unknown server response."
 msgstr "Resposta do servidor desconhecida."
 
-#: ../libpurple/protocols/simple/simple.c:1563
-#: ../libpurple/protocols/simple/simple.c:1605
-#: ../libpurple/protocols/simple/simple.c:1618
-#: ../libpurple/protocols/simple/simple.c:1669
+#: ../libpurple/protocols/simple/simple.c:1727
+#: ../libpurple/protocols/simple/simple.c:1773
+#: ../libpurple/protocols/simple/simple.c:1788
+#: ../libpurple/protocols/simple/simple.c:1843
 msgid "Could not create listen socket"
 msgstr "Não foi possível criar socket de escuta"
 
-#: ../libpurple/protocols/simple/simple.c:1586
+#: ../libpurple/protocols/simple/simple.c:1752
 msgid "Couldn't resolve host"
 msgstr "Não foi possível resolver ao host"
 
-#: ../libpurple/protocols/simple/simple.c:1677
+#: ../libpurple/protocols/simple/simple.c:1853
 msgid "Could not resolve hostname"
 msgstr "Não foi possível resolver host"
 
-#: ../libpurple/protocols/simple/simple.c:1694
+#: ../libpurple/protocols/simple/simple.c:1871
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "Nomes de usuário do SIP não podem conter espaços ou arrobas"
 
@@ -12284,36 +12630,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1870
+#: ../libpurple/protocols/simple/simple.c:2057
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "Plugin do protocolo SIP/SIMPLE"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1871
+#: ../libpurple/protocols/simple/simple.c:2058
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "Plugin do protocolo SIP/SIMPLE"
 
-#: ../libpurple/protocols/simple/simple.c:1899
+#: ../libpurple/protocols/simple/simple.c:2086
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Anunciar status (nota: todos podem te observar)"
 
-#: ../libpurple/protocols/simple/simple.c:1905
+#: ../libpurple/protocols/simple/simple.c:2092
 msgid "Use UDP"
 msgstr "Usar UDP"
 
-#: ../libpurple/protocols/simple/simple.c:1907
+#: ../libpurple/protocols/simple/simple.c:2094
 msgid "Use proxy"
 msgstr "Usar proxy"
 
-#: ../libpurple/protocols/simple/simple.c:1909
+#: ../libpurple/protocols/simple/simple.c:2096
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../libpurple/protocols/simple/simple.c:1911
+#: ../libpurple/protocols/simple/simple.c:2098
 msgid "Auth User"
 msgstr "Usuário de autenticação"
 
-#: ../libpurple/protocols/simple/simple.c:1913
+#: ../libpurple/protocols/simple/simple.c:2100
 msgid "Auth Domain"
 msgstr "Domínio de autenticação"
 
@@ -12493,8 +12839,8 @@
 msgid "Password Change Successful"
 msgstr "Mudança de senha efetuada com sucesso"
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5582
-#: ../pidgin/gtkblist.c:5932
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:6280
+#: ../pidgin/gtkblist.c:6638
 msgid "_Group:"
 msgstr "_Grupo:"
 
@@ -12557,26 +12903,26 @@
 msgid "TOC Protocol Plugin"
 msgstr "Plugin do protocolo TOC"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:782
+#: ../libpurple/protocols/yahoo/yahoo.c:784
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
 msgstr ""
 "%s te enviou um convite para ver webcam, que é um recurso não suportado."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:838
+#: ../libpurple/protocols/yahoo/yahoo.c:840
 msgid "Your Yahoo! message did not get sent."
 msgstr "Sua mensagem do Yahoo! não foi enviada."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:960
+#: ../libpurple/protocols/yahoo/yahoo.c:962
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Mensagem do sistema Yahoo! para %s:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1029
+#: ../libpurple/protocols/yahoo/yahoo.c:1031
 msgid "Authorization denied message:"
 msgstr "Mensagem de recusa de autorização:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1047
+#: ../libpurple/protocols/yahoo/yahoo.c:1049
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -12585,18 +12931,18 @@
 "O usuário %s (retroativamente) negou seu pedido para adicioná-lo à sua lista "
 "de amigos com o seguinte motivo: %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1050
+#: ../libpurple/protocols/yahoo/yahoo.c:1052
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 "O usuário %s (retroativamente) negou seu pedido para adicioná-lo à sua lista "
 "de amigos."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1052
+#: ../libpurple/protocols/yahoo/yahoo.c:1054
 msgid "Add buddy rejected"
 msgstr "Pedido para adicionar amigo negado"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1994
+#: ../libpurple/protocols/yahoo/yahoo.c:1996
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -12607,11 +12953,11 @@
 "desconhecido. Provavelmente, você não conseguirá conectar com sucesso ao "
 "Yahoo. Verifique %s por atualizações."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1997
+#: ../libpurple/protocols/yahoo/yahoo.c:1999
 msgid "Failed Yahoo! Authentication"
 msgstr "Falha na autenticação do Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2063
+#: ../libpurple/protocols/yahoo/yahoo.c:2065
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -12620,52 +12966,52 @@
 "Você tentou ignorar %s, mas o usuário está na sua lista de amigos. Ao clicar "
 "\"Sim\" o usuário será removido e ignorado."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2066
+#: ../libpurple/protocols/yahoo/yahoo.c:2068
 msgid "Ignore buddy?"
 msgstr "Ignorar amigo?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2129
+#: ../libpurple/protocols/yahoo/yahoo.c:2133
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "Sua conta está travada, favor entrar no site do Yahoo!."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2132
+#: ../libpurple/protocols/yahoo/yahoo.c:2136
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Número de erro %d desconhecido. Entrar na sua conta no site do Yahoo! pode "
 "corrigir isso."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2186
+#: ../libpurple/protocols/yahoo/yahoo.c:2189
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Não foi possível adicionar o amigo %s ao grupo %s à lista do servidor na "
 "conta %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2189
+#: ../libpurple/protocols/yahoo/yahoo.c:2192
 msgid "Could not add buddy to server list"
 msgstr "Não foi possível adicionar amigo à lista do servidor"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2308
+#: ../libpurple/protocols/yahoo/yahoo.c:2311
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audível %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2651
+#: ../libpurple/protocols/yahoo/yahoo.c:2657
 msgid "Received unexpected HTTP response from server."
 msgstr "O servidor retornou uma resposta HTTP inválida."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2675
-#: ../libpurple/protocols/yahoo/yahoo.c:2861
-#: ../libpurple/protocols/yahoo/yahoo.c:2964
+#: ../libpurple/protocols/yahoo/yahoo.c:2682
+#: ../libpurple/protocols/yahoo/yahoo.c:2870
 #: ../libpurple/protocols/yahoo/yahoo.c:2974
+#: ../libpurple/protocols/yahoo/yahoo.c:2985
 #: ../libpurple/protocols/yahoo/yahoochat.c:1514
 #: ../libpurple/protocols/yahoo/yahoochat.c:1584
-#: ../libpurple/protocols/yahoo/ycht.c:585
+#: ../libpurple/protocols/yahoo/ycht.c:586
 msgid "Connection problem"
 msgstr "Problema na conexão"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2701
+#: ../libpurple/protocols/yahoo/yahoo.c:2708
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
@@ -12674,7 +13020,7 @@
 "A conexão com %s foi perdida:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2726
+#: ../libpurple/protocols/yahoo/yahoo.c:2733
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
@@ -12683,112 +13029,103 @@
 "Não foi possível estabelecer conexão com %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3081
-#: ../libpurple/protocols/yahoo/yahoo.c:3767
+#: ../libpurple/protocols/yahoo/yahoo.c:3092
+#: ../libpurple/protocols/yahoo/yahoo.c:3778
 msgid "Not at Home"
 msgstr "Fora de casa"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3083
-#: ../libpurple/protocols/yahoo/yahoo.c:3770
+#: ../libpurple/protocols/yahoo/yahoo.c:3094
+#: ../libpurple/protocols/yahoo/yahoo.c:3781
 msgid "Not at Desk"
 msgstr "Não estou por perto"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3085
-#: ../libpurple/protocols/yahoo/yahoo.c:3773
+#: ../libpurple/protocols/yahoo/yahoo.c:3096
+#: ../libpurple/protocols/yahoo/yahoo.c:3784
 msgid "Not in Office"
 msgstr "Fora do escritório"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3089
-#: ../libpurple/protocols/yahoo/yahoo.c:3779
+#: ../libpurple/protocols/yahoo/yahoo.c:3100
+#: ../libpurple/protocols/yahoo/yahoo.c:3790
 msgid "On Vacation"
 msgstr "De férias"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3093
-#: ../libpurple/protocols/yahoo/yahoo.c:3785
+#: ../libpurple/protocols/yahoo/yahoo.c:3104
+#: ../libpurple/protocols/yahoo/yahoo.c:3796
 msgid "Stepped Out"
 msgstr "Fui embora"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3186
-#: ../libpurple/protocols/yahoo/yahoo.c:3216
+#: ../libpurple/protocols/yahoo/yahoo.c:3197
+#: ../libpurple/protocols/yahoo/yahoo.c:3227
 msgid "Not on server list"
 msgstr "Não está na lista do servidor"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3233
-#: ../libpurple/protocols/yahoo/yahoo.c:3291
+#: ../libpurple/protocols/yahoo/yahoo.c:3244
+#: ../libpurple/protocols/yahoo/yahoo.c:3302
 msgid "Appear Online"
 msgstr "Parecer desconectado"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3236
-#: ../libpurple/protocols/yahoo/yahoo.c:3312
+#: ../libpurple/protocols/yahoo/yahoo.c:3247
+#: ../libpurple/protocols/yahoo/yahoo.c:3323
 msgid "Appear Permanently Offline"
 msgstr "Parecer desconectado permanentemente"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3254
+#: ../libpurple/protocols/yahoo/yahoo.c:3265
 msgid "Presence"
 msgstr "Presença"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3297
+#: ../libpurple/protocols/yahoo/yahoo.c:3308
 msgid "Appear Offline"
 msgstr "Parecer desconectado"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3306
+#: ../libpurple/protocols/yahoo/yahoo.c:3317
 msgid "Don't Appear Permanently Offline"
 msgstr "Não aparecer permanentemente desconectado"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3354
+#: ../libpurple/protocols/yahoo/yahoo.c:3365
 msgid "Join in Chat"
 msgstr "Entrar em um bate-papo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3360
+#: ../libpurple/protocols/yahoo/yahoo.c:3371
 msgid "Initiate Conference"
 msgstr "Iniciar conferência"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3388
+#: ../libpurple/protocols/yahoo/yahoo.c:3399
 msgid "Presence Settings"
 msgstr "Configurações de presença"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3394
+#: ../libpurple/protocols/yahoo/yahoo.c:3405
 msgid "Start Doodling"
 msgstr "Começar a desenhar"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3495
+#: ../libpurple/protocols/yahoo/yahoo.c:3506
 msgid "Activate which ID?"
 msgstr "Ativar qual ID?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3506
-msgid "Join whom in chat?"
+#: ../libpurple/protocols/yahoo/yahoo.c:3517
+msgid "Join who in chat?"
 msgstr "Juntar-se a quem no bate-papo?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3518
+#: ../libpurple/protocols/yahoo/yahoo.c:3529
 msgid "Activate ID..."
 msgstr "Ativar ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3522
+#: ../libpurple/protocols/yahoo/yahoo.c:3533
 msgid "Join User in Chat..."
 msgstr "Ingressar usuário no bate-papo..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3527
+#: ../libpurple/protocols/yahoo/yahoo.c:3538
 msgid "Open Inbox"
 msgstr "Abrir caixa de entrada"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4119
-msgid "Buzz"
-msgstr "Chamar a atenção"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4121
-#, c-format
-msgid "Buzzing %s..."
-msgstr "Chamando a atenção de %s..."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4136
+#: ../libpurple/protocols/yahoo/yahoo.c:4147
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join &lt;sala&gt;:  Entra numa sala de bate-papo na rede do Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4141
+#: ../libpurple/protocols/yahoo/yahoo.c:4152
 msgid "list: List rooms on the Yahoo network"
 msgstr "list: Lista as salas desta rede do Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4149
+#: ../libpurple/protocols/yahoo/yahoo.c:4160
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Pede ao usuário para iniciar uma sessão para desenhar"
 
@@ -12802,56 +13139,56 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4358
-#: ../libpurple/protocols/yahoo/yahoo.c:4360
+#: ../libpurple/protocols/yahoo/yahoo.c:4369
+#: ../libpurple/protocols/yahoo/yahoo.c:4371
 msgid "Yahoo Protocol Plugin"
 msgstr "Plugin do protocolo Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4383
+#: ../libpurple/protocols/yahoo/yahoo.c:4394
 msgid "Yahoo Japan"
 msgstr "Yahoo Japão"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4386
+#: ../libpurple/protocols/yahoo/yahoo.c:4397
 msgid "Pager server"
 msgstr "Servidor do pager"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4389
+#: ../libpurple/protocols/yahoo/yahoo.c:4400
 msgid "Japan Pager server"
 msgstr "Servidor japonês do pager"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4392
+#: ../libpurple/protocols/yahoo/yahoo.c:4403
 msgid "Pager port"
 msgstr "Porta do pager"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4395
+#: ../libpurple/protocols/yahoo/yahoo.c:4406
 msgid "File transfer server"
 msgstr "Servidor de transferência de arquivo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4398
+#: ../libpurple/protocols/yahoo/yahoo.c:4409
 msgid "Japan file transfer server"
 msgstr "Servidor japonês de transferência de arquivo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4401
+#: ../libpurple/protocols/yahoo/yahoo.c:4412
 msgid "File transfer port"
 msgstr "Porta da transferência de arquivo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4404
+#: ../libpurple/protocols/yahoo/yahoo.c:4415
 msgid "Chat room locale"
 msgstr "Locale da sala de bate-papo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4407
+#: ../libpurple/protocols/yahoo/yahoo.c:4418
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignorar convites para bate-papos e conferências"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4415
+#: ../libpurple/protocols/yahoo/yahoo.c:4426
 msgid "Chat room list URL"
 msgstr "URL da lista de salas de bate-papo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4418
+#: ../libpurple/protocols/yahoo/yahoo.c:4429
 msgid "Yahoo Chat server"
 msgstr "Servidor de bate-papo do Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4421
+#: ../libpurple/protocols/yahoo/yahoo.c:4432
 msgid "Yahoo Chat port"
 msgstr "Porta de bate-papo do Yahoo"
 
@@ -12868,7 +13205,6 @@
 msgid "Unable to establish file descriptor."
 msgstr "Não foi possível estabelecer descritor de arquivo."
 
-#. TODO: what to do here - do we really have to disconnect?
 #: ../libpurple/protocols/yahoo/yahoo_packet.c:307
 msgid "Write Error"
 msgstr "Erro ao enviar"
@@ -13039,11 +13375,11 @@
 msgid "User Rooms"
 msgstr "Salas de usuário"
 
-#: ../libpurple/protocols/yahoo/ycht.c:456
+#: ../libpurple/protocols/yahoo/ycht.c:457
 msgid "Connection problem with the YCHT server."
 msgstr "Problema na conexão ao servidor YCHT."
 
-#: ../libpurple/protocols/yahoo/ycht.c:475
+#: ../libpurple/protocols/yahoo/ycht.c:476
 #, c-format
 msgid ""
 "Lost connection with server\n"
@@ -13216,8 +13552,8 @@
 msgid "Exposure"
 msgstr "Exposição"
 
-#: ../libpurple/proxy.c:459 ../libpurple/proxy.c:894 ../libpurple/proxy.c:1049
-#: ../libpurple/proxy.c:1617
+#: ../libpurple/proxy.c:461 ../libpurple/proxy.c:902 ../libpurple/proxy.c:1061
+#: ../libpurple/proxy.c:1632
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -13226,47 +13562,61 @@
 "Não foi possível criar socket\n"
 "%s"
 
-#: ../libpurple/proxy.c:659
+#: ../libpurple/proxy.c:662
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s\n"
 msgstr "Não foi possível interpretar resposta do proxy HTTP: %s\n"
 
-#: ../libpurple/proxy.c:698 ../libpurple/proxy.c:744 ../libpurple/proxy.c:780
-#: ../libpurple/proxy.c:792
+#: ../libpurple/proxy.c:702 ../libpurple/proxy.c:750 ../libpurple/proxy.c:786
+#: ../libpurple/proxy.c:798
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Erro de conexão do proxy HTTP %d"
 
-#: ../libpurple/proxy.c:788
+#: ../libpurple/proxy.c:794
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
 msgstr ""
 "Acesso negado: o servidor proxy HTTP não permite o tunelamento da porta %d."
 
-#: ../libpurple/proxy.c:1012
+#: ../libpurple/proxy.c:1022
 #, c-format
 msgid "Error resolving %s"
 msgstr "Erro ao resolver %s"
 
-#: ../libpurple/proxy.c:1714
+#: ../libpurple/proxy.c:1730
 msgid "Could not resolve host name"
 msgstr "Não foi possível resolver host"
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
+#. *
+#. * @since 2.3.0
 #.
-#: ../libpurple/request.h:1378
+#. *
+#. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
+#. *
+#. * @deprecated Please use purple_request_yes_no_with_hint instead.
+#.
+#: ../libpurple/request.h:1802 ../libpurple/request.h:1815
 msgid "_Yes"
 msgstr "_Sim"
 
-#: ../libpurple/request.h:1378
+#: ../libpurple/request.h:1802 ../libpurple/request.h:1815
 msgid "_No"
 msgstr "_Não"
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
+#. *
+#. * @since 2.3.0
 #.
-#: ../libpurple/request.h:1398
+#. *
+#. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
+#. *
+#. * @deprecated Please use purple_request_accept_cancel_with_hint instead.
+#.
+#: ../libpurple/request.h:1854 ../libpurple/request.h:1867
 msgid "_Accept"
 msgstr "_Aceitar"
 
@@ -13296,7 +13646,7 @@
 msgid "%s has requested your attention!"
 msgstr "%s chamou sua atenção!"
 
-#: ../libpurple/server.c:796
+#: ../libpurple/server.c:793
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -13305,12 +13655,12 @@
 "%s convidou %s para a sala de bate-papo %s:\n"
 "%s"
 
-#: ../libpurple/server.c:801
+#: ../libpurple/server.c:798
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s convidou %s para a sala de bate-papo %s\n"
 
-#: ../libpurple/server.c:805
+#: ../libpurple/server.c:802
 msgid "Accept chat invitation?"
 msgstr "Aceitar convite para bate-papo?"
 
@@ -13334,7 +13684,8 @@
 msgid "Unset"
 msgstr "Redefinir"
 
-#: ../libpurple/status.c:156 ../pidgin/gtkstatusbox.c:1059
+#: ../libpurple/status.c:156 ../pidgin/gtkdocklet.c:553
+#: ../pidgin/gtkstatusbox.c:1059
 msgid "Do not disturb"
 msgstr "Não perturbe"
 
@@ -13346,52 +13697,71 @@
 msgid "Mobile"
 msgstr "Móvel"
 
-#: ../libpurple/status.c:609
+#: ../libpurple/status.c:161
+msgid "Listening to music"
+msgstr "Escutando música"
+
+#: ../libpurple/status.c:610
 #, c-format
 msgid "%s changed status from %s to %s"
 msgstr "%s mudou o tópico de %s para %s"
 
-#: ../libpurple/status.c:619
+#: ../libpurple/status.c:613
+#, c-format
+msgid "%s (%s) changed status from %s to %s"
+msgstr "%s (%s) mudou o tópico de %s para %s"
+
+#: ../libpurple/status.c:624
 #, c-format
 msgid "%s is now %s"
 msgstr "%s agora é %s"
 
-#: ../libpurple/status.c:624
+#: ../libpurple/status.c:626
+#, c-format
+msgid "%s (%s) is now %s"
+msgstr "%s (%s) agora é %s"
+
+#: ../libpurple/status.c:632
 #, c-format
 msgid "%s is no longer %s"
 msgstr "%s não é mais %s"
 
-#: ../libpurple/status.c:1234
+#: ../libpurple/status.c:634
+#, c-format
+msgid "%s (%s) is no longer %s"
+msgstr "%s (%s) não é mais %s"
+
+#: ../libpurple/status.c:1247
 #, c-format
 msgid "%s became idle"
 msgstr "%s tornou-se inativo"
 
-#: ../libpurple/status.c:1251
+#: ../libpurple/status.c:1264
 #, c-format
 msgid "%s became unidle"
 msgstr "%s voltou da inatividade"
 
-#: ../libpurple/status.c:1314
+#: ../libpurple/status.c:1327
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s tornou-se inativo"
 
-#: ../libpurple/status.c:1316
+#: ../libpurple/status.c:1329
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s voltou da inatividade"
 
-#: ../libpurple/util.c:718
+#: ../libpurple/util.c:721
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2722
+#: ../libpurple/util.c:2783
 #, c-format
 msgid "Error Reading %s"
 msgstr "Erro ao ler %s"
 
-#: ../libpurple/util.c:2723
+#: ../libpurple/util.c:2784
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -13400,67 +13770,67 @@
 "Um erro foi encontrado ao processar sua %s. Eles(as) não foram carregados"
 "(as), e o antigo arquivo foi movido para %s~."
 
-#: ../libpurple/util.c:3223
+#: ../libpurple/util.c:3281
 msgid "Calculating..."
 msgstr "Calculando..."
 
-#: ../libpurple/util.c:3226
+#: ../libpurple/util.c:3284
 msgid "Unknown."
 msgstr "Desconhecido."
 
-#: ../libpurple/util.c:3252
+#: ../libpurple/util.c:3310
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: ../libpurple/util.c:3264
+#: ../libpurple/util.c:3322
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dia"
 msgstr[1] "%d dias"
 
-#: ../libpurple/util.c:3272
+#: ../libpurple/util.c:3330
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d hora"
 msgstr[1] "%s, %d horas"
 
-#: ../libpurple/util.c:3278
+#: ../libpurple/util.c:3336
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: ../libpurple/util.c:3286
+#: ../libpurple/util.c:3344
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minuto"
 msgstr[1] "%s, %d minutos"
 
-#: ../libpurple/util.c:3292
+#: ../libpurple/util.c:3350
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: ../libpurple/util.c:3552
+#: ../libpurple/util.c:3610
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr "Não foi possível abrir %s: Número excessivo de redirecionamentos"
 
-#: ../libpurple/util.c:3589 ../libpurple/util.c:3885
+#: ../libpurple/util.c:3647 ../libpurple/util.c:3943
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Não foi possível conectar a %s"
 
-#: ../libpurple/util.c:3712
+#: ../libpurple/util.c:3770
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
@@ -13469,17 +13839,17 @@
 "Não foi possível alocar memória suficiente para guardar o conteúdo de %s. O "
 "servidor da web pode estar tentando alguma operação mal-intencionada."
 
-#: ../libpurple/util.c:3747
+#: ../libpurple/util.c:3805
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Erro ao ler de %s: %s"
 
-#: ../libpurple/util.c:3778
+#: ../libpurple/util.c:3836
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Erro ao gravar em %s: %s"
 
-#: ../libpurple/util.c:3803
+#: ../libpurple/util.c:3861
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Não foi possível conectar a %s: %s"
@@ -13496,80 +13866,80 @@
 msgid "Send instant messages over multiple protocols"
 msgstr "Envie mensagens instantâneas através de múltiplos protocolos"
 
-#: ../pidgin/eggtrayicon.c:129
+#: ../pidgin/eggtrayicon.c:128
 msgid "Orientation"
 msgstr "Orientação"
 
-#: ../pidgin/eggtrayicon.c:130
+#: ../pidgin/eggtrayicon.c:129
 msgid "The orientation of the tray."
 msgstr "A orientação da bandeja"
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:407
+#: ../pidgin/gtkaccount.c:410
 msgid "Login Options"
 msgstr "Opções de conexão"
 
-#: ../pidgin/gtkaccount.c:428
+#: ../pidgin/gtkaccount.c:431
 msgid "Pro_tocol:"
 msgstr "Pro_tocolo:"
 
-#: ../pidgin/gtkaccount.c:439
+#: ../pidgin/gtkaccount.c:442
 msgid "Screen _name:"
 msgstr "_Nome de usuário:"
 
-#: ../pidgin/gtkaccount.c:529
+#: ../pidgin/gtkaccount.c:532
 msgid "_Local alias:"
 msgstr "Apelido _local:"
 
-#: ../pidgin/gtkaccount.c:533
+#: ../pidgin/gtkaccount.c:536
 msgid "Remember pass_word"
 msgstr "Lembrar _senha"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:591
+#: ../pidgin/gtkaccount.c:594
 msgid "User Options"
 msgstr "Opções do usuário"
 
-#: ../pidgin/gtkaccount.c:604
+#: ../pidgin/gtkaccount.c:607
 msgid "New _mail notifications"
 msgstr "Notificar ao receber novos e_mails"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:609
+#: ../pidgin/gtkaccount.c:612
 msgid "Use this buddy _icon for this account:"
 msgstr "Usar este _ícone de exibição para esta conta:"
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:731
+#: ../pidgin/gtkaccount.c:734
 #, c-format
 msgid "%s Options"
 msgstr "Opções de %s"
 
-#: ../pidgin/gtkaccount.c:936
+#: ../pidgin/gtkaccount.c:939
 msgid "Use GNOME Proxy Settings"
 msgstr "Usar configurações de proxy do GNOME"
 
-#: ../pidgin/gtkaccount.c:937
+#: ../pidgin/gtkaccount.c:940
 msgid "Use Global Proxy Settings"
 msgstr "Usar configuração global de proxy"
 
-#: ../pidgin/gtkaccount.c:943
+#: ../pidgin/gtkaccount.c:946
 msgid "No Proxy"
 msgstr "Nenhum proxy"
 
-#: ../pidgin/gtkaccount.c:949
+#: ../pidgin/gtkaccount.c:952
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:955
+#: ../pidgin/gtkaccount.c:958
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:961
+#: ../pidgin/gtkaccount.c:964
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1211
+#: ../pidgin/gtkaccount.c:970 ../pidgin/gtkprefs.c:1283
 msgid "Use Environmental Settings"
 msgstr "Usar configurações do ambiente"
 
@@ -13578,72 +13948,72 @@
 #. A) your network is really slow and you have nothing better to do than
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
-#: ../pidgin/gtkaccount.c:1006
+#: ../pidgin/gtkaccount.c:1009
 msgid "If you look real closely"
 msgstr "Se você olhar bem de perto"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:1009
+#: ../pidgin/gtkaccount.c:1012
 msgid "you can see the butterflies mating"
 msgstr "você pode ver as borboletas acasalando-se"
 
-#: ../pidgin/gtkaccount.c:1030
+#: ../pidgin/gtkaccount.c:1033
 msgid "Proxy Options"
 msgstr "Opções de proxy"
 
-#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1205
+#: ../pidgin/gtkaccount.c:1047 ../pidgin/gtkprefs.c:1277
 msgid "Proxy _type:"
 msgstr "_Tipo de proxy:"
 
-#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1226
+#: ../pidgin/gtkaccount.c:1056 ../pidgin/gtkprefs.c:1298
 msgid "_Host:"
 msgstr "_Host:"
 
-#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1244
+#: ../pidgin/gtkaccount.c:1060 ../pidgin/gtkprefs.c:1316
 msgid "_Port:"
 msgstr "_Porta:"
 
-#: ../pidgin/gtkaccount.c:1065
+#: ../pidgin/gtkaccount.c:1068
 msgid "_Username:"
 msgstr "_Nome de usuário:"
 
-#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1281
+#: ../pidgin/gtkaccount.c:1075 ../pidgin/gtkprefs.c:1353
 msgid "Pa_ssword:"
 msgstr "_Senha:"
 
-#: ../pidgin/gtkaccount.c:1195
+#: ../pidgin/gtkaccount.c:1199
 msgid "Unable to save new account"
 msgstr "Não foi possível salvar nova conta"
 
-#: ../pidgin/gtkaccount.c:1196
+#: ../pidgin/gtkaccount.c:1200
 msgid "An account already exists with the specified criteria."
 msgstr "Já existe uma conta com os atributos especificados."
 
-#: ../pidgin/gtkaccount.c:1473
+#: ../pidgin/gtkaccount.c:1478
 msgid "Add Account"
 msgstr "Adicionar conta"
 
-#: ../pidgin/gtkaccount.c:1492
+#: ../pidgin/gtkaccount.c:1497
 msgid "_Basic"
 msgstr "_Básico"
 
-#: ../pidgin/gtkaccount.c:1499
+#: ../pidgin/gtkaccount.c:1504
 msgid "Create this new account on the server"
 msgstr "Criar esta nova conta no servidor"
 
-#: ../pidgin/gtkaccount.c:1515
+#: ../pidgin/gtkaccount.c:1520
 msgid "_Advanced"
 msgstr "_Avançado"
 
-#: ../pidgin/gtkaccount.c:1973 ../pidgin/gtkplugin.c:569
+#: ../pidgin/gtkaccount.c:1978 ../pidgin/gtkplugin.c:595
 msgid "Enabled"
 msgstr "Ativado"
 
-#: ../pidgin/gtkaccount.c:2001
+#: ../pidgin/gtkaccount.c:2006
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: ../pidgin/gtkaccount.c:2201
+#: ../pidgin/gtkaccount.c:2207
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -13667,11 +14037,29 @@
 "Você pode voltar a esta janela para adicionar, alterar ou remover contas a "
 "partir do menu <b>Contas->Adicionar/Editar</b> na janela da Lista de Amigos"
 
-#: ../pidgin/gtkblist.c:767
-msgid "Join a Chat"
-msgstr "Entrar em um bate-papo"
-
-#: ../pidgin/gtkblist.c:788
+#: ../pidgin/gtkblist.c:543
+#, c-format
+msgid "You have %d contact named %s. Would you like to merge them?"
+msgid_plural ""
+"You currently have %d contacts named %s. Would you like to merge them?"
+msgstr[0] "Você tem %d contato chamado %s. Você gostaria de juntá-lo?"
+msgstr[1] "Você tem %d contatos chamados %s. Você gostaria de juntá-los?"
+
+#: ../pidgin/gtkblist.c:544
+msgid ""
+"Merging these contacts will cause them to share a single entry on the buddy "
+"list and use a single conversation window. You can separate them again by "
+"choosing 'Expand' from the contact's context menu"
+msgstr ""
+"Juntar estes contatos fará com que eles compartilhem uma única entrada na "
+"lista de amigos e que usem uma única janela de conversa. Você pode separá-"
+"los novamente escolhendo \"Expandir\" no menu de contexto do contato"
+
+#: ../pidgin/gtkblist.c:546
+msgid "_Merge"
+msgstr "_Juntar"
+
+#: ../pidgin/gtkblist.c:961
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
@@ -13679,233 +14067,246 @@
 "Por favor digite as informações apropriadas sobre o bate-papo em que você "
 "gostaria de entrar.\n"
 
-#. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:799 ../pidgin/gtkblist.c:5530
-#: ../pidgin/gtkblist.c:5893 ../pidgin/gtkpounce.c:539
-#: ../pidgin/gtkroomlist.c:396
+#: ../pidgin/gtkblist.c:972 ../pidgin/gtkblist.c:6599
+#: ../pidgin/gtkpounce.c:554 ../pidgin/gtkroomlist.c:709
 msgid "_Account:"
 msgstr "_Conta:"
 
-#: ../pidgin/gtkblist.c:1088 ../pidgin/gtkprivacy.c:603
-#: ../pidgin/gtkprivacy.c:617
+#: ../pidgin/gtkblist.c:1261 ../pidgin/gtkprivacy.c:605
+#: ../pidgin/gtkprivacy.c:619
 msgid "_Block"
 msgstr "_Bloquear"
 
-#: ../pidgin/gtkblist.c:1088
+#: ../pidgin/gtkblist.c:1261
 msgid "Un_block"
 msgstr "Des_bloquear"
 
-#: ../pidgin/gtkblist.c:1139
+#: ../pidgin/gtkblist.c:1304
+msgid "Move to"
+msgstr "Mover para"
+
+#: ../pidgin/gtkblist.c:1344
 msgid "Get _Info"
 msgstr "Ver _info"
 
-#: ../pidgin/gtkblist.c:1142 ../pidgin/pidginstock.c:90
+#: ../pidgin/gtkblist.c:1347 ../pidgin/pidginstock.c:90
 msgid "I_M"
 msgstr "_MI"
 
-#: ../pidgin/gtkblist.c:1148
-#, fuzzy
-msgid "_Send File"
-msgstr "Enviar arquivo"
-
-#: ../pidgin/gtkblist.c:1155
-msgid "Add Buddy _Pounce"
-msgstr "Adicionar ação de _usuário"
-
-#: ../pidgin/gtkblist.c:1160 ../pidgin/gtkblist.c:1164
-#: ../pidgin/gtkblist.c:1269 ../pidgin/gtkblist.c:1292
+#: ../pidgin/gtkblist.c:1353
+msgid "_Send File..."
+msgstr "_Enviar arquivo..."
+
+#: ../pidgin/gtkblist.c:1360
+msgid "Add Buddy _Pounce..."
+msgstr "Adicionar _ação de usuário..."
+
+#: ../pidgin/gtkblist.c:1365 ../pidgin/gtkblist.c:1369
+#: ../pidgin/gtkblist.c:1484 ../pidgin/gtkblist.c:1507
 msgid "View _Log"
-msgstr "Ver _log"
-
-#: ../pidgin/gtkblist.c:1177 ../pidgin/gtkblist.c:1186
-#: ../pidgin/gtkblist.c:1277 ../pidgin/gtkblist.c:1298
+msgstr "Ver _histórico"
+
+#: ../pidgin/gtkblist.c:1375
+msgid "Hide when offline"
+msgstr "Esconder quando desconectado"
+
+#: ../pidgin/gtkblist.c:1375
+msgid "Show when offline"
+msgstr "Mostrar quando desconectado"
+
+#: ../pidgin/gtkblist.c:1389 ../pidgin/gtkblist.c:1398
+#: ../pidgin/gtkblist.c:1492 ../pidgin/gtkblist.c:1513
 msgid "_Alias..."
 msgstr "_Apelidar..."
 
-#: ../pidgin/gtkblist.c:1180 ../pidgin/gtkblist.c:1188
-#: ../pidgin/gtkblist.c:1279 ../pidgin/gtkblist.c:1300
+#: ../pidgin/gtkblist.c:1392 ../pidgin/gtkblist.c:1400
+#: ../pidgin/gtkblist.c:1494 ../pidgin/gtkblist.c:1515
 msgid "_Remove"
 msgstr "_Remover"
 
-#: ../pidgin/gtkblist.c:1238
-msgid "Add a _Buddy"
-msgstr "Adicionar um _amigo"
-
-#: ../pidgin/gtkblist.c:1241
-msgid "Add a C_hat"
-msgstr "Adicionar um c_hat"
-
-#: ../pidgin/gtkblist.c:1244
+#: ../pidgin/gtkblist.c:1450
+msgid "Add _Buddy..."
+msgstr "Adicionar a_migo..."
+
+#: ../pidgin/gtkblist.c:1453
+msgid "Add C_hat..."
+msgstr "Adicionar _bate-papo..."
+
+#: ../pidgin/gtkblist.c:1456
 msgid "_Delete Group"
 msgstr "_Remover grupo"
 
-#: ../pidgin/gtkblist.c:1246
+#: ../pidgin/gtkblist.c:1458
 msgid "_Rename"
 msgstr "_Renomear"
 
 #. join button
-#: ../pidgin/gtkblist.c:1265 ../pidgin/gtkroomlist.c:307
-#: ../pidgin/gtkroomlist.c:460 ../pidgin/pidginstock.c:88
+#: ../pidgin/gtkblist.c:1478 ../pidgin/gtkroomlist.c:316
+#: ../pidgin/gtkroomlist.c:773 ../pidgin/pidginstock.c:88
 msgid "_Join"
 msgstr "_Entrar"
 
-#: ../pidgin/gtkblist.c:1267
+#: ../pidgin/gtkblist.c:1480
 msgid "Auto-Join"
 msgstr "Entrar automaticamente"
 
-#: ../pidgin/gtkblist.c:1305 ../pidgin/gtkblist.c:1329
+#: ../pidgin/gtkblist.c:1482
+msgid "Persistent"
+msgstr "Persistente"
+
+#: ../pidgin/gtkblist.c:1520 ../pidgin/gtkblist.c:1543
 msgid "_Collapse"
 msgstr "Re_colher"
 
-#: ../pidgin/gtkblist.c:1334
+#: ../pidgin/gtkblist.c:1548
 msgid "_Expand"
 msgstr "_Expandir"
 
-#: ../pidgin/gtkblist.c:1585 ../pidgin/gtkblist.c:1597
-#: ../pidgin/gtkblist.c:4603 ../pidgin/gtkblist.c:4616
+#: ../pidgin/gtkblist.c:1799 ../pidgin/gtkblist.c:1811
+#: ../pidgin/gtkblist.c:5264 ../pidgin/gtkblist.c:5277
 msgid "/Tools/Mute Sounds"
 msgstr "/Ferramentas/Não tocar sons"
 
-#: ../pidgin/gtkblist.c:2057 ../pidgin/gtkconv.c:4840
-#: ../pidgin/gtkpounce.c:430
+#: ../pidgin/gtkblist.c:2271 ../pidgin/gtkconv.c:4922
+#: ../pidgin/gtkpounce.c:437
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
 "Você não está conectado com uma conta que permita adicionar este amigo."
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2869
+#: ../pidgin/gtkblist.c:3103
 msgid "/_Buddies"
 msgstr "/_Amigos"
 
-#: ../pidgin/gtkblist.c:2870
+#: ../pidgin/gtkblist.c:3104
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Amigos/Nova _mensagem instantânea..."
 
-#: ../pidgin/gtkblist.c:2871
+#: ../pidgin/gtkblist.c:3105
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Amigos/Entrar em um _bate-papo..."
 
-#: ../pidgin/gtkblist.c:2872
+#: ../pidgin/gtkblist.c:3106
 msgid "/Buddies/Get User _Info..."
 msgstr "/Amigos/Ver _informações do usuário..."
 
-#: ../pidgin/gtkblist.c:2873
+#: ../pidgin/gtkblist.c:3107
 msgid "/Buddies/View User _Log..."
-msgstr "/Amigos/Ver _log do usuário..."
-
-#: ../pidgin/gtkblist.c:2875
-msgid "/Buddies/Show"
-msgstr "/Amigos/Exibir"
-
-#: ../pidgin/gtkblist.c:2876
+msgstr "/Amigos/Ver _histórico do usuário..."
+
+#: ../pidgin/gtkblist.c:3109
+msgid "/Buddies/Sh_ow"
+msgstr "/Amigos/E_xibir"
+
+#: ../pidgin/gtkblist.c:3110
 msgid "/Buddies/Show/_Offline Buddies"
 msgstr "/Amigos/Exibir/Amig_os desconectados"
 
-#: ../pidgin/gtkblist.c:2877
+#: ../pidgin/gtkblist.c:3111
 msgid "/Buddies/Show/_Empty Groups"
 msgstr "/Amigos/Exibir/Grupos _vazios"
 
-#: ../pidgin/gtkblist.c:2878
+#: ../pidgin/gtkblist.c:3112
 msgid "/Buddies/Show/Buddy _Details"
 msgstr "/Amigos/Exibir/_Detalhes do amigo"
 
-#: ../pidgin/gtkblist.c:2879
+#: ../pidgin/gtkblist.c:3113
 msgid "/Buddies/Show/Idle _Times"
 msgstr "/Amigos/Exibir/_Tempos de inatividade"
 
-#: ../pidgin/gtkblist.c:2880
+#: ../pidgin/gtkblist.c:3114
 msgid "/Buddies/Show/_Protocol Icons"
 msgstr "/Amigos/Exibir/Ícones de _protocolo"
 
-#: ../pidgin/gtkblist.c:2881
+#: ../pidgin/gtkblist.c:3115
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Amigos/Ordenar amigo_s"
 
-#: ../pidgin/gtkblist.c:2883
+#: ../pidgin/gtkblist.c:3117
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Amigos/_Adicionar amigo..."
 
-#: ../pidgin/gtkblist.c:2884
+#: ../pidgin/gtkblist.c:3118
 msgid "/Buddies/Add C_hat..."
 msgstr "/Amigos/Adicionar bate-_papo..."
 
-#: ../pidgin/gtkblist.c:2885
+#: ../pidgin/gtkblist.c:3119
 msgid "/Buddies/Add _Group..."
 msgstr "/Amigos/Adicionar _grupo..."
 
-#: ../pidgin/gtkblist.c:2887
+#: ../pidgin/gtkblist.c:3121
 msgid "/Buddies/_Quit"
 msgstr "/Amigos/_Sair"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2890
+#: ../pidgin/gtkblist.c:3124
 msgid "/_Accounts"
 msgstr "/_Contas"
 
-#: ../pidgin/gtkblist.c:2891 ../pidgin/gtkblist.c:6589
-msgid "/Accounts/Add\\/Edit"
-msgstr "/Contas/Adicionar\\/Editar"
+#: ../pidgin/gtkblist.c:3125 ../pidgin/gtkblist.c:7301
+msgid "/Accounts/Manage"
+msgstr "/Contas/Gerenciar"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2894
+#: ../pidgin/gtkblist.c:3128
 msgid "/_Tools"
 msgstr "/_Ferramentas"
 
-#: ../pidgin/gtkblist.c:2895
+#: ../pidgin/gtkblist.c:3129
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Ferramentas/Ações de _usuário"
 
-#: ../pidgin/gtkblist.c:2896
+#: ../pidgin/gtkblist.c:3130
 msgid "/Tools/_Certificates"
 msgstr "/Ferramentas/_Certificados"
 
-#: ../pidgin/gtkblist.c:2897
+#: ../pidgin/gtkblist.c:3131
 msgid "/Tools/Plu_gins"
 msgstr "/Ferramentas/Plu_gins"
 
-#: ../pidgin/gtkblist.c:2898
+#: ../pidgin/gtkblist.c:3132
 msgid "/Tools/Pr_eferences"
 msgstr "/Ferramentas/Pr_eferências"
 
-#: ../pidgin/gtkblist.c:2899
+#: ../pidgin/gtkblist.c:3133
 msgid "/Tools/Pr_ivacy"
 msgstr "/Ferramentas/Pr_ivacidade"
 
-#: ../pidgin/gtkblist.c:2901
+#: ../pidgin/gtkblist.c:3135
 msgid "/Tools/_File Transfers"
 msgstr "/Ferramentas/Transferências de arquivo"
 
-#: ../pidgin/gtkblist.c:2902
+#: ../pidgin/gtkblist.c:3136
 msgid "/Tools/R_oom List"
 msgstr "/Ferramentas/_Lista de salas"
 
-#: ../pidgin/gtkblist.c:2903
+#: ../pidgin/gtkblist.c:3137
 msgid "/Tools/System _Log"
 msgstr "/Ferramentas/Log do _sistema"
 
-#: ../pidgin/gtkblist.c:2905
+#: ../pidgin/gtkblist.c:3139
 msgid "/Tools/Mute _Sounds"
 msgstr "/Ferramentas/Não tocar sons"
 
 #. Help
-#: ../pidgin/gtkblist.c:2907
+#: ../pidgin/gtkblist.c:3141
 msgid "/_Help"
 msgstr "/_Ajuda"
 
-#: ../pidgin/gtkblist.c:2908
+#: ../pidgin/gtkblist.c:3142
 msgid "/Help/Online _Help"
 msgstr "/Ajuda/_Ajuda online"
 
-#: ../pidgin/gtkblist.c:2909
+#: ../pidgin/gtkblist.c:3143
 msgid "/Help/_Debug Window"
 msgstr "/Ajuda/Janela de _depuração"
 
-#: ../pidgin/gtkblist.c:2911 ../pidgin/gtkblist.c:2913
+#: ../pidgin/gtkblist.c:3145 ../pidgin/gtkblist.c:3147
 msgid "/Help/_About"
 msgstr "/Ajuda/_Sobre"
 
-#: ../pidgin/gtkblist.c:2942
+#: ../pidgin/gtkblist.c:3176
 #, c-format
 msgid ""
 "\n"
@@ -13914,167 +14315,188 @@
 "\n"
 "<b>Conta:</b> %s"
 
-#: ../pidgin/gtkblist.c:3020
+#: ../pidgin/gtkblist.c:3254
 msgid "Buddy Alias"
 msgstr "Apelido do amigo"
 
-#: ../pidgin/gtkblist.c:3049
+#: ../pidgin/gtkblist.c:3283
 msgid "Logged In"
 msgstr "Conectado"
 
-#: ../pidgin/gtkblist.c:3095
+#: ../pidgin/gtkblist.c:3329
 msgid "Last Seen"
 msgstr "Visto pela última vez em"
 
-#: ../pidgin/gtkblist.c:3116
+#: ../pidgin/gtkblist.c:3350
 msgid "Spooky"
 msgstr "Assustador"
 
-#: ../pidgin/gtkblist.c:3118
+#: ../pidgin/gtkblist.c:3352
 msgid "Awesome"
 msgstr "Impressionante"
 
-#: ../pidgin/gtkblist.c:3120
+#: ../pidgin/gtkblist.c:3354
 msgid "Rockin'"
 msgstr "Botando pra quebrar"
 
-#: ../pidgin/gtkblist.c:3453
+#: ../pidgin/gtkblist.c:3693
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "Inativo por %dd %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3455
+#: ../pidgin/gtkblist.c:3695
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Inativo por %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3457
+#: ../pidgin/gtkblist.c:3697
 #, c-format
 msgid "Idle %dm"
 msgstr "Inativo por %dm"
 
-#: ../pidgin/gtkblist.c:3602
+#: ../pidgin/gtkblist.c:3851
 msgid "/Buddies/New Instant Message..."
 msgstr "/Amigos/Nova mensagem instantânea..."
 
-#: ../pidgin/gtkblist.c:3603 ../pidgin/gtkblist.c:3636
+#: ../pidgin/gtkblist.c:3852 ../pidgin/gtkblist.c:3885
 msgid "/Buddies/Join a Chat..."
 msgstr "/Amigos/Entrar em um bate-papo..."
 
-#: ../pidgin/gtkblist.c:3604
+#: ../pidgin/gtkblist.c:3853
 msgid "/Buddies/Get User Info..."
 msgstr "/Amigos/Ver informações do usuário..."
 
-#: ../pidgin/gtkblist.c:3605
+#: ../pidgin/gtkblist.c:3854
 msgid "/Buddies/Add Buddy..."
 msgstr "/Amigos/Adicionar amigo..."
 
-#: ../pidgin/gtkblist.c:3606 ../pidgin/gtkblist.c:3639
+#: ../pidgin/gtkblist.c:3855 ../pidgin/gtkblist.c:3888
 msgid "/Buddies/Add Chat..."
 msgstr "/Amigos/Adicionar bate-papo..."
 
-#: ../pidgin/gtkblist.c:3607
+#: ../pidgin/gtkblist.c:3856
 msgid "/Buddies/Add Group..."
 msgstr "/Amigos/Adicionar grupo..."
 
-#: ../pidgin/gtkblist.c:3642
+#: ../pidgin/gtkblist.c:3891
 msgid "/Tools/Privacy"
 msgstr "/Ferramentas/Privacidade"
 
-#: ../pidgin/gtkblist.c:3645
+#: ../pidgin/gtkblist.c:3894
 msgid "/Tools/Room List"
 msgstr "/Ferramentas/Lista de salas"
 
-#: ../pidgin/gtkblist.c:3742 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:4026 ../pidgin/gtkdocklet.c:155
+#: ../pidgin/gtkdocklet.c:160
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d mensagem não lida de %s\n"
 msgstr[1] "%d mensagens não lidas de %s\n"
 
-#: ../pidgin/gtkblist.c:3822
+#: ../pidgin/gtkblist.c:4189
 msgid "Manually"
 msgstr "Manualmente"
 
-#: ../pidgin/gtkblist.c:3824
-msgid "Alphabetically"
-msgstr "Alfabeticamente"
-
-#: ../pidgin/gtkblist.c:3825
+#: ../pidgin/gtkblist.c:4192
 msgid "By status"
 msgstr "Por status"
 
-#: ../pidgin/gtkblist.c:3826
+#: ../pidgin/gtkblist.c:4193
 msgid "By log size"
-msgstr "Por tamanho do log"
-
-#: ../pidgin/gtkblist.c:4031 ../pidgin/gtkconn.c:179
+msgstr "Por tamanho do histórico"
+
+#: ../pidgin/gtkblist.c:4492
 #, c-format
 msgid "%s disconnected"
 msgstr "%s desconectado"
 
-#: ../pidgin/gtkblist.c:4067
-#, c-format
-msgid "<span color=\"red\">%s disconnected: %s</span>"
-msgstr "<span color=\"red\">%s desconectado: %s</span>"
-
-#: ../pidgin/gtkblist.c:4219
+#: ../pidgin/gtkblist.c:4494
+#, c-format
+msgid "%s disabled"
+msgstr "%s desativado"
+
+#: ../pidgin/gtkblist.c:4498
+msgid "Reconnect"
+msgstr "Reconectar"
+
+#: ../pidgin/gtkblist.c:4498 ../pidgin/gtkblist.c:4606
+msgid "Re-enable"
+msgstr "Re-ativar"
+
+#: ../pidgin/gtkblist.c:4502 ../pidgin/gtkblist.c:4609
+#: ../pidgin/gtkconv.c:1679
+msgid "Ignore"
+msgstr "Ignorar"
+
+#: ../pidgin/gtkblist.c:4633
+#, c-format
+msgid "%d account was disabled because you signed on from another location."
+msgid_plural ""
+"%d accounts were disabled because you signed on from another location."
+msgstr[0] ""
+"%d conta foi desconectada porque você está usando a mesma de outro local."
+msgstr[1] ""
+"%d contas foram desconectadas porque você está usando as mesmas de outro "
+"local."
+
+#: ../pidgin/gtkblist.c:4870
 msgid "<b>Username:</b>"
 msgstr "<b>Nome de usuário:</b>"
 
-#: ../pidgin/gtkblist.c:4226
+#: ../pidgin/gtkblist.c:4877
 msgid "<b>Password:</b>"
 msgstr "<b>Senha:</b>"
 
-#: ../pidgin/gtkblist.c:4237
+#: ../pidgin/gtkblist.c:4888
 msgid "_Login"
 msgstr "_Conectar"
 
-#: ../pidgin/gtkblist.c:4320
+#: ../pidgin/gtkblist.c:4973
 msgid "/Accounts"
 msgstr "/Contas"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4334
-#, fuzzy, c-format
+#: ../pidgin/gtkblist.c:4987
+#, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
 "\n"
 "You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
-"b> window at <b>Accounts->Add/Edit</b>. Once you enable accounts, you'll be "
+"b> window at <b>Accounts->Manage</b>. Once you enable accounts, you'll be "
 "able to sign on, set your status, and talk to your friends."
 msgstr ""
 "<span weight='bold' size='larger'>Bem vindo ao %s!</span>\n"
 "\n"
 "Você não tem contas ativadas. Ative suas contas de mensagem instantânea (MI) "
-"a partir da janela <b>Contas</b>, localizada em <b>Contas->Adicionar/Editar</"
-"b>. Depois de ativá-las, você poderá conectar, definir seu status e falar "
-"com seus amigos."
+"a partir da janela <b>Contas</b>, localizada em <b>Contas->Gerenciar</b>. "
+"Depois de ativá-las, você poderá conectar, definir seu status e falar com "
+"seus amigos."
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4597
+#: ../pidgin/gtkblist.c:5258
 msgid "/Buddies/Show/Offline Buddies"
 msgstr "/Amigos/Exibir/Amigos desconectados"
 
-#: ../pidgin/gtkblist.c:4600
+#: ../pidgin/gtkblist.c:5261
 msgid "/Buddies/Show/Empty Groups"
 msgstr "/Amigos/Exibir/Grupos vazios"
 
-#: ../pidgin/gtkblist.c:4606
+#: ../pidgin/gtkblist.c:5267
 msgid "/Buddies/Show/Buddy Details"
 msgstr "/Amigos/Exibir/Detalhes do amigo"
 
-#: ../pidgin/gtkblist.c:4609
+#: ../pidgin/gtkblist.c:5270
 msgid "/Buddies/Show/Idle Times"
 msgstr "/Amigos/Exibir/Tempos de inatividade"
 
-#: ../pidgin/gtkblist.c:4612
+#: ../pidgin/gtkblist.c:5273
 msgid "/Buddies/Show/Protocol Icons"
 msgstr "/Amigos/Exibir/Ícones de protocolo"
 
-#: ../pidgin/gtkblist.c:5507
+#: ../pidgin/gtkblist.c:6205
 msgid ""
 "Please enter the screen name of the person you would like to add to your "
 "buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
@@ -14085,20 +14507,25 @@
 "amigo. O apelido será exibido no lugar do nome do usuário sempre que "
 "possível.\n"
 
+#. Set up stuff for the account box
+#: ../pidgin/gtkblist.c:6228
+msgid "A_ccount:"
+msgstr "_Conta:"
+
 #. End of account box
-#: ../pidgin/gtkblist.c:5542
+#: ../pidgin/gtkblist.c:6240
 msgid "_Screen name:"
 msgstr "Nome de _usuário:"
 
-#: ../pidgin/gtkblist.c:5564 ../pidgin/gtkblist.c:5914
+#: ../pidgin/gtkblist.c:6262 ../pidgin/gtkblist.c:6620
 msgid "A_lias:"
 msgstr "Ape_lido:"
 
-#: ../pidgin/gtkblist.c:5826
+#: ../pidgin/gtkblist.c:6530
 msgid "This protocol does not support chat rooms."
 msgstr "Este protocolo não suporta salas de bate-papo."
 
-#: ../pidgin/gtkblist.c:5842
+#: ../pidgin/gtkblist.c:6546
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -14106,7 +14533,7 @@
 "Atualmente, você não está conectado em nenhum protocolo que possui o recurso "
 "de bate-papo."
 
-#: ../pidgin/gtkblist.c:5883
+#: ../pidgin/gtkblist.c:6589
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -14114,79 +14541,74 @@
 "Por favor digite um apelido, e as informações apropriadas sobre o bate-papo "
 "que você gostaria de adicionar à sua lista de amigos.\n"
 
-#: ../pidgin/gtkblist.c:5964
+#: ../pidgin/gtkblist.c:6648
+msgid "Autojoin when account becomes online."
+msgstr "Entrar automaticamente ao conectar."
+
+#: ../pidgin/gtkblist.c:6649
+msgid "Hide chat when the window is closed."
+msgstr "Esconder conversa quando a janela for fechada."
+
+#: ../pidgin/gtkblist.c:6675
 msgid "Please enter the name of the group to be added."
 msgstr "Por favor digite o nome do grupo a ser criado."
 
-#: ../pidgin/gtkblist.c:6609
+#: ../pidgin/gtkblist.c:7321
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Contas/"
 
-#: ../pidgin/gtkblist.c:6633
+#: ../pidgin/gtkblist.c:7345
 msgid "_Edit Account"
 msgstr "_Editar conta"
 
-#: ../pidgin/gtkblist.c:6646 ../pidgin/gtkconv.c:3073
+#: ../pidgin/gtkblist.c:7358 ../pidgin/gtkconv.c:3146
 msgid "No actions available"
 msgstr "Nenhuma ação disponível"
 
-#: ../pidgin/gtkblist.c:6654
+#: ../pidgin/gtkblist.c:7366
 msgid "_Disable"
 msgstr "_Desativar"
 
-#: ../pidgin/gtkblist.c:6666
+#: ../pidgin/gtkblist.c:7378
 msgid "Enable Account"
 msgstr "Ativar conta"
 
-#: ../pidgin/gtkblist.c:6672
+#: ../pidgin/gtkblist.c:7384
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Contas/Ativar conta"
 
-#: ../pidgin/gtkblist.c:6721
+#: ../pidgin/gtkblist.c:7433
 msgid "/Tools"
 msgstr "/Ferramentas"
 
-#: ../pidgin/gtkblist.c:6791
+#: ../pidgin/gtkblist.c:7503
 msgid "/Buddies/Sort Buddies"
 msgstr "/Amigos/Ordenar amigos"
 
 #. Widget creation function
-#: ../pidgin/gtkcertmgr.c:530
+#: ../pidgin/gtkcertmgr.c:531
 msgid "SSL Servers"
 msgstr "Servidores SSL"
 
-#: ../pidgin/gtkconn.c:180
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"%s will not attempt to reconnect the account until you correct the error and "
-"re-enable the account."
-msgstr ""
-"%s\n"
-"\n"
-"O %s não tentará reconectar esta conta até que você corrija o erro e reative "
-"a mesma."
-
-#: ../pidgin/gtkconv.c:482
+#: ../pidgin/gtkconv.c:524
 msgid "Unknown command."
 msgstr "Comando desconhecido."
 
-#: ../pidgin/gtkconv.c:754 ../pidgin/gtkconv.c:780
+#: ../pidgin/gtkconv.c:796 ../pidgin/gtkconv.c:822
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Este amigo não está usando o mesmo protocolo deste bate-papo."
 
-#: ../pidgin/gtkconv.c:774
+#: ../pidgin/gtkconv.c:816
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr "Você não está conectado com uma conta que permita convidar este amigo."
 
-#: ../pidgin/gtkconv.c:827
+#: ../pidgin/gtkconv.c:869
 msgid "Invite Buddy Into Chat Room"
 msgstr "Convidar amigo para sala de bate-papo"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:857
+#: ../pidgin/gtkconv.c:899
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -14194,188 +14616,179 @@
 "Favor digitar o nome do usuário que você gostaria de convidar, junto com uma "
 "mensagem de convite opcional."
 
-#: ../pidgin/gtkconv.c:878
+#: ../pidgin/gtkconv.c:920
 msgid "_Buddy:"
 msgstr "_Amigo:"
 
-#: ../pidgin/gtkconv.c:889 ../pidgin/gtksavedstatuses.c:1194
-#: ../pidgin/gtksavedstatuses.c:1528
+#: ../pidgin/gtkconv.c:931 ../pidgin/gtksavedstatuses.c:1200
+#: ../pidgin/gtksavedstatuses.c:1536
 msgid "_Message:"
 msgstr "_Mensagem:"
 
-#: ../pidgin/gtkconv.c:947 ../pidgin/gtkconv.c:2598 ../pidgin/gtkdebug.c:219
-#: ../pidgin/gtkft.c:543
-msgid "Unable to open file."
-msgstr "Não foi possível abrir arquivo."
-
-#: ../pidgin/gtkconv.c:953
+#: ../pidgin/gtkconv.c:995
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Conversas com %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:991
+#: ../pidgin/gtkconv.c:1033
 msgid "Save Conversation"
 msgstr "Salvar conversa"
 
-#: ../pidgin/gtkconv.c:1140 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:743
+#: ../pidgin/gtkconv.c:1179 ../pidgin/gtkdebug.c:168 ../pidgin/gtkdebug.c:748
 msgid "Find"
 msgstr "Procurar"
 
-#: ../pidgin/gtkconv.c:1166 ../pidgin/gtkdebug.c:195
+#: ../pidgin/gtkconv.c:1205 ../pidgin/gtkdebug.c:196
 msgid "_Search for:"
 msgstr "_Procurar por:"
 
-#: ../pidgin/gtkconv.c:1622
+#: ../pidgin/gtkconv.c:1676
 msgid "Un-Ignore"
 msgstr "Des-ignorar"
 
-#: ../pidgin/gtkconv.c:1625
-msgid "Ignore"
-msgstr "Ignorar"
-
-#: ../pidgin/gtkconv.c:1645
+#: ../pidgin/gtkconv.c:1699
 msgid "Get Away Message"
 msgstr "Obter mensagem de ausência"
 
-#: ../pidgin/gtkconv.c:1668
+#: ../pidgin/gtkconv.c:1722
 msgid "Last said"
 msgstr "Última mensagem"
 
-#: ../pidgin/gtkconv.c:2606
+#: ../pidgin/gtkconv.c:2671
 msgid "Unable to save icon file to disk."
 msgstr "Não foi possível salvar arquivo de ícone no disco."
 
-#: ../pidgin/gtkconv.c:2657
+#: ../pidgin/gtkconv.c:2722
 msgid "Save Icon"
 msgstr "Salvar ícone"
 
-#: ../pidgin/gtkconv.c:2709
+#: ../pidgin/gtkconv.c:2774
 msgid "Animate"
 msgstr "Animar"
 
-#: ../pidgin/gtkconv.c:2714
+#: ../pidgin/gtkconv.c:2779
 msgid "Hide Icon"
 msgstr "Ocultar ícone"
 
-#: ../pidgin/gtkconv.c:2717
+#: ../pidgin/gtkconv.c:2782
 msgid "Save Icon As..."
 msgstr "Salvar ícone como..."
 
-#: ../pidgin/gtkconv.c:2721
+#: ../pidgin/gtkconv.c:2786
 msgid "Set Custom Icon..."
 msgstr "Definir ícone personalizado..."
 
-#: ../pidgin/gtkconv.c:2734
+#: ../pidgin/gtkconv.c:2799
 msgid "Remove Custom Icon"
 msgstr "Remover ícone personalizado"
 
-#: ../pidgin/gtkconv.c:2861
+#: ../pidgin/gtkconv.c:2931
 msgid "Show All"
 msgstr "Mostrar todos"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2880
+#: ../pidgin/gtkconv.c:2950
 msgid "/_Conversation"
 msgstr "/_Conversa"
 
-#: ../pidgin/gtkconv.c:2882
+#: ../pidgin/gtkconv.c:2952
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversa/Nova _mensagem instantânea..."
 
-#: ../pidgin/gtkconv.c:2887
+#: ../pidgin/gtkconv.c:2957
 msgid "/Conversation/_Find..."
 msgstr "/Conversa/_Procurar..."
 
-#: ../pidgin/gtkconv.c:2889
+#: ../pidgin/gtkconv.c:2959
 msgid "/Conversation/View _Log"
-msgstr "/Conversa/Ver _log"
-
-#: ../pidgin/gtkconv.c:2890
+msgstr "/Conversa/Ver _histórico"
+
+#: ../pidgin/gtkconv.c:2960
 msgid "/Conversation/_Save As..."
 msgstr "/Conversa/_Salvar como..."
 
-#: ../pidgin/gtkconv.c:2892
+#: ../pidgin/gtkconv.c:2962
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Conversa/Limpa_r"
 
-#: ../pidgin/gtkconv.c:2896
+#: ../pidgin/gtkconv.c:2966
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversa/E_nviar arquivo..."
 
-#: ../pidgin/gtkconv.c:2897
+#: ../pidgin/gtkconv.c:2967
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversa/Adicionar ação de _usuário..."
 
-#: ../pidgin/gtkconv.c:2899
+#: ../pidgin/gtkconv.c:2969
 msgid "/Conversation/_Get Info"
 msgstr "/Conversa/_Ver informações"
 
-#: ../pidgin/gtkconv.c:2901
+#: ../pidgin/gtkconv.c:2971
 msgid "/Conversation/In_vite..."
 msgstr "/Conversa/_Convidar..."
 
-#: ../pidgin/gtkconv.c:2903
+#: ../pidgin/gtkconv.c:2973
 msgid "/Conversation/M_ore"
 msgstr "/Conversa/M_ais"
 
-#: ../pidgin/gtkconv.c:2907
+#: ../pidgin/gtkconv.c:2977
 msgid "/Conversation/Al_ias..."
 msgstr "/Conversa/Apel_idar..."
 
-#: ../pidgin/gtkconv.c:2909
+#: ../pidgin/gtkconv.c:2979
 msgid "/Conversation/_Block..."
 msgstr "/Conversa/_Bloquear..."
 
-#: ../pidgin/gtkconv.c:2911
+#: ../pidgin/gtkconv.c:2981
 msgid "/Conversation/_Unblock..."
 msgstr "/Conversa/_Desbloquear..."
 
-#: ../pidgin/gtkconv.c:2913
+#: ../pidgin/gtkconv.c:2983
 msgid "/Conversation/_Add..."
 msgstr "/Conversa/A_dicionar..."
 
-#: ../pidgin/gtkconv.c:2915
+#: ../pidgin/gtkconv.c:2985
 msgid "/Conversation/_Remove..."
 msgstr "/Conversa/_Remover..."
 
-#: ../pidgin/gtkconv.c:2920
+#: ../pidgin/gtkconv.c:2990
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Conversa/Inserir lin_k..."
 
-#: ../pidgin/gtkconv.c:2922
+#: ../pidgin/gtkconv.c:2992
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Conversa/Inserir imag_em..."
 
-#: ../pidgin/gtkconv.c:2928
+#: ../pidgin/gtkconv.c:2998
 msgid "/Conversation/_Close"
 msgstr "/Conversa/_Fechar"
 
 #. Options
-#: ../pidgin/gtkconv.c:2932
+#: ../pidgin/gtkconv.c:3002
 msgid "/_Options"
 msgstr "/_Opções"
 
-#: ../pidgin/gtkconv.c:2933
+#: ../pidgin/gtkconv.c:3003
 msgid "/Options/Enable _Logging"
-msgstr "/Opções/Gravar _log"
-
-#: ../pidgin/gtkconv.c:2934
+msgstr "/Opções/Gravar _históricos"
+
+#: ../pidgin/gtkconv.c:3004
 msgid "/Options/Enable _Sounds"
 msgstr "/Opções/Ativar _sons"
 
-#: ../pidgin/gtkconv.c:2936
+#: ../pidgin/gtkconv.c:3006
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Opções/Mostrar barras de ferramen_tas de formatação"
 
-#: ../pidgin/gtkconv.c:2937
+#: ../pidgin/gtkconv.c:3007
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Opções/_Mostrar marcações de tempo"
 
-#: ../pidgin/gtkconv.c:3061
+#: ../pidgin/gtkconv.c:3134
 msgid "/Conversation/More"
 msgstr "/Conversa/Mais"
 
-#: ../pidgin/gtkconv.c:3117
+#: ../pidgin/gtkconv.c:3190
 msgid "/Options"
 msgstr "/Opções"
 
@@ -14384,233 +14797,233 @@
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:3152 ../pidgin/gtkconv.c:3184
+#: ../pidgin/gtkconv.c:3225 ../pidgin/gtkconv.c:3257
 msgid "/Conversation"
 msgstr "/Conversa"
 
-#: ../pidgin/gtkconv.c:3192
+#: ../pidgin/gtkconv.c:3265
 msgid "/Conversation/View Log"
-msgstr "/Conversa/Ver log"
-
-#: ../pidgin/gtkconv.c:3198
+msgstr "/Conversa/Ver histórico"
+
+#: ../pidgin/gtkconv.c:3271
 msgid "/Conversation/Send File..."
 msgstr "/Conversa/Enviar arquivo..."
 
-#: ../pidgin/gtkconv.c:3202
+#: ../pidgin/gtkconv.c:3275
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversa/Adicionar ação de usuário..."
 
-#: ../pidgin/gtkconv.c:3208
+#: ../pidgin/gtkconv.c:3281
 msgid "/Conversation/Get Info"
 msgstr "/Conversa/Ver informações"
 
-#: ../pidgin/gtkconv.c:3212
+#: ../pidgin/gtkconv.c:3285
 msgid "/Conversation/Invite..."
 msgstr "/Conversa/Convidar..."
 
-#: ../pidgin/gtkconv.c:3218
+#: ../pidgin/gtkconv.c:3291
 msgid "/Conversation/Alias..."
 msgstr "/Conversa/Apelido..."
 
-#: ../pidgin/gtkconv.c:3222
+#: ../pidgin/gtkconv.c:3295
 msgid "/Conversation/Block..."
 msgstr "/Conversa/Bloquear..."
 
-#: ../pidgin/gtkconv.c:3226
+#: ../pidgin/gtkconv.c:3299
 msgid "/Conversation/Unblock..."
 msgstr "/Conversa/Desbloquear..."
 
-#: ../pidgin/gtkconv.c:3230
+#: ../pidgin/gtkconv.c:3303
 msgid "/Conversation/Add..."
 msgstr "/Conversa/Adicionar..."
 
-#: ../pidgin/gtkconv.c:3234
+#: ../pidgin/gtkconv.c:3307
 msgid "/Conversation/Remove..."
 msgstr "/Conversa/Remover..."
 
-#: ../pidgin/gtkconv.c:3240
+#: ../pidgin/gtkconv.c:3313
 msgid "/Conversation/Insert Link..."
 msgstr "/Conversa/Inserir link..."
 
-#: ../pidgin/gtkconv.c:3244
+#: ../pidgin/gtkconv.c:3317
 msgid "/Conversation/Insert Image..."
 msgstr "/Conversa/Inserir imagem..."
 
-#: ../pidgin/gtkconv.c:3250
+#: ../pidgin/gtkconv.c:3323
 msgid "/Options/Enable Logging"
-msgstr "/Opções/Gravar log"
-
-#: ../pidgin/gtkconv.c:3253
+msgstr "/Opções/Gravar históricos"
+
+#: ../pidgin/gtkconv.c:3326
 msgid "/Options/Enable Sounds"
 msgstr "/Opções/Ativar sons"
 
-#: ../pidgin/gtkconv.c:3266
+#: ../pidgin/gtkconv.c:3339
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Opções/Mostrar barras de ferramentas de formatação"
 
-#: ../pidgin/gtkconv.c:3269
+#: ../pidgin/gtkconv.c:3342
 msgid "/Options/Show Timestamps"
 msgstr "/Opções/Mostrar marcações de tempo"
 
-#: ../pidgin/gtkconv.c:3346 ../pidgin/gtkconv.c:3388
+#: ../pidgin/gtkconv.c:3419 ../pidgin/gtkconv.c:3461
 msgid "User is typing..."
 msgstr "O usuário está digitando..."
 
-#: ../pidgin/gtkconv.c:3391
+#: ../pidgin/gtkconv.c:3464
 msgid "User has typed something and stopped"
 msgstr "O usuário digitou algo e parou"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3574 ../pidgin/gtkconv.c:8022
-msgid "_Send To"
-msgstr "_Enviar para"
-
-#: ../pidgin/gtkconv.c:4286
+#: ../pidgin/gtkconv.c:3648 ../pidgin/gtkconv.c:8248
+msgid "S_end To"
+msgstr "En_viar para"
+
+#: ../pidgin/gtkconv.c:4360
 msgid "_Send"
 msgstr "_Enviar"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4390
+#: ../pidgin/gtkconv.c:4473
 msgid "0 people in room"
 msgstr "0 pessoas na sala"
 
-#: ../pidgin/gtkconv.c:5759 ../pidgin/gtkconv.c:5880
+#: ../pidgin/gtkconv.c:5846 ../pidgin/gtkconv.c:5967
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d pessoa na sala"
 msgstr[1] "%d pessoas na sala"
 
-#: ../pidgin/gtkconv.c:6486 ../pidgin/gtkstatusbox.c:660
+#: ../pidgin/gtkconv.c:6574 ../pidgin/gtkstatusbox.c:660
 msgid "Typing"
 msgstr "Digitando"
 
-#: ../pidgin/gtkconv.c:6490
+#: ../pidgin/gtkconv.c:6578
 msgid "Stopped Typing"
 msgstr "Parou de digitar"
 
-#: ../pidgin/gtkconv.c:6493
+#: ../pidgin/gtkconv.c:6581
 msgid "Nick Said"
 msgstr "Apelido mencionado"
 
-#: ../pidgin/gtkconv.c:6496 ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6584 ../pidgin/gtkdocklet.c:685
 msgid "Unread Messages"
 msgstr "Mensagens não lidas"
 
-#: ../pidgin/gtkconv.c:6499
+#: ../pidgin/gtkconv.c:6590
 msgid "New Event"
 msgstr "Novo evento"
 
-#: ../pidgin/gtkconv.c:7572
+#: ../pidgin/gtkconv.c:7767
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear: Limpa todas as janela de conversa."
 
-#: ../pidgin/gtkconv.c:7736
+#: ../pidgin/gtkconv.c:7930
 msgid "Confirm close"
 msgstr "Confirmar fechamento"
 
-#: ../pidgin/gtkconv.c:7768
+#: ../pidgin/gtkconv.c:7962
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr ""
 "Você tem mensagens não lidas. Tem certeza de que deseja fechar a janela?"
 
-#: ../pidgin/gtkconv.c:8355
+#: ../pidgin/gtkconv.c:8581
 msgid "Close other tabs"
 msgstr "Fechar as outras abas"
 
-#: ../pidgin/gtkconv.c:8361
+#: ../pidgin/gtkconv.c:8587
 msgid "Close all tabs"
 msgstr "Fechar todas as abas"
 
-#: ../pidgin/gtkconv.c:8369
+#: ../pidgin/gtkconv.c:8595
 msgid "Detach this tab"
 msgstr "Separar esta aba"
 
-#: ../pidgin/gtkconv.c:8375
+#: ../pidgin/gtkconv.c:8601
 msgid "Close this tab"
 msgstr "Fechar esta aba"
 
-#: ../pidgin/gtkconv.c:8875
+#: ../pidgin/gtkconv.c:9106
 msgid "Close conversation"
 msgstr "Fechar conversa"
 
-#: ../pidgin/gtkconv.c:9477
+#: ../pidgin/gtkconv.c:9708
 msgid "Last created window"
 msgstr "Última janela criada"
 
-#: ../pidgin/gtkconv.c:9479
+#: ../pidgin/gtkconv.c:9710
 msgid "Separate IM and Chat windows"
 msgstr "Separar janelas de MI e bate-papos"
 
-#: ../pidgin/gtkconv.c:9481 ../pidgin/gtkprefs.c:1415
+#: ../pidgin/gtkconv.c:9712 ../pidgin/gtkprefs.c:1510
 msgid "New window"
 msgstr "Nova janela"
 
-#: ../pidgin/gtkconv.c:9483
+#: ../pidgin/gtkconv.c:9714
 msgid "By group"
 msgstr "Por grupo"
 
-#: ../pidgin/gtkconv.c:9485
+#: ../pidgin/gtkconv.c:9716
 msgid "By account"
 msgstr "Por conta"
 
-#: ../pidgin/gtkdebug.c:234
+#: ../pidgin/gtkdebug.c:235
 msgid "Save Debug Log"
 msgstr "Salvar log de depuração"
 
-#: ../pidgin/gtkdebug.c:582
+#: ../pidgin/gtkdebug.c:583
 msgid "Invert"
 msgstr "Inverter"
 
-#: ../pidgin/gtkdebug.c:585
+#: ../pidgin/gtkdebug.c:586
 msgid "Highlight matches"
 msgstr "Realçar resultados"
 
-#: ../pidgin/gtkdebug.c:652
+#: ../pidgin/gtkdebug.c:653
 msgid "_Icon Only"
 msgstr "Apenas _ícone"
 
-#: ../pidgin/gtkdebug.c:653
+#: ../pidgin/gtkdebug.c:654
 msgid "_Text Only"
 msgstr "Apenas _texto"
 
-#: ../pidgin/gtkdebug.c:654
+#: ../pidgin/gtkdebug.c:655
 msgid "_Both Icon & Text"
 msgstr "Am_bos"
 
-#: ../pidgin/gtkdebug.c:775
+#: ../pidgin/gtkdebug.c:780
 msgid "Filter"
 msgstr "Filtrar"
 
-#: ../pidgin/gtkdebug.c:794
+#: ../pidgin/gtkdebug.c:799
 msgid "Right click for more options."
 msgstr "Clique com o botão direito para mais opções."
 
-#: ../pidgin/gtkdebug.c:824
+#: ../pidgin/gtkdebug.c:829
 msgid "Level "
 msgstr "Nível "
 
-#: ../pidgin/gtkdebug.c:825 ../pidgin/gtkdebug.c:831
+#: ../pidgin/gtkdebug.c:830 ../pidgin/gtkdebug.c:836
 msgid "Select the debug filter level."
 msgstr "Selecione o nível do filtro de depuração."
 
-#: ../pidgin/gtkdebug.c:833
+#: ../pidgin/gtkdebug.c:838
 msgid "All"
 msgstr "Tudo"
 
-#: ../pidgin/gtkdebug.c:834
+#: ../pidgin/gtkdebug.c:839
 msgid "Misc"
 msgstr "Miscelânea"
 
-#: ../pidgin/gtkdebug.c:836
+#: ../pidgin/gtkdebug.c:841
 msgid "Warning"
 msgstr "Aviso"
 
-#: ../pidgin/gtkdebug.c:837
+#: ../pidgin/gtkdebug.c:842
 msgid "Error "
 msgstr "Erro "
 
-#: ../pidgin/gtkdebug.c:838
+#: ../pidgin/gtkdebug.c:843
 msgid "Fatal Error"
 msgstr "Erro fatal"
 
@@ -14625,20 +15038,20 @@
 #: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
 #: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:84
 #: ../pidgin/gtkdialogs.c:85 ../pidgin/gtkdialogs.c:86
-#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:91
-#: ../pidgin/gtkdialogs.c:92
+#: ../pidgin/gtkdialogs.c:87 ../pidgin/gtkdialogs.c:90
+#: ../pidgin/gtkdialogs.c:92 ../pidgin/gtkdialogs.c:93
 msgid "developer"
 msgstr "desenvolvedor"
 
-#: ../pidgin/gtkdialogs.c:87
+#: ../pidgin/gtkdialogs.c:88
 msgid "support"
 msgstr "suporte"
 
-#: ../pidgin/gtkdialogs.c:88
+#: ../pidgin/gtkdialogs.c:89
 msgid "support/QA"
 msgstr "suporte/QA"
 
-#: ../pidgin/gtkdialogs.c:90 ../pidgin/gtkdialogs.c:112
+#: ../pidgin/gtkdialogs.c:91 ../pidgin/gtkdialogs.c:112
 msgid "developer & webmaster"
 msgstr "desenvolvedor & webmaster"
 
@@ -14675,7 +15088,7 @@
 msgid "Afrikaans"
 msgstr "Africâner"
 
-#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:228
 msgid "Arabic"
 msgstr "Árabe"
 
@@ -14684,7 +15097,7 @@
 msgstr "Latim bielorrusso"
 
 #: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
-#: ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:229
 msgid "Bulgarian"
 msgstr "Búlgaro"
 
@@ -14697,8 +15110,8 @@
 msgid "Bosnian"
 msgstr "Bósnio"
 
-#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:228
-#: ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:231
 msgid "Catalan"
 msgstr "Catalão"
 
@@ -14706,7 +15119,7 @@
 msgid "Valencian-Catalan"
 msgstr "Valenciano-Catalão"
 
-#: ../pidgin/gtkdialogs.c:146 ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:146 ../pidgin/gtkdialogs.c:232
 msgid "Czech"
 msgstr "Tcheco"
 
@@ -14715,7 +15128,7 @@
 msgstr "Dinamarquês"
 
 #: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150
-#: ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:233
 msgid "German"
 msgstr "Alemão"
 
@@ -14744,9 +15157,9 @@
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:232
-#: ../pidgin/gtkdialogs.c:233 ../pidgin/gtkdialogs.c:234
-#: ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:235 ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:237
 msgid "Spanish"
 msgstr "Espanhol"
 
@@ -14763,19 +15176,19 @@
 msgid "Persian"
 msgstr "Persa"
 
-#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:236
-#: ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:239
 msgid "Finnish"
 msgstr "Finlandês"
 
-#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:238
-#: ../pidgin/gtkdialogs.c:239 ../pidgin/gtkdialogs.c:240
-#: ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:241 ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:243
 msgid "French"
 msgstr "Francês"
 
 #: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
-#: ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:244
 msgid "Galician"
 msgstr "Galego"
 
@@ -14787,7 +15200,7 @@
 msgid "Gujarati Language Team"
 msgstr "Time de tradução do idioma Guzerate"
 
-#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:243
+#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:245
 msgid "Hebrew"
 msgstr "Hebraico"
 
@@ -14795,7 +15208,7 @@
 msgid "Hindi"
 msgstr "Hindu"
 
-#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:246
 msgid "Hungarian"
 msgstr "Húngaro"
 
@@ -14803,16 +15216,16 @@
 msgid "Indonesian"
 msgstr "Bahasa Indonésia"
 
-#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:245
+#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:247
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:246
-#: ../pidgin/gtkdialogs.c:247 ../pidgin/gtkdialogs.c:248
+#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:248
+#: ../pidgin/gtkdialogs.c:249 ../pidgin/gtkdialogs.c:250
 msgid "Japanese"
 msgstr "Japonês"
 
-#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:249
+#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:251
 msgid "Georgian"
 msgstr "Geórgio"
 
@@ -14828,8 +15241,8 @@
 msgid "Kannada Translation team"
 msgstr "Time de tradução do idioma Canarês"
 
-#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:250
-#: ../pidgin/gtkdialogs.c:251
+#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:252
+#: ../pidgin/gtkdialogs.c:253
 msgid "Korean"
 msgstr "Coreano"
 
@@ -14839,22 +15252,21 @@
 msgstr "Curdo"
 
 #: ../pidgin/gtkdialogs.c:185
-#, fuzzy
 msgid "Lao"
-msgstr "Leão"
-
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:252
-#: ../pidgin/gtkdialogs.c:253
+msgstr "Laociano"
+
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:254
+#: ../pidgin/gtkdialogs.c:255
 msgid "Lithuanian"
 msgstr "Lituano"
 
 #: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:188
-#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:254
+#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:256
 msgid "Macedonian"
 msgstr "Macedônio"
 
-#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:255
-#: ../pidgin/gtkdialogs.c:256
+#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:257
+#: ../pidgin/gtkdialogs.c:258
 msgid "Bokmål Norwegian"
 msgstr "Dano-Norueguês"
 
@@ -14870,104 +15282,112 @@
 msgid "Norwegian Nynorsk"
 msgstr "Novo norueguês"
 
-#: ../pidgin/gtkdialogs.c:194 ../pidgin/gtkdialogs.c:195
-#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:257
+#: ../pidgin/gtkdialogs.c:194
+msgid "Punjabi"
+msgstr "Punjabi"
+
+#: ../pidgin/gtkdialogs.c:195 ../pidgin/gtkdialogs.c:196
+#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:259
 msgid "Polish"
 msgstr "Polonês"
 
-#: ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:198
 msgid "Portuguese"
 msgstr "Português"
 
-#: ../pidgin/gtkdialogs.c:198
+#: ../pidgin/gtkdialogs.c:199
 msgid "Portuguese-Brazil"
 msgstr "Português do Brasil"
 
-#: ../pidgin/gtkdialogs.c:199
+#: ../pidgin/gtkdialogs.c:200
 msgid "Pashto"
 msgstr "Afegão"
 
-#: ../pidgin/gtkdialogs.c:200
+#: ../pidgin/gtkdialogs.c:201
 msgid "Romanian"
 msgstr "Romeno"
 
-#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:258
-#: ../pidgin/gtkdialogs.c:259
+#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:260
+#: ../pidgin/gtkdialogs.c:261
 msgid "Russian"
 msgstr "Russo"
 
-#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:203
-#: ../pidgin/gtkdialogs.c:260 ../pidgin/gtkdialogs.c:261
-#: ../pidgin/gtkdialogs.c:262
+#: ../pidgin/gtkdialogs.c:203 ../pidgin/gtkdialogs.c:204
+#: ../pidgin/gtkdialogs.c:262 ../pidgin/gtkdialogs.c:263
+#: ../pidgin/gtkdialogs.c:264
 msgid "Slovak"
 msgstr "Eslovaco"
 
-#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:263
+#: ../pidgin/gtkdialogs.c:205 ../pidgin/gtkdialogs.c:265
 msgid "Slovenian"
 msgstr "Esloveno"
 
-#: ../pidgin/gtkdialogs.c:205
+#: ../pidgin/gtkdialogs.c:206
 msgid "Albanian"
 msgstr "Albanês"
 
-#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:207
-#: ../pidgin/gtkdialogs.c:264 ../pidgin/gtkdialogs.c:265
+#: ../pidgin/gtkdialogs.c:207 ../pidgin/gtkdialogs.c:208
+#: ../pidgin/gtkdialogs.c:266 ../pidgin/gtkdialogs.c:267
 msgid "Serbian"
 msgstr "Sérvio"
 
-#: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:266
-#: ../pidgin/gtkdialogs.c:267
+#: ../pidgin/gtkdialogs.c:209 ../pidgin/gtkdialogs.c:268
+#: ../pidgin/gtkdialogs.c:269
 msgid "Swedish"
 msgstr "Sueco"
 
-#: ../pidgin/gtkdialogs.c:209
-msgid "Tamil"
-msgstr "Tamil"
-
 #: ../pidgin/gtkdialogs.c:210
+msgid "Tamil"
+msgstr "Tamil"
+
+#: ../pidgin/gtkdialogs.c:211
 msgid "Telugu"
 msgstr "Telugu"
 
-#: ../pidgin/gtkdialogs.c:211
+#: ../pidgin/gtkdialogs.c:212
 msgid "Thai"
 msgstr "Tailandês"
 
-#: ../pidgin/gtkdialogs.c:212 ../pidgin/gtkdialogs.c:268
+#: ../pidgin/gtkdialogs.c:213 ../pidgin/gtkdialogs.c:270
 msgid "Turkish"
 msgstr "Turco"
 
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:214
+msgid "Urdu"
+msgstr "Urdu"
+
+#: ../pidgin/gtkdialogs.c:215
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:215
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh e o time do Gnome-Vi"
 
-#: ../pidgin/gtkdialogs.c:214 ../pidgin/gtkdialogs.c:269
+#: ../pidgin/gtkdialogs.c:216 ../pidgin/gtkdialogs.c:271
 msgid "Simplified Chinese"
 msgstr "Chinês Simplificado"
 
-#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:216
-#: ../pidgin/gtkdialogs.c:217
+#: ../pidgin/gtkdialogs.c:217 ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:219
 msgid "Hong Kong Chinese"
 msgstr "Chinês de Hong Kong"
 
-#: ../pidgin/gtkdialogs.c:218 ../pidgin/gtkdialogs.c:219
-#: ../pidgin/gtkdialogs.c:270
+#: ../pidgin/gtkdialogs.c:220 ../pidgin/gtkdialogs.c:221
+#: ../pidgin/gtkdialogs.c:272
 msgid "Traditional Chinese"
 msgstr "Chinês Tradicional"
 
-#: ../pidgin/gtkdialogs.c:225
+#: ../pidgin/gtkdialogs.c:227
 msgid "Amharic"
 msgstr "Amhárico"
 
-#: ../pidgin/gtkdialogs.c:357
+#: ../pidgin/gtkdialogs.c:370
 #, c-format
 msgid "About %s"
 msgstr "Sobre o %s"
 
-#: ../pidgin/gtkdialogs.c:400
+#: ../pidgin/gtkdialogs.c:413
 #, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
@@ -14989,48 +15409,62 @@
 "contribuidoes. Veja o arquivo 'COPYRIGHT' para uma lista completa destes "
 "contribuidores. Não oferecemos nenhuma garantia para este programa.<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:418
+#: ../pidgin/gtkdialogs.c:431
 #, c-format
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin no irc.freenode.net<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:423
+#: ../pidgin/gtkdialogs.c:436
 msgid "Current Developers"
 msgstr "Desenvolvedores atuais"
 
-#: ../pidgin/gtkdialogs.c:438
+#: ../pidgin/gtkdialogs.c:451
 msgid "Crazy Patch Writers"
 msgstr "Escritores de patch malucos"
 
-#: ../pidgin/gtkdialogs.c:453
+#: ../pidgin/gtkdialogs.c:466
 msgid "Retired Developers"
 msgstr "Desenvolvedores aposentados"
 
-#: ../pidgin/gtkdialogs.c:468
+#: ../pidgin/gtkdialogs.c:481
 msgid "Retired Crazy Patch Writers"
 msgstr "Escritores de patch aposentados"
 
-#: ../pidgin/gtkdialogs.c:483
+#: ../pidgin/gtkdialogs.c:496
 msgid "Artists"
 msgstr "Artistas"
 
-#: ../pidgin/gtkdialogs.c:498
+#: ../pidgin/gtkdialogs.c:511
 msgid "Current Translators"
 msgstr "Atuais tradutores"
 
-#: ../pidgin/gtkdialogs.c:518
+#: ../pidgin/gtkdialogs.c:531
 msgid "Past Translators"
 msgstr "Antigos tradutores"
 
-#: ../pidgin/gtkdialogs.c:536
+#: ../pidgin/gtkdialogs.c:549
 msgid "Debugging Information"
 msgstr "Informações de depuração"
 
-#: ../pidgin/gtkdialogs.c:906
+#: ../pidgin/gtkdialogs.c:766 ../pidgin/gtkdialogs.c:909
+#: ../pidgin/gtkdialogs.c:990
+msgid "_Name"
+msgstr "_Nome"
+
+#: ../pidgin/gtkdialogs.c:771
+msgid "Buddy"
+msgstr "Amigo"
+
+#: ../pidgin/gtkdialogs.c:775 ../pidgin/gtkdialogs.c:914
+#: ../pidgin/gtkdialogs.c:995
+msgid "_Account"
+msgstr "_Conta"
+
+#: ../pidgin/gtkdialogs.c:922
 msgid "Get User Info"
 msgstr "Ver informações do usuário"
 
-#: ../pidgin/gtkdialogs.c:908
+#: ../pidgin/gtkdialogs.c:924
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
@@ -15038,43 +15472,43 @@
 "Por favor digite o nome de usuário da pessoa cuja informação você gostaria "
 "de ver."
 
-#: ../pidgin/gtkdialogs.c:998
+#: ../pidgin/gtkdialogs.c:1014
 msgid "View User Log"
-msgstr "Ver log do usuário"
-
-#: ../pidgin/gtkdialogs.c:1000
+msgstr "Ver histórico do usuário"
+
+#: ../pidgin/gtkdialogs.c:1016
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
 msgstr ""
 "Por favor digite o nome de usuário da pessoa cujo log você gostaria de ver."
 
-#: ../pidgin/gtkdialogs.c:1020
+#: ../pidgin/gtkdialogs.c:1036
 msgid "Alias Contact"
 msgstr "Apelidar contato"
 
-#: ../pidgin/gtkdialogs.c:1021
+#: ../pidgin/gtkdialogs.c:1037
 msgid "Enter an alias for this contact."
 msgstr "Digite um apelido para este contato."
 
-#: ../pidgin/gtkdialogs.c:1043
+#: ../pidgin/gtkdialogs.c:1059
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Digite um apelido para %s."
 
-#: ../pidgin/gtkdialogs.c:1045
+#: ../pidgin/gtkdialogs.c:1061
 msgid "Alias Buddy"
 msgstr "Apelidar amigo"
 
-#: ../pidgin/gtkdialogs.c:1066
+#: ../pidgin/gtkdialogs.c:1082
 msgid "Alias Chat"
 msgstr "Apelidar bate-papo"
 
-#: ../pidgin/gtkdialogs.c:1067
+#: ../pidgin/gtkdialogs.c:1083
 msgid "Enter an alias for this chat."
 msgstr "Digite um apelido para este bate-papo."
 
-#: ../pidgin/gtkdialogs.c:1106
+#: ../pidgin/gtkdialogs.c:1122
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -15089,15 +15523,15 @@
 "Você está prestes a remover o contato que contém %s e %d outros amigos da "
 "sua lista de amigos. Deseja continuar?"
 
-#: ../pidgin/gtkdialogs.c:1114
+#: ../pidgin/gtkdialogs.c:1130
 msgid "Remove Contact"
 msgstr "Remover contato"
 
-#: ../pidgin/gtkdialogs.c:1117
+#: ../pidgin/gtkdialogs.c:1133
 msgid "_Remove Contact"
 msgstr "_Remover contato"
 
-#: ../pidgin/gtkdialogs.c:1148
+#: ../pidgin/gtkdialogs.c:1164
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
@@ -15106,15 +15540,15 @@
 "Você está prestes a mesclar o grupo %s com o grupo chamado %s. Deseja "
 "continuar?"
 
-#: ../pidgin/gtkdialogs.c:1155
+#: ../pidgin/gtkdialogs.c:1171
 msgid "Merge Groups"
 msgstr "Mesclar grupos"
 
-#: ../pidgin/gtkdialogs.c:1158
+#: ../pidgin/gtkdialogs.c:1174
 msgid "_Merge Groups"
 msgstr "_Mesclar grupos"
 
-#: ../pidgin/gtkdialogs.c:1208
+#: ../pidgin/gtkdialogs.c:1224
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -15123,30 +15557,30 @@
 "Você está prestes a remover o grupo %s e todos os seus membros da sua lista "
 "de amigos. Deseja continuar?"
 
-#: ../pidgin/gtkdialogs.c:1211
+#: ../pidgin/gtkdialogs.c:1227
 msgid "Remove Group"
 msgstr "Remover grupo"
 
-#: ../pidgin/gtkdialogs.c:1214
+#: ../pidgin/gtkdialogs.c:1230
 msgid "_Remove Group"
 msgstr "_Remover grupo"
 
-#: ../pidgin/gtkdialogs.c:1247
+#: ../pidgin/gtkdialogs.c:1263
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr ""
 "Você está prestes a remover %s da sua lista de amigos. Deseja continuar?"
 
-#: ../pidgin/gtkdialogs.c:1250
+#: ../pidgin/gtkdialogs.c:1266
 msgid "Remove Buddy"
 msgstr "Remover amigo"
 
-#: ../pidgin/gtkdialogs.c:1253
+#: ../pidgin/gtkdialogs.c:1269
 msgid "_Remove Buddy"
 msgstr "_Remover amigo"
 
-#: ../pidgin/gtkdialogs.c:1274
+#: ../pidgin/gtkdialogs.c:1290
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -15155,40 +15589,39 @@
 "Você está prestes a remover o bate-papo %s da sua lista de amigos. Deseja "
 "continuar?"
 
-#: ../pidgin/gtkdialogs.c:1277
+#: ../pidgin/gtkdialogs.c:1293
 msgid "Remove Chat"
 msgstr "Remover bate-papo"
 
-#: ../pidgin/gtkdialogs.c:1280
+#: ../pidgin/gtkdialogs.c:1296
 msgid "_Remove Chat"
 msgstr "_Remover bate-papo"
 
-#: ../pidgin/gtkdocklet.c:150
+#: ../pidgin/gtkdocklet.c:152
 msgid "Right-click for more unread messages...\n"
 msgstr "Clique com o botão direito para mais mensagens não lidas...\n"
 
-#: ../pidgin/gtkdocklet.c:435
+#: ../pidgin/gtkdocklet.c:533
 msgid "Change Status"
 msgstr "Alterar status"
 
-#: ../pidgin/gtkdocklet.c:487
+#: ../pidgin/gtkdocklet.c:680
 msgid "Show Buddy List"
 msgstr "Exibir lista de amigos"
 
-#: ../pidgin/gtkdocklet.c:513
+#: ../pidgin/gtkdocklet.c:706
 msgid "New Message..."
 msgstr "Nova mensagem..."
 
-#: ../pidgin/gtkdocklet.c:528
+#: ../pidgin/gtkdocklet.c:721
 msgid "Mute Sounds"
 msgstr "Não tocar sons"
 
-#: ../pidgin/gtkdocklet.c:535
-#, fuzzy
-msgid "Blink on new message"
+#: ../pidgin/gtkdocklet.c:728
+msgid "Blink on New Message"
 msgstr "Piscar ao receber nova mensagem"
 
-#: ../pidgin/gtkdocklet.c:542
+#: ../pidgin/gtkdocklet.c:738
 msgid "Quit"
 msgstr "Fechar"
 
@@ -15278,44 +15711,44 @@
 msgid "_Resume"
 msgstr "_Continuar"
 
-#: ../pidgin/gtkimhtml.c:816
+#: ../pidgin/gtkimhtml.c:815
 msgid "Paste as Plain _Text"
 msgstr "Colar como _texto puro"
 
-#: ../pidgin/gtkimhtml.c:833 ../pidgin/gtkimhtmltoolbar.c:1194
+#: ../pidgin/gtkimhtml.c:832 ../pidgin/gtkimhtmltoolbar.c:1199
 msgid "_Reset formatting"
 msgstr "Limpa_r formatação"
 
-#: ../pidgin/gtkimhtml.c:1373
+#: ../pidgin/gtkimhtml.c:1357
 msgid "Hyperlink color"
 msgstr "Cor do hyperlink"
 
-#: ../pidgin/gtkimhtml.c:1374
+#: ../pidgin/gtkimhtml.c:1358
 msgid "Color to draw hyperlinks."
 msgstr "Cor a ser usada para desenhar os hyperlinks."
 
-#: ../pidgin/gtkimhtml.c:1377
+#: ../pidgin/gtkimhtml.c:1361
 msgid "Hyperlink prelight color"
 msgstr "Cor do hyperlink sob o cursor"
 
-#: ../pidgin/gtkimhtml.c:1378
+#: ../pidgin/gtkimhtml.c:1362
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr ""
 "Cor a ser usada para desenhar os hyperlinks quando o mouse está sobre eles."
 
-#: ../pidgin/gtkimhtml.c:1598
+#: ../pidgin/gtkimhtml.c:1579
 msgid "_Copy E-Mail Address"
 msgstr "_Copiar endereço de e-mail"
 
-#: ../pidgin/gtkimhtml.c:1610
+#: ../pidgin/gtkimhtml.c:1591
 msgid "_Open Link in Browser"
 msgstr "_Abrir link no navegador"
 
-#: ../pidgin/gtkimhtml.c:1620
+#: ../pidgin/gtkimhtml.c:1601
 msgid "_Copy Link Location"
 msgstr "_Copiar endereço do link"
 
-#: ../pidgin/gtkimhtml.c:3369
+#: ../pidgin/gtkimhtml.c:3356
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -15325,7 +15758,7 @@
 "\n"
 "Usando o tipo padrão, PNG."
 
-#: ../pidgin/gtkimhtml.c:3372
+#: ../pidgin/gtkimhtml.c:3359
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -15335,7 +15768,7 @@
 "\n"
 "Usando o tipo padrão, PNG."
 
-#: ../pidgin/gtkimhtml.c:3401
+#: ../pidgin/gtkimhtml.c:3388
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -15346,7 +15779,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3404
+#: ../pidgin/gtkimhtml.c:3391
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -15357,11 +15790,11 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3482 ../pidgin/gtkimhtml.c:3494
+#: ../pidgin/gtkimhtml.c:3469 ../pidgin/gtkimhtml.c:3481
 msgid "Save Image"
 msgstr "Salvar imagem"
 
-#: ../pidgin/gtkimhtml.c:3522
+#: ../pidgin/gtkimhtml.c:3509
 #, c-format
 msgid "_Save Image..."
 msgstr "_Salvar imagem..."
@@ -15370,23 +15803,23 @@
 msgid "Select Font"
 msgstr "Selecionar fonte"
 
-#: ../pidgin/gtkimhtmltoolbar.c:242
+#: ../pidgin/gtkimhtmltoolbar.c:244
 msgid "Select Text Color"
 msgstr "Selecionar cor do texto"
 
-#: ../pidgin/gtkimhtmltoolbar.c:321
+#: ../pidgin/gtkimhtmltoolbar.c:323
 msgid "Select Background Color"
 msgstr "Selecionar cor de fundo"
 
-#: ../pidgin/gtkimhtmltoolbar.c:410
+#: ../pidgin/gtkimhtmltoolbar.c:412
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:418
+#: ../pidgin/gtkimhtmltoolbar.c:420
 msgid "_Description"
 msgstr "_Descrição"
 
-#: ../pidgin/gtkimhtmltoolbar.c:421
+#: ../pidgin/gtkimhtmltoolbar.c:423
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -15394,155 +15827,155 @@
 "Por favor digite a URL e a descrição do link que você gostaria de inserir.  "
 "A descrição é opcional."
 
-#: ../pidgin/gtkimhtmltoolbar.c:425
+#: ../pidgin/gtkimhtmltoolbar.c:427
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Por favor digite a URL do link que você gostaria de inserir."
 
-#: ../pidgin/gtkimhtmltoolbar.c:430 ../pidgin/gtkimhtmltoolbar.c:1102
+#: ../pidgin/gtkimhtmltoolbar.c:432 ../pidgin/gtkimhtmltoolbar.c:1106
 msgid "Insert Link"
 msgstr "Inserir link"
 
-#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtkimhtmltoolbar.c:1262
+#: ../pidgin/gtkimhtmltoolbar.c:436 ../pidgin/gtkimhtmltoolbar.c:1267
 msgid "_Insert"
 msgstr "_Inserir"
 
-#: ../pidgin/gtkimhtmltoolbar.c:514
+#: ../pidgin/gtkimhtmltoolbar.c:516
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Não foi possível armazenar imagem: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:540 ../pidgin/gtkimhtmltoolbar.c:550
+#: ../pidgin/gtkimhtmltoolbar.c:542 ../pidgin/gtkimhtmltoolbar.c:552
 msgid "Insert Image"
 msgstr "Inserir imagem"
 
-#: ../pidgin/gtkimhtmltoolbar.c:761
+#: ../pidgin/gtkimhtmltoolbar.c:765
 msgid "This theme has no available smileys."
 msgstr "Este tema não possui emoticons disponíveis."
 
 #. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:778
+#: ../pidgin/gtkimhtmltoolbar.c:782
 msgid "Smile!"
 msgstr "Emoticon!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:846 ../pidgin/gtkimhtmltoolbar.c:1219
+#: ../pidgin/gtkimhtmltoolbar.c:850 ../pidgin/gtkimhtmltoolbar.c:1224
 msgid "_Font"
 msgstr "_Fonte"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1054
+#: ../pidgin/gtkimhtmltoolbar.c:1058
 msgid "Group Items"
 msgstr "Agrupar itens"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1054
+#: ../pidgin/gtkimhtmltoolbar.c:1058
 msgid "Ungroup Items"
 msgstr "Desagrupar itens"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1088 ../pidgin/plugins/convcolors.c:287
+#: ../pidgin/gtkimhtmltoolbar.c:1092 ../pidgin/plugins/convcolors.c:287
 msgid "Bold"
 msgstr "Negrito"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1089 ../pidgin/plugins/convcolors.c:294
+#: ../pidgin/gtkimhtmltoolbar.c:1093 ../pidgin/plugins/convcolors.c:294
 msgid "Italic"
 msgstr "Itálico"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1090 ../pidgin/plugins/convcolors.c:301
+#: ../pidgin/gtkimhtmltoolbar.c:1094 ../pidgin/plugins/convcolors.c:301
 msgid "Underline"
 msgstr "Sublinhado"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1091
+#: ../pidgin/gtkimhtmltoolbar.c:1095
 msgid "Strikethrough"
 msgstr "Tachado"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1093
-msgid "Increase Font Size"
-msgstr "Aumentar tamanho da fonte"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1094
-msgid "Decrease Font Size"
-msgstr "Diminuir tamanho da fonte"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1096
-msgid "Font Face"
-msgstr "Tipo da fonte"
-
 #: ../pidgin/gtkimhtmltoolbar.c:1097
-msgid "Background Color"
-msgstr "Cor do fundo"
+msgid "Increase Font Size"
+msgstr "Aumentar tamanho da fonte"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1098
+msgid "Decrease Font Size"
+msgstr "Diminuir tamanho da fonte"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1100
+msgid "Font Face"
+msgstr "Tipo da fonte"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1101
+msgid "Background Color"
+msgstr "Cor do fundo"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1102
 msgid "Foreground Color"
 msgstr "Cor da fonte"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1100
+#: ../pidgin/gtkimhtmltoolbar.c:1104
 msgid "Reset Formatting"
 msgstr "Limpar formatação"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1103
+#: ../pidgin/gtkimhtmltoolbar.c:1107
 msgid "Insert IM Image"
 msgstr "Inserir imagem de MI"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1104
+#: ../pidgin/gtkimhtmltoolbar.c:1108
 msgid "Insert Smiley"
 msgstr "Inserir emoticon"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1179
+#: ../pidgin/gtkimhtmltoolbar.c:1184
 msgid "<b>_Bold</b>"
 msgstr "<b>_Negrito</b>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1180
+#: ../pidgin/gtkimhtmltoolbar.c:1185
 msgid "<i>_Italic</i>"
 msgstr "<i>_Itálico</i>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1181
+#: ../pidgin/gtkimhtmltoolbar.c:1186
 msgid "<u>_Underline</u>"
 msgstr "<u>_Sublinhado</u>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1182
+#: ../pidgin/gtkimhtmltoolbar.c:1187
 msgid "<span strikethrough='true'>Strikethrough</span>"
 msgstr "<span strikethrough='true'>Tachado</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1183
+#: ../pidgin/gtkimhtmltoolbar.c:1188
 msgid "<span size='larger'>_Larger</span>"
 msgstr "<span size='larger'>_Maior</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1185
+#: ../pidgin/gtkimhtmltoolbar.c:1190
 msgid "_Normal"
 msgstr "N_ormal"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1187
+#: ../pidgin/gtkimhtmltoolbar.c:1192
 msgid "<span size='smaller'>_Smaller</span>"
 msgstr "<span size='smaller'>M_enor</span>"
 
 #. If we want to show the formatting for the following items, we would
 #. * need to update them when formatting changes. The above items don't need
 #. * no updating nor nothin'
-#: ../pidgin/gtkimhtmltoolbar.c:1191
+#: ../pidgin/gtkimhtmltoolbar.c:1196
 msgid "_Font face"
 msgstr "_Fonte"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1192
+#: ../pidgin/gtkimhtmltoolbar.c:1197
 msgid "Foreground _color"
 msgstr "_Cor da fonte"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1193
+#: ../pidgin/gtkimhtmltoolbar.c:1198
 msgid "Bac_kground color"
 msgstr "Co_r do fundo"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1270
-msgid "_Smiley"
-msgstr "_Emoticon!"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1276
+#: ../pidgin/gtkimhtmltoolbar.c:1275
 msgid "_Image"
 msgstr "Ima_gem"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1282
+#: ../pidgin/gtkimhtmltoolbar.c:1281
 msgid "_Link"
 msgstr "_Link"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1288
+#: ../pidgin/gtkimhtmltoolbar.c:1287
 msgid "_Horizontal rule"
 msgstr "Régua _horizontal"
 
+#: ../pidgin/gtkimhtmltoolbar.c:1309
+msgid "_Smile!"
+msgstr "_Emoticon!"
+
 #: ../pidgin/gtklog.c:293
 #, c-format
 msgid ""
@@ -15609,38 +16042,38 @@
 
 #: ../pidgin/gtklog.c:561
 msgid "No logs were found"
-msgstr "Nenhum log foi encontrado"
+msgstr "Nenhum histórico foi encontrado"
 
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
 #: ../pidgin/gtklog.c:576
 msgid "_Browse logs folder"
-msgstr "_Navegar na pasta de logs"
+msgstr "_Navegar na pasta de históricos"
 
 #: ../pidgin/gtklog.c:640
 msgid "Total log size:"
-msgstr "Tamanho total do log:"
-
-#: ../pidgin/gtklog.c:709
+msgstr "Tamanho total do histórico:"
+
+#: ../pidgin/gtklog.c:714
 #, c-format
 msgid "Conversations in %s"
 msgstr "Conversas no %s"
 
-#: ../pidgin/gtklog.c:717 ../pidgin/gtklog.c:779
+#: ../pidgin/gtklog.c:722 ../pidgin/gtklog.c:793
 #, c-format
 msgid "Conversations with %s"
 msgstr "Conversas com %s"
 
-#: ../pidgin/gtklog.c:804
+#: ../pidgin/gtklog.c:823
 msgid "System Log"
-msgstr "Log do sistema"
-
-#: ../pidgin/gtkmain.c:386
+msgstr "Histórico do sistema"
+
+#: ../pidgin/gtkmain.c:398
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Tente `%s -h' para mais informações.\n"
 
-#: ../pidgin/gtkmain.c:388
-#, fuzzy, c-format
+#: ../pidgin/gtkmain.c:400
+#, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -15652,6 +16085,7 @@
 "  -n, --nologin       don't automatically login\n"
 "  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
 "                      account(s) to use, separated by commas)\n"
+"  --display=DISPLAY   X display to use\n"
 "  -v, --version       display the current version and exit\n"
 msgstr ""
 "%s %s\n"
@@ -15660,17 +16094,18 @@
 "  -c, --config=DIR    use o diretório DIR para os arquivos de configuração\n"
 "  -d, --debug         imprima mensagens de depuração para a saída padrão\n"
 "  -h, --help          exiba esta ajuda e saia\n"
+"  -m, --multiple      permitir uso simultâneo de mais de uma instância\n"
 "  -n, --nologin       não conecte automaticamente\n"
-"  -m, --multiple      permitir uso simultâneo de mais de uma instância\n"
-"  -l, --login[=NAME]  conecte automaticamente (argumento opcional NOME\n"
+"  -l, --login[=NOME]  conecte automaticamente (argumento opcional NOME\n"
 "                      especifica as contas a serem usadas, separadas por\n"
 "                      vírgula)\n"
+"  --display=DISPLAY   seleciona o display X a usar\n"
 "  -v, --version       exiba a versão atual e saia\n"
 
-#: ../pidgin/gtkmain.c:512
-#, fuzzy, c-format
-msgid ""
-"%s has segfaulted and attempted to dump a core file.\n"
+#: ../pidgin/gtkmain.c:528
+#, c-format
+msgid ""
+"%s %s 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"
@@ -15688,7 +16123,7 @@
 "on other protocols is at\n"
 "%swiki/DeveloperPages\n"
 msgstr ""
-"Ocorreu uma falha de segmentação no %s, que tentou criar um\n"
+"Ocorreu uma falha de segmentação no %s %s, que tentou criar um\n"
 "arquivo core.\n"
 "Este é um erro no programa e não ocorreu por culpa sua de jeito\n"
 "nenhum.\n"
@@ -15709,48 +16144,48 @@
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:699 ../pidgin/pidgin.h:51
+#: ../pidgin/gtkmain.c:718 ../pidgin/pidgin.h:51
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#: ../pidgin/gtknotify.c:349
+#: ../pidgin/gtknotify.c:350
 msgid "Open All Messages"
 msgstr "Abrir todas as mensagens"
 
-#: ../pidgin/gtknotify.c:402
+#: ../pidgin/gtknotify.c:403
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Você tem e-mail!</span>"
 
-#: ../pidgin/gtknotify.c:540
+#: ../pidgin/gtknotify.c:546
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s tem %d nova mensagem."
 msgstr[1] "%s tem %d novas mensagens."
 
-#: ../pidgin/gtknotify.c:564
-#, fuzzy, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
-msgstr[0] "<b>Você tem %d novo e-mail.</b>"
-msgstr[1] "<b>Você tem %d novos e-mails.</b>"
-
-#: ../pidgin/gtknotify.c:989
+#: ../pidgin/gtknotify.c:570
+#, c-format
+msgid "<b>%d new e-mail.</b>"
+msgid_plural "<b>%d new e-mails.</b>"
+msgstr[0] "<b>%d novo e-mail.</b>"
+msgstr[1] "<b>%d novos e-mails.</b>"
+
+#: ../pidgin/gtknotify.c:998
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "O comando de navegador \"%s\" é inválido."
 
-#: ../pidgin/gtknotify.c:991 ../pidgin/gtknotify.c:1003
-#: ../pidgin/gtknotify.c:1016 ../pidgin/gtknotify.c:1144
+#: ../pidgin/gtknotify.c:1000 ../pidgin/gtknotify.c:1012
+#: ../pidgin/gtknotify.c:1025 ../pidgin/gtknotify.c:1153
 msgid "Unable to open URL"
 msgstr "Não foi possível abrir URL"
 
-#: ../pidgin/gtknotify.c:1001 ../pidgin/gtknotify.c:1014
+#: ../pidgin/gtknotify.c:1010 ../pidgin/gtknotify.c:1023
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Erro ao executar \"%s\": %s"
 
-#: ../pidgin/gtknotify.c:1145
+#: ../pidgin/gtknotify.c:1154
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
@@ -15769,7 +16204,19 @@
 msgid "Unload Plugins"
 msgstr "Descarregar plugins"
 
-#: ../pidgin/gtkplugin.c:400
+#: ../pidgin/gtkplugin.c:308
+msgid "Could not unload plugin"
+msgstr "Não foi possível descarregar o plugin"
+
+#: ../pidgin/gtkplugin.c:309
+msgid ""
+"The plugin could not be unloaded now, but will be disabled at the next "
+"startup."
+msgstr ""
+"O plugin não pôde ser descarregado no momento, mas será desativado na "
+"próxima inicialização."
+
+#: ../pidgin/gtkplugin.c:417
 #, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
@@ -15780,7 +16227,7 @@
 "<span weight=\"bold\">Página da web:</span>\t\t%s\n"
 "<span weight=\"bold\">Nome do arquivo:</span>\t\t%s"
 
-#: ../pidgin/gtkplugin.c:410
+#: ../pidgin/gtkplugin.c:427
 #, c-format
 msgid ""
 "%s\n"
@@ -15791,11 +16238,11 @@
 "<span foreground=\"#ff0000\" weight=\"bold\">Erro: %s\n"
 "Verifique o site do plugin por novas atualizações.</span>"
 
-#: ../pidgin/gtkplugin.c:536
+#: ../pidgin/gtkplugin.c:562
 msgid "Configure Pl_ugin"
 msgstr "Configurar pl_ugin"
 
-#: ../pidgin/gtkplugin.c:599
+#: ../pidgin/gtkplugin.c:625
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Detalhes do plugin</b>"
 
@@ -15804,95 +16251,95 @@
 msgstr "Selecione um arquivo"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:532
+#: ../pidgin/gtkpounce.c:547
 msgid "Pounce on Whom"
 msgstr "Quem terá a ação"
 
-#: ../pidgin/gtkpounce.c:559
+#: ../pidgin/gtkpounce.c:574
 msgid "_Buddy name:"
 msgstr "_Nome do amigo:"
 
-#: ../pidgin/gtkpounce.c:593
+#: ../pidgin/gtkpounce.c:608
 msgid "Si_gns on"
 msgstr "_Conectar"
 
-#: ../pidgin/gtkpounce.c:595
+#: ../pidgin/gtkpounce.c:610
 msgid "Signs o_ff"
 msgstr "_Desconectar"
 
-#: ../pidgin/gtkpounce.c:597
+#: ../pidgin/gtkpounce.c:612
 msgid "Goes a_way"
 msgstr "O amigo ficar _ausente"
 
-#: ../pidgin/gtkpounce.c:599
+#: ../pidgin/gtkpounce.c:614
 msgid "Ret_urns from away"
 msgstr "Volta_r da ausência"
 
-#: ../pidgin/gtkpounce.c:601
+#: ../pidgin/gtkpounce.c:616
 msgid "Becomes _idle"
 msgstr "Tornar-se _inativo"
 
-#: ../pidgin/gtkpounce.c:603
+#: ../pidgin/gtkpounce.c:618
 msgid "Is no longer i_dle"
 msgstr "Não estiver mais i_nativo"
 
-#: ../pidgin/gtkpounce.c:605
+#: ../pidgin/gtkpounce.c:620
 msgid "Starts _typing"
 msgstr "C_omeçar a digitar"
 
-#: ../pidgin/gtkpounce.c:607
+#: ../pidgin/gtkpounce.c:622
 msgid "P_auses while typing"
 msgstr "P_ausar ao digitar"
 
-#: ../pidgin/gtkpounce.c:609
+#: ../pidgin/gtkpounce.c:624
 msgid "Stops t_yping"
 msgstr "Parar de di_gitar"
 
-#: ../pidgin/gtkpounce.c:611
+#: ../pidgin/gtkpounce.c:626
 msgid "Sends a _message"
 msgstr "En_viar uma mensagem"
 
-#: ../pidgin/gtkpounce.c:654
+#: ../pidgin/gtkpounce.c:669
 msgid "Ope_n an IM window"
 msgstr "Abrir uma jan_ela de MI"
 
-#: ../pidgin/gtkpounce.c:656
+#: ../pidgin/gtkpounce.c:671
 msgid "_Pop up a notification"
 msgstr "Exibir notificação _popup"
 
-#: ../pidgin/gtkpounce.c:658
+#: ../pidgin/gtkpounce.c:673
 msgid "Send a _message"
 msgstr "Envia_r uma mensagem"
 
-#: ../pidgin/gtkpounce.c:660
+#: ../pidgin/gtkpounce.c:675
 msgid "E_xecute a command"
 msgstr "E_xecutar um comando"
 
-#: ../pidgin/gtkpounce.c:662
+#: ../pidgin/gtkpounce.c:677
 msgid "P_lay a sound"
 msgstr "Tocar um _som"
 
-#: ../pidgin/gtkpounce.c:668
+#: ../pidgin/gtkpounce.c:683
 msgid "Brows_e..."
 msgstr "Proc_urar..."
 
-#: ../pidgin/gtkpounce.c:670
+#: ../pidgin/gtkpounce.c:685
 msgid "Br_owse..."
 msgstr "Proc_urar..."
 
-#: ../pidgin/gtkpounce.c:671
+#: ../pidgin/gtkpounce.c:686
 msgid "Pre_view"
 msgstr "Pré-_visualizar"
 
-#: ../pidgin/gtkpounce.c:798
+#: ../pidgin/gtkpounce.c:818
 msgid "P_ounce only when my status is not Available"
 msgstr "_Executar apenas quando meu status não for Disponível"
 
-#: ../pidgin/gtkpounce.c:803
+#: ../pidgin/gtkpounce.c:823
 msgid "_Recurring"
 msgstr "_Recorrente"
 
-#: ../pidgin/gtkpounce.c:1246
+#: ../pidgin/gtkpounce.c:1266
 msgid "Pounce Target"
 msgstr "Alvo da ação"
 
@@ -15909,7 +16356,7 @@
 msgid "Install Theme"
 msgstr "Instalar tema"
 
-#: ../pidgin/gtkprefs.c:697
+#: ../pidgin/gtkprefs.c:698
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
@@ -15917,15 +16364,15 @@
 "Selecione um tema de emoticons que você gostaria de usar da lista abaixo. "
 "Novos temas podem ser instalados arrastando e soltando-os na lista de temas."
 
-#: ../pidgin/gtkprefs.c:732
+#: ../pidgin/gtkprefs.c:733
 msgid "Icon"
 msgstr "Ícone"
 
-#: ../pidgin/gtkprefs.c:894
+#: ../pidgin/gtkprefs.c:895
 msgid "System Tray Icon"
 msgstr "Ícone da bandeja"
 
-#: ../pidgin/gtkprefs.c:895
+#: ../pidgin/gtkprefs.c:896
 msgid "_Show system tray icon:"
 msgstr "Mo_strar ícone da bandeja"
 
@@ -15933,116 +16380,120 @@
 msgid "On unread messages"
 msgstr "Para as mensagens não lidas"
 
-#: ../pidgin/gtkprefs.c:904
+#: ../pidgin/gtkprefs.c:905
 msgid "Conversation Window Hiding"
 msgstr "Quando esconder as janelas de conversa"
 
-#: ../pidgin/gtkprefs.c:905
+#: ../pidgin/gtkprefs.c:906
 msgid "_Hide new IM conversations:"
 msgstr "_Esconder novas conversas de MI:"
 
-#: ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1944
+#: ../pidgin/gtkprefs.c:909 ../pidgin/gtkprefs.c:2045
 msgid "When away"
 msgstr "Quando ausente"
 
 #. All the tab options!
-#: ../pidgin/gtkprefs.c:916
+#: ../pidgin/gtkprefs.c:917
 msgid "Tabs"
 msgstr "Abas"
 
-#: ../pidgin/gtkprefs.c:918
+#: ../pidgin/gtkprefs.c:919
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Mostrar mensagens instantâneas e bate-papos em janelas com _abas"
 
-#: ../pidgin/gtkprefs.c:932
+#: ../pidgin/gtkprefs.c:933
 msgid "Show close b_utton on tabs"
 msgstr "Mostrar o b_otão de fechar nas abas"
 
-#: ../pidgin/gtkprefs.c:935
+#: ../pidgin/gtkprefs.c:936
 msgid "_Placement:"
 msgstr "_Posicionamento:"
 
-#: ../pidgin/gtkprefs.c:937
+#: ../pidgin/gtkprefs.c:938
 msgid "Top"
 msgstr "Cima"
 
-#: ../pidgin/gtkprefs.c:938
+#: ../pidgin/gtkprefs.c:939
 msgid "Bottom"
 msgstr "Baixo"
 
-#: ../pidgin/gtkprefs.c:939
+#: ../pidgin/gtkprefs.c:940
 msgid "Left"
 msgstr "Esquerda"
 
-#: ../pidgin/gtkprefs.c:940
+#: ../pidgin/gtkprefs.c:941
 msgid "Right"
 msgstr "Direita"
 
-#: ../pidgin/gtkprefs.c:942
+#: ../pidgin/gtkprefs.c:943
 msgid "Left Vertical"
 msgstr "Vertical à esquerda"
 
-#: ../pidgin/gtkprefs.c:943
+#: ../pidgin/gtkprefs.c:944
 msgid "Right Vertical"
 msgstr "Vertical à direita"
 
-#: ../pidgin/gtkprefs.c:950
+#: ../pidgin/gtkprefs.c:951
 msgid "N_ew conversations:"
 msgstr "Novas conv_ersas:"
 
-#: ../pidgin/gtkprefs.c:995
+#: ../pidgin/gtkprefs.c:997
 msgid "Show _formatting on incoming messages"
 msgstr "Mostrar _formatação nas mensagens recebidas"
 
-#: ../pidgin/gtkprefs.c:998
+#: ../pidgin/gtkprefs.c:999
+msgid "Close IMs immediately when the tab is closed"
+msgstr "Fechar janelas de MI imediatamente quando a aba for fechada"
+
+#: ../pidgin/gtkprefs.c:1002
 msgid "Show _detailed information"
 msgstr "Exibir informações _detalhadas"
 
-#: ../pidgin/gtkprefs.c:1000
+#: ../pidgin/gtkprefs.c:1004
 msgid "Enable buddy ic_on animation"
 msgstr "Ativar animação nos íc_ones de amigos"
 
-#: ../pidgin/gtkprefs.c:1007
+#: ../pidgin/gtkprefs.c:1011
 msgid "_Notify buddies that you are typing to them"
 msgstr "_Notificar amigos de que você está digitando para eles"
 
-#: ../pidgin/gtkprefs.c:1010
+#: ../pidgin/gtkprefs.c:1014
 msgid "Highlight _misspelled words"
 msgstr "Realçar palavras _mal grafadas"
 
-#: ../pidgin/gtkprefs.c:1014
+#: ../pidgin/gtkprefs.c:1018
 msgid "Use smooth-scrolling"
 msgstr "Usar rolagem suave"
 
-#: ../pidgin/gtkprefs.c:1017
+#: ../pidgin/gtkprefs.c:1021
 msgid "F_lash window when IMs are received"
 msgstr "_Piscar a janela quando mensagens forem recebidas"
 
-#: ../pidgin/gtkprefs.c:1019
+#: ../pidgin/gtkprefs.c:1023
 msgid "Minimi_ze new conversation windows"
 msgstr "Minimi_zar novas janelas de conversa"
 
-#: ../pidgin/gtkprefs.c:1023
-msgid "Font"
-msgstr "Fonte"
-
-#: ../pidgin/gtkprefs.c:1025
-msgid "Use document font from _theme"
-msgstr "Usar a fonte de documento do _tema"
-
 #: ../pidgin/gtkprefs.c:1027
+msgid "Font"
+msgstr "Fonte"
+
+#: ../pidgin/gtkprefs.c:1029
+msgid "Use document font from _theme"
+msgstr "Usar a fonte de documento do _tema"
+
+#: ../pidgin/gtkprefs.c:1031
 msgid "Use font from _theme"
 msgstr "Usar a fonte do _tema"
 
-#: ../pidgin/gtkprefs.c:1029
+#: ../pidgin/gtkprefs.c:1033
 msgid "Conversation _font:"
 msgstr "_Fonte para as conversas:"
 
-#: ../pidgin/gtkprefs.c:1043
+#: ../pidgin/gtkprefs.c:1047
 msgid "Default Formatting"
 msgstr "Formatação padrão"
 
-#: ../pidgin/gtkprefs.c:1062
+#: ../pidgin/gtkprefs.c:1066
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
@@ -16050,119 +16501,155 @@
 "Sua mensagem enviada aparecerá assim quando você usar protocolos que "
 "suportem formatação."
 
-#: ../pidgin/gtkprefs.c:1128
+#: ../pidgin/gtkprefs.c:1126
+msgid "Cannot start proxy configuration program."
+msgstr "Não foi possível iniciar o programa de configuração do proxy."
+
+#: ../pidgin/gtkprefs.c:1138
+msgid "Cannot start browser configuration program."
+msgstr "Não foi possível iniciar o programa de configuração do navegador."
+
+#: ../pidgin/gtkprefs.c:1158
 msgid "ST_UN server:"
 msgstr "_Servidor ST_UN:"
 
-#: ../pidgin/gtkprefs.c:1140
+#: ../pidgin/gtkprefs.c:1170
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Exemplo: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1144
+#: ../pidgin/gtkprefs.c:1174
 msgid "_Autodetect IP address"
 msgstr "Detectar endereço IP _automaticamente"
 
-#: ../pidgin/gtkprefs.c:1153
+#: ../pidgin/gtkprefs.c:1183
 msgid "Public _IP:"
 msgstr "_IP público:"
 
-#: ../pidgin/gtkprefs.c:1182
+#: ../pidgin/gtkprefs.c:1214
 msgid "Ports"
 msgstr "Portas"
 
-#: ../pidgin/gtkprefs.c:1185
+#: ../pidgin/gtkprefs.c:1217
 msgid "_Manually specify range of ports to listen on"
 msgstr "Especificar _manualmente as portas a escutar"
 
-#: ../pidgin/gtkprefs.c:1188
+#: ../pidgin/gtkprefs.c:1220
 msgid "_Start port:"
 msgstr "Porta _inicial:"
 
-#: ../pidgin/gtkprefs.c:1195
+#: ../pidgin/gtkprefs.c:1227
 msgid "_End port:"
 msgstr "Porta _final:"
 
-#: ../pidgin/gtkprefs.c:1203
-msgid "Proxy Server"
-msgstr "Servidor proxy"
-
-#: ../pidgin/gtkprefs.c:1207
-msgid "No proxy"
-msgstr "Nenhum proxy"
+#: ../pidgin/gtkprefs.c:1235
+msgid "Proxy Server &amp; Browser"
+msgstr "Servidor proxy &amp; navegador"
+
+#: ../pidgin/gtkprefs.c:1243
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>O programa de configuração do proxy não foi encontrado</b>"
+
+#: ../pidgin/gtkprefs.c:1251
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>O programa de configuração do browser não foi encontrado.</b>"
+
+#: ../pidgin/gtkprefs.c:1256
+msgid ""
+"Proxy & Browser preferences are configured\n"
+"in GNOME Preferences"
+msgstr ""
+"Preferências do proxy e do navegador são configuradas\n"
+"nas preferências do GNOME"
 
 #: ../pidgin/gtkprefs.c:1263
+msgid "Configure _Proxy"
+msgstr "Configurar _proxy"
+
+#: ../pidgin/gtkprefs.c:1268
+msgid "Configure _Browser"
+msgstr "Configurar _navegador"
+
+#: ../pidgin/gtkprefs.c:1274
+msgid "Proxy Server"
+msgstr "Servidor proxy"
+
+#: ../pidgin/gtkprefs.c:1279
+msgid "No proxy"
+msgstr "Nenhum proxy"
+
+#: ../pidgin/gtkprefs.c:1335
 msgid "_User:"
 msgstr "_Usuário:"
 
-#: ../pidgin/gtkprefs.c:1328
+#: ../pidgin/gtkprefs.c:1423
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1329
+#: ../pidgin/gtkprefs.c:1424
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1330
+#: ../pidgin/gtkprefs.c:1425
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1331
+#: ../pidgin/gtkprefs.c:1426
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1332
+#: ../pidgin/gtkprefs.c:1427
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1333
+#: ../pidgin/gtkprefs.c:1428
 msgid "GNOME Default"
 msgstr "Padrão do GNOME"
 
-#: ../pidgin/gtkprefs.c:1334
+#: ../pidgin/gtkprefs.c:1429
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1335
+#: ../pidgin/gtkprefs.c:1430
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1336
+#: ../pidgin/gtkprefs.c:1431
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1337
+#: ../pidgin/gtkprefs.c:1432
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1346
+#: ../pidgin/gtkprefs.c:1441
 msgid "Manual"
 msgstr "Manual"
 
-#: ../pidgin/gtkprefs.c:1399
+#: ../pidgin/gtkprefs.c:1494
 msgid "Browser Selection"
 msgstr "Seleção do navegador"
 
-#: ../pidgin/gtkprefs.c:1403
+#: ../pidgin/gtkprefs.c:1498
 msgid "_Browser:"
 msgstr "_Navegador:"
 
-#: ../pidgin/gtkprefs.c:1411
+#: ../pidgin/gtkprefs.c:1506
 msgid "_Open link in:"
 msgstr "_Abrir link no:"
 
-#: ../pidgin/gtkprefs.c:1413
+#: ../pidgin/gtkprefs.c:1508
 msgid "Browser default"
 msgstr "Navegador padrão"
 
-#: ../pidgin/gtkprefs.c:1414
+#: ../pidgin/gtkprefs.c:1509
 msgid "Existing window"
 msgstr "Janela existente"
 
-#: ../pidgin/gtkprefs.c:1416
+#: ../pidgin/gtkprefs.c:1511
 msgid "New tab"
 msgstr "Nova aba"
 
-#: ../pidgin/gtkprefs.c:1430
+#: ../pidgin/gtkprefs.c:1525
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -16171,69 +16658,69 @@
 "_Manual:\n"
 "(%s para URL)"
 
-#: ../pidgin/gtkprefs.c:1470
+#: ../pidgin/gtkprefs.c:1566
 msgid "Log _format:"
-msgstr "_Formato do log:"
-
-#: ../pidgin/gtkprefs.c:1475
+msgstr "_Formato do histórico:"
+
+#: ../pidgin/gtkprefs.c:1571
 msgid "Log all _instant messages"
 msgstr "_Gravar todas as mensagens instantâneas"
 
-#: ../pidgin/gtkprefs.c:1477
+#: ../pidgin/gtkprefs.c:1573
 msgid "Log all c_hats"
 msgstr "Gravar todos os _bate-papos"
 
-#: ../pidgin/gtkprefs.c:1479
+#: ../pidgin/gtkprefs.c:1575
 msgid "Log all _status changes to system log"
-msgstr "Gravar todos as mudanças de _status no log do sistema"
-
-#: ../pidgin/gtkprefs.c:1625
+msgstr "Gravar todos as mudanças de _status no histórico do sistema"
+
+#: ../pidgin/gtkprefs.c:1725
 msgid "Sound Selection"
 msgstr "Seleção de som"
 
-#: ../pidgin/gtkprefs.c:1635
+#: ../pidgin/gtkprefs.c:1735
 #, c-format
 msgid "Quietest"
 msgstr "Muito silencioso"
 
-#: ../pidgin/gtkprefs.c:1637
+#: ../pidgin/gtkprefs.c:1737
 #, c-format
 msgid "Quieter"
 msgstr "Mais silencioso"
 
-#: ../pidgin/gtkprefs.c:1639
+#: ../pidgin/gtkprefs.c:1739
 #, c-format
 msgid "Quiet"
 msgstr "Silencioso"
 
-#: ../pidgin/gtkprefs.c:1643
+#: ../pidgin/gtkprefs.c:1743
 #, c-format
 msgid "Loud"
 msgstr "Alto"
 
-#: ../pidgin/gtkprefs.c:1645
+#: ../pidgin/gtkprefs.c:1745
 #, c-format
 msgid "Louder"
 msgstr "Mais alto"
 
-#: ../pidgin/gtkprefs.c:1647
+#: ../pidgin/gtkprefs.c:1747
 #, c-format
 msgid "Loudest"
 msgstr "Muito alto"
 
-#: ../pidgin/gtkprefs.c:1713
+#: ../pidgin/gtkprefs.c:1813
 msgid "_Method:"
 msgstr "_Método:"
 
-#: ../pidgin/gtkprefs.c:1715
+#: ../pidgin/gtkprefs.c:1815
 msgid "Console beep"
 msgstr "Bipe do console"
 
-#: ../pidgin/gtkprefs.c:1722
+#: ../pidgin/gtkprefs.c:1822
 msgid "No sounds"
 msgstr "Sem sons"
 
-#: ../pidgin/gtkprefs.c:1730
+#: ../pidgin/gtkprefs.c:1830
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -16242,81 +16729,81 @@
 "C_omando do som:\n"
 "(%s para nome do arquivo)"
 
-#: ../pidgin/gtkprefs.c:1757
+#: ../pidgin/gtkprefs.c:1857
 msgid "Sounds when conversation has _focus"
 msgstr "Emitir sons quando a janela da conversa _ganhar foco"
 
-#: ../pidgin/gtkprefs.c:1759
+#: ../pidgin/gtkprefs.c:1859
 msgid "Enable sounds:"
 msgstr "Ativar sons:"
 
-#: ../pidgin/gtkprefs.c:1770
+#: ../pidgin/gtkprefs.c:1870
 msgid "Volume:"
 msgstr "Volume:"
 
-#: ../pidgin/gtkprefs.c:1850
+#: ../pidgin/gtkprefs.c:1950
 msgid "Play"
 msgstr "Tocar"
 
-#: ../pidgin/gtkprefs.c:1927
+#: ../pidgin/gtkprefs.c:2028
 msgid "_Report idle time:"
 msgstr "Mostrar _tempo de inatividade:"
 
-#: ../pidgin/gtkprefs.c:1932
+#: ../pidgin/gtkprefs.c:2033
 msgid "Based on keyboard or mouse use"
 msgstr "A partir do uso do mouse/teclado"
 
-#: ../pidgin/gtkprefs.c:1941
+#: ../pidgin/gtkprefs.c:2042
 msgid "_Auto-reply:"
 msgstr "_Auto-resposta:"
 
-#: ../pidgin/gtkprefs.c:1945
+#: ../pidgin/gtkprefs.c:2046
 msgid "When both away and idle"
 msgstr "Quando ausente e inativo"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1951
+#: ../pidgin/gtkprefs.c:2052
 msgid "Auto-away"
 msgstr "Auto-ausente"
 
-#: ../pidgin/gtkprefs.c:1953
+#: ../pidgin/gtkprefs.c:2054
 msgid "Change status when _idle"
 msgstr "Mudar status após _inatividade"
 
-#: ../pidgin/gtkprefs.c:1957
+#: ../pidgin/gtkprefs.c:2058
 msgid "_Minutes before becoming idle:"
 msgstr "_Minutos antes de tornar inativo:"
 
-#: ../pidgin/gtkprefs.c:1965
+#: ../pidgin/gtkprefs.c:2066
 msgid "Change _status to:"
 msgstr "Mudar status para:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1986
+#: ../pidgin/gtkprefs.c:2087
 msgid "Status at Startup"
 msgstr "Status na inicialização"
 
-#: ../pidgin/gtkprefs.c:1988
+#: ../pidgin/gtkprefs.c:2089
 msgid "Use status from last _exit at startup"
 msgstr "Usar o s_tatus da última saída ao iniciar"
 
-#: ../pidgin/gtkprefs.c:1994
+#: ../pidgin/gtkprefs.c:2095
 msgid "Status to a_pply at startup:"
 msgstr "Status a a_plicar na inicialização:"
 
-#: ../pidgin/gtkprefs.c:2032
+#: ../pidgin/gtkprefs.c:2134
 msgid "Interface"
 msgstr "Interface"
 
-#: ../pidgin/gtkprefs.c:2034
+#: ../pidgin/gtkprefs.c:2136
 msgid "Smiley Themes"
 msgstr "Temas de emoticons"
 
-#: ../pidgin/gtkprefs.c:2041
+#: ../pidgin/gtkprefs.c:2143
 msgid "Browser"
 msgstr "Navegador"
 
-#: ../pidgin/gtkprefs.c:2045
+#: ../pidgin/gtkprefs.c:2147
 msgid "Status / Idle"
 msgstr "Status / Inativo"
 
@@ -16340,105 +16827,105 @@
 msgid "Block only the users below"
 msgstr "Bloquear apenas os usuários abaixo"
 
-#: ../pidgin/gtkprivacy.c:370
+#: ../pidgin/gtkprivacy.c:372
 msgid "Privacy"
 msgstr "Privacidade"
 
-#: ../pidgin/gtkprivacy.c:382
+#: ../pidgin/gtkprivacy.c:384
 msgid "Changes to privacy settings take effect immediately."
 msgstr ""
 "Mudanças nas configurações de privacidade entram em efeito imediatamente."
 
 #. "Set privacy for:" label
-#: ../pidgin/gtkprivacy.c:394
+#: ../pidgin/gtkprivacy.c:396
 msgid "Set privacy for:"
 msgstr "Definir privacidade para:"
 
-#: ../pidgin/gtkprivacy.c:557 ../pidgin/gtkprivacy.c:574
+#: ../pidgin/gtkprivacy.c:559 ../pidgin/gtkprivacy.c:576
 msgid "Permit User"
 msgstr "Permitir usuário"
 
-#: ../pidgin/gtkprivacy.c:558
+#: ../pidgin/gtkprivacy.c:560
 msgid "Type a user you permit to contact you."
 msgstr "Digite um usuário que você permite que o contate."
 
-#: ../pidgin/gtkprivacy.c:559
+#: ../pidgin/gtkprivacy.c:561
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr ""
 "Favor digitar o nome do usuário que você gostaria que pudesse contatar você."
 
-#: ../pidgin/gtkprivacy.c:562 ../pidgin/gtkprivacy.c:578
+#: ../pidgin/gtkprivacy.c:564 ../pidgin/gtkprivacy.c:580
 msgid "_Permit"
 msgstr "_Permitir"
 
-#: ../pidgin/gtkprivacy.c:568
+#: ../pidgin/gtkprivacy.c:570
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Permitir que %s te contate?"
 
-#: ../pidgin/gtkprivacy.c:570
+#: ../pidgin/gtkprivacy.c:572
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Você tem certeza de que deseja permitir que %s te contate?"
 
-#: ../pidgin/gtkprivacy.c:599 ../pidgin/gtkprivacy.c:613
+#: ../pidgin/gtkprivacy.c:601 ../pidgin/gtkprivacy.c:615
 msgid "Block User"
 msgstr "Bloquear o usuário"
 
-#: ../pidgin/gtkprivacy.c:600
+#: ../pidgin/gtkprivacy.c:602
 msgid "Type a user to block."
 msgstr "Digite um usuário para bloquear."
 
-#: ../pidgin/gtkprivacy.c:601
+#: ../pidgin/gtkprivacy.c:603
 msgid "Please enter the name of the user you wish to block."
 msgstr "Por favor digite o nome do usuário que você deseja bloquear."
 
-#: ../pidgin/gtkprivacy.c:609
+#: ../pidgin/gtkprivacy.c:611
 #, c-format
 msgid "Block %s?"
 msgstr "Bloquear %s?"
 
-#: ../pidgin/gtkprivacy.c:611
+#: ../pidgin/gtkprivacy.c:613
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Você tem certeza de que deseja bloquear %s?"
 
-#: ../pidgin/gtkrequest.c:272
+#: ../pidgin/gtkrequest.c:322
 msgid "Apply"
 msgstr "Aplicar"
 
-#: ../pidgin/gtkrequest.c:1507
+#: ../pidgin/gtkrequest.c:1651
 msgid "That file already exists"
 msgstr "Este arquivo já existe"
 
-#: ../pidgin/gtkrequest.c:1508
+#: ../pidgin/gtkrequest.c:1652
 msgid "Would you like to overwrite it?"
 msgstr "Você deseja sobrescrevê-lo?"
 
-#: ../pidgin/gtkrequest.c:1511
+#: ../pidgin/gtkrequest.c:1655
 msgid "Overwrite"
 msgstr "Sobrescrever"
 
-#: ../pidgin/gtkrequest.c:1512
+#: ../pidgin/gtkrequest.c:1656
 msgid "Choose New Name"
 msgstr "Escolher novo nome"
 
-#: ../pidgin/gtkrequest.c:1650 ../pidgin/gtkrequest.c:1664
+#: ../pidgin/gtkrequest.c:1797 ../pidgin/gtkrequest.c:1811
 msgid "Select Folder..."
 msgstr "Selecionar pasta..."
 
 #. Create the window.
-#: ../pidgin/gtkroomlist.c:375
+#: ../pidgin/gtkroomlist.c:518 ../pidgin/gtkroomlist.c:688
 msgid "Room List"
 msgstr "Lista de salas"
 
 #. list button
-#: ../pidgin/gtkroomlist.c:443
+#: ../pidgin/gtkroomlist.c:756
 msgid "_Get List"
 msgstr "Ob_ter lista"
 
 #. add button
-#: ../pidgin/gtkroomlist.c:451
+#: ../pidgin/gtkroomlist.c:764
 msgid "_Add Chat"
 msgstr "_Adicionar bate-papo"
 
@@ -16447,7 +16934,7 @@
 msgstr "Você tem certeza de que deseja remover os status salvos selecionados?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:620 ../pidgin/gtksavedstatuses.c:1266
+#: ../pidgin/gtksavedstatuses.c:620 ../pidgin/gtksavedstatuses.c:1273
 msgid "_Use"
 msgstr "_Usar"
 
@@ -16457,29 +16944,29 @@
 "Este título já está sendo utilizado. Você precisa selecionar um título que "
 "ainda não exista."
 
-#: ../pidgin/gtksavedstatuses.c:970
+#: ../pidgin/gtksavedstatuses.c:976
 msgid "Different"
 msgstr "Outro"
 
-#: ../pidgin/gtksavedstatuses.c:1159
+#: ../pidgin/gtksavedstatuses.c:1165
 msgid "_Title:"
 msgstr "_Título:"
 
-#: ../pidgin/gtksavedstatuses.c:1178 ../pidgin/gtksavedstatuses.c:1497
+#: ../pidgin/gtksavedstatuses.c:1184 ../pidgin/gtksavedstatuses.c:1505
 msgid "_Status:"
 msgstr "_Status:"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1210
+#: ../pidgin/gtksavedstatuses.c:1217
 msgid "Use a _different status for some accounts"
 msgstr "Use um status _diferente para algumas contas"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1274
+#: ../pidgin/gtksavedstatuses.c:1281
 msgid "Sa_ve & Use"
 msgstr "Sal_var e usar"
 
-#: ../pidgin/gtksavedstatuses.c:1480
+#: ../pidgin/gtksavedstatuses.c:1488
 #, c-format
 msgid "Status for %s"
 msgstr "Status de %s"
@@ -16488,25 +16975,33 @@
 msgid "Waiting for network connection"
 msgstr "Esperando pela conexão de rede"
 
-#: ../pidgin/gtkutils.c:632
+#: ../pidgin/gtkstatusbox.c:1072
+msgid "New status..."
+msgstr "Novo status..."
+
+#: ../pidgin/gtkstatusbox.c:1073
+msgid "Saved statuses..."
+msgstr "Status salvos..."
+
+#: ../pidgin/gtkutils.c:634
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1399 ../pidgin/gtkutils.c:1422
+#: ../pidgin/gtkutils.c:1401 ../pidgin/gtkutils.c:1424
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "O seguinte erro ocorreu ao carregar %s: %s."
 
-#: ../pidgin/gtkutils.c:1402 ../pidgin/gtkutils.c:1424
+#: ../pidgin/gtkutils.c:1404 ../pidgin/gtkutils.c:1426
 msgid "Failed to load image"
 msgstr "Falha ao carregar imagem"
 
-#: ../pidgin/gtkutils.c:1498
+#: ../pidgin/gtkutils.c:1500
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Não foi possível enviar a pasta %s."
 
-#: ../pidgin/gtkutils.c:1499
+#: ../pidgin/gtkutils.c:1501
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
@@ -16515,12 +17010,12 @@
 "O %s não pode transferir uma pasta. Você terá que enviar os arquivos que "
 "estão dentro dela individualmente."
 
-#: ../pidgin/gtkutils.c:1531 ../pidgin/gtkutils.c:1543
-#: ../pidgin/gtkutils.c:1550
+#: ../pidgin/gtkutils.c:1535 ../pidgin/gtkutils.c:1547
+#: ../pidgin/gtkutils.c:1554
 msgid "You have dragged an image"
 msgstr "Você arrastou uma imagem"
 
-#: ../pidgin/gtkutils.c:1532
+#: ../pidgin/gtkutils.c:1536
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
@@ -16528,23 +17023,23 @@
 "Você pode usar esta imagem numa transferência de arquivo, incluí-la nesta "
 "mensagem, ou usá-la como o ícone de amigo para este usuário."
 
-#: ../pidgin/gtkutils.c:1538 ../pidgin/gtkutils.c:1558
+#: ../pidgin/gtkutils.c:1542 ../pidgin/gtkutils.c:1562
 msgid "Set as buddy icon"
 msgstr "Definir como ícone de amigo"
 
-#: ../pidgin/gtkutils.c:1539 ../pidgin/gtkutils.c:1559
+#: ../pidgin/gtkutils.c:1543 ../pidgin/gtkutils.c:1563
 msgid "Send image file"
 msgstr "Enviar arquivo de imagem"
 
-#: ../pidgin/gtkutils.c:1540 ../pidgin/gtkutils.c:1559
+#: ../pidgin/gtkutils.c:1544 ../pidgin/gtkutils.c:1563
 msgid "Insert in message"
 msgstr "Inserir na mensagem"
 
-#: ../pidgin/gtkutils.c:1544
+#: ../pidgin/gtkutils.c:1548
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Você deseja defini-la como o ícone de amigo deste usuário?"
 
-#: ../pidgin/gtkutils.c:1551
+#: ../pidgin/gtkutils.c:1555
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
@@ -16552,7 +17047,7 @@
 "Você pode usar esta imagem numa transferência de arquivo, ou usá-la como o "
 "ícone de amigo para este usuário."
 
-#: ../pidgin/gtkutils.c:1552
+#: ../pidgin/gtkutils.c:1556
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -16565,11 +17060,11 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1610
+#: ../pidgin/gtkutils.c:1615
 msgid "Cannot send launcher"
 msgstr "Não é possível enviar atalhos"
 
-#: ../pidgin/gtkutils.c:1610
+#: ../pidgin/gtkutils.c:1615
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -16577,7 +17072,7 @@
 "Você arrastou um atalho da área de trabalho. Provavelmente você queria "
 "enviar o destino do atalho, e não o atalho em si."
 
-#: ../pidgin/gtkutils.c:2345
+#: ../pidgin/gtkutils.c:2350
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -16588,25 +17083,25 @@
 "<b>Tamanho do arquivo:</b> %s\n"
 "<b>Dimensões da imagem:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2641
+#: ../pidgin/gtkutils.c:2646
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr "O arquivo '%s' é grande demais para %s. Tente uma imagem menor.\n"
 
-#: ../pidgin/gtkutils.c:2643
+#: ../pidgin/gtkutils.c:2648
 msgid "Icon Error"
 msgstr "Erro no ícone"
 
-#: ../pidgin/gtkutils.c:2644
+#: ../pidgin/gtkutils.c:2649
 msgid "Could not set icon"
 msgstr "Não foi possível definir o ícone"
 
-#: ../pidgin/gtkutils.c:2744
+#: ../pidgin/gtkutils.c:2749
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Falha ao abrir arquivo '%s': %s"
 
-#: ../pidgin/gtkutils.c:2793
+#: ../pidgin/gtkutils.c:2798
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -16662,35 +17157,35 @@
 msgid "none"
 msgstr "nenhum"
 
-#: ../pidgin/plugins/cap/cap.c:450
+#: ../pidgin/plugins/cap/cap.c:451
 msgid "Display Statistics"
 msgstr "Mostrar estatísticas"
 
-#: ../pidgin/plugins/cap/cap.c:462 ../pidgin/plugins/cap/cap.c:465
+#: ../pidgin/plugins/cap/cap.c:464 ../pidgin/plugins/cap/cap.c:467
 msgid "Response Probability:"
 msgstr "Probabilidade de resposta"
 
-#: ../pidgin/plugins/cap/cap.c:811
+#: ../pidgin/plugins/cap/cap.c:813
 msgid "Statistics Configuration"
 msgstr "Configuração das estatísticas"
 
 #. msg_difference spinner
-#: ../pidgin/plugins/cap/cap.c:814
+#: ../pidgin/plugins/cap/cap.c:816
 msgid "Maximum response timeout:"
 msgstr "Tempo limite de resposta:"
 
-#: ../pidgin/plugins/cap/cap.c:817 ../pidgin/plugins/cap/cap.c:824
-#: ../pidgin/plugins/cap/cap.c:831 ../pidgin/plugins/timestamp.c:150
+#: ../pidgin/plugins/cap/cap.c:819 ../pidgin/plugins/cap/cap.c:826
+#: ../pidgin/plugins/cap/cap.c:833 ../pidgin/plugins/timestamp.c:150
 msgid "minutes"
 msgstr "minutos"
 
 #. last_seen spinner
-#: ../pidgin/plugins/cap/cap.c:821
+#: ../pidgin/plugins/cap/cap.c:823
 msgid "Maximum last-seen difference:"
 msgstr "Diferença máxima da variável \"visto pela última vez\""
 
 #. threshold spinner
-#: ../pidgin/plugins/cap/cap.c:828
+#: ../pidgin/plugins/cap/cap.c:830
 msgid "Threshold:"
 msgstr "Limite:"
 
@@ -16700,18 +17195,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/cap/cap.c:936
+#: ../pidgin/plugins/cap/cap.c:938
 msgid "Contact Availability Prediction"
 msgstr "Previsão de disponibilidade do contato"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/cap/cap.c:938
+#: ../pidgin/plugins/cap/cap.c:940
 msgid "Contact Availability Prediction plugin."
 msgstr "Plugin de previsão de disponibilidade do contato."
 
 #. *  summary
-#: ../pidgin/plugins/cap/cap.c:939
+#: ../pidgin/plugins/cap/cap.c:941
 msgid ""
 "The contact availability plugin (cap) is used to display statistical "
 "information about buddies in a users contact list."
@@ -16766,21 +17261,21 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/contact_priority.c:187
+#: ../pidgin/plugins/contact_priority.c:188
 msgid "Contact Priority"
 msgstr "Prioridade de contatos"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../pidgin/plugins/contact_priority.c:190
+#: ../pidgin/plugins/contact_priority.c:191
 msgid ""
 "Allows for controlling the values associated with different buddy states."
 msgstr ""
 "Permite controlar os valores associados com diferentes status de amigos."
 
 #. *< description
-#: ../pidgin/plugins/contact_priority.c:192
+#: ../pidgin/plugins/contact_priority.c:193
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
@@ -16816,7 +17311,7 @@
 msgid "Received Messages"
 msgstr "Mensagens recebidas"
 
-#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:251
+#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:245
 #, c-format
 msgid "Select Color for %s"
 msgstr "Selecione a cor de %s"
@@ -17097,7 +17592,7 @@
 "\n"
 "<b>Comentário do amigo</b>: %s"
 
-#: ../pidgin/plugins/history.c:188
+#: ../pidgin/plugins/history.c:195
 msgid "History"
 msgstr "Histórico"
 
@@ -17353,45 +17848,37 @@
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Separação horizontal do GtkTreeView"
 
-#: ../pidgin/plugins/pidginrc.c:73
+#: ../pidgin/plugins/pidginrc.c:69
 msgid "Conversation Entry"
 msgstr "Janela de conversas"
 
-#: ../pidgin/plugins/pidginrc.c:74
-msgid "Conversation History"
-msgstr "Histórico de conversas"
-
-#: ../pidgin/plugins/pidginrc.c:75
-msgid "Log Viewer"
-msgstr "Visualizador de logs"
-
-#: ../pidgin/plugins/pidginrc.c:76
+#: ../pidgin/plugins/pidginrc.c:70
 msgid "Request Dialog"
 msgstr "Diálogo de requisição"
 
-#: ../pidgin/plugins/pidginrc.c:77
+#: ../pidgin/plugins/pidginrc.c:71
 msgid "Notify Dialog"
 msgstr "Diálogo de notificação"
 
-#: ../pidgin/plugins/pidginrc.c:253
+#: ../pidgin/plugins/pidginrc.c:247
 msgid "Select Color"
 msgstr "Selecionar cor"
 
-#: ../pidgin/plugins/pidginrc.c:300
+#: ../pidgin/plugins/pidginrc.c:294
 #, c-format
 msgid "Select Interface Font"
 msgstr "Selecionar fonte da interface"
 
-#: ../pidgin/plugins/pidginrc.c:303
+#: ../pidgin/plugins/pidginrc.c:297
 #, c-format
 msgid "Select Font for %s"
 msgstr "Selecionar fonte de %s"
 
-#: ../pidgin/plugins/pidginrc.c:371
+#: ../pidgin/plugins/pidginrc.c:365
 msgid "GTK+ Interface Font"
 msgstr "Fonte da interface do GTK+"
 
-#: ../pidgin/plugins/pidginrc.c:391
+#: ../pidgin/plugins/pidginrc.c:385
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Tema de atalhos do GTK+"
 
@@ -17415,36 +17902,36 @@
 #. widget_bool_widgets[i]);
 #. }
 #.
-#: ../pidgin/plugins/pidginrc.c:428
+#: ../pidgin/plugins/pidginrc.c:422
 msgid "Interface colors"
 msgstr "_Cores da interface"
 
-#: ../pidgin/plugins/pidginrc.c:452
+#: ../pidgin/plugins/pidginrc.c:446
 msgid "Widget Sizes"
 msgstr "Tamanho dos controles"
 
-#: ../pidgin/plugins/pidginrc.c:473
+#: ../pidgin/plugins/pidginrc.c:467
 msgid "Fonts"
 msgstr "Fontes"
 
-#: ../pidgin/plugins/pidginrc.c:497
+#: ../pidgin/plugins/pidginrc.c:491
 msgid "Gtkrc File Tools"
 msgstr "Ferramentas do gtkrc"
 
-#: ../pidgin/plugins/pidginrc.c:502
+#: ../pidgin/plugins/pidginrc.c:496
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "Gravar configurações em %s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:511
+#: ../pidgin/plugins/pidginrc.c:505
 msgid "Re-read gtkrc files"
 msgstr "Re-carregar arquivos gtkrc"
 
-#: ../pidgin/plugins/pidginrc.c:544
+#: ../pidgin/plugins/pidginrc.c:543
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Controle do tema do GTK+ do Pidgin"
 
-#: ../pidgin/plugins/pidginrc.c:546 ../pidgin/plugins/pidginrc.c:547
+#: ../pidgin/plugins/pidginrc.c:545 ../pidgin/plugins/pidginrc.c:546
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "Oferece acesso a configurações do gtkrc comumente utilizadas."
 
@@ -17477,7 +17964,7 @@
 #: ../pidgin/plugins/relnot.c:79
 #, c-format
 msgid "<b>ChangeLog:</b><br>%s"
-msgstr "<b>Log de alterações:</b><br>%s"
+msgstr "<b>Histórico de alterações:</b><br>%s"
 
 #: ../pidgin/plugins/relnot.c:84 ../pidgin/plugins/relnot.c:85
 msgid "New Version Available"
@@ -17567,11 +18054,11 @@
 msgid "Enable replacement of last word on send"
 msgstr "Ativar substituição da última palavra ao enviar"
 
-#: ../pidgin/plugins/spellchk.c:2370
+#: ../pidgin/plugins/spellchk.c:2372
 msgid "Text replacement"
 msgstr "Substituição de texto"
 
-#: ../pidgin/plugins/spellchk.c:2372 ../pidgin/plugins/spellchk.c:2373
+#: ../pidgin/plugins/spellchk.c:2374 ../pidgin/plugins/spellchk.c:2375
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 "Substitui texto nas mensagens enviadas de acordo com regras definidas pelo "
@@ -17583,7 +18070,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/ticker/ticker.c:74 ../pidgin/plugins/ticker/ticker.c:354
+#: ../pidgin/plugins/ticker/ticker.c:74 ../pidgin/plugins/ticker/ticker.c:356
 msgid "Buddy Ticker"
 msgstr "Monitor de amigos"
 
@@ -17591,7 +18078,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/ticker/ticker.c:357 ../pidgin/plugins/ticker/ticker.c:359
+#: ../pidgin/plugins/ticker/ticker.c:359 ../pidgin/plugins/ticker/ticker.c:361
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "Uma versão da lista de amigos que rola horizontalmente."
 
@@ -17651,7 +18138,7 @@
 
 #: ../pidgin/plugins/timestamp_format.c:47
 msgid "_Message Logs:"
-msgstr "_Logs de mensagens:"
+msgstr "_Históricos de mensagens:"
 
 #. *< type
 #. *< ui_requirement
@@ -17797,7 +18284,7 @@
 "Fornece opções específicas do Pidgin para Windows, como ancoramento da lista "
 "de amigos."
 
-#: ../pidgin/plugins/xmppconsole.c:667
+#: ../pidgin/plugins/xmppconsole.c:670
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "\"<font color='#777777'>Desconectado.</font>"
 
@@ -17807,151 +18294,39 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/xmppconsole.c:746 ../pidgin/plugins/xmppconsole.c:841
-#: ../pidgin/plugins/xmppconsole.c:860
+#: ../pidgin/plugins/xmppconsole.c:749 ../pidgin/plugins/xmppconsole.c:844
+#: ../pidgin/plugins/xmppconsole.c:863
 msgid "XMPP Console"
 msgstr "Console XMPP"
 
-#: ../pidgin/plugins/xmppconsole.c:753
+#: ../pidgin/plugins/xmppconsole.c:756
 msgid "Account: "
 msgstr "Conta: "
 
-#: ../pidgin/plugins/xmppconsole.c:780
+#: ../pidgin/plugins/xmppconsole.c:783
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>Não conectado ao XMPP</font>"
 
-#: ../pidgin/plugins/xmppconsole.c:790
+#: ../pidgin/plugins/xmppconsole.c:793
 msgid "Insert an <iq/> stanza."
 msgstr "Inserir um comando (stanza) <iq/>"
 
-#: ../pidgin/plugins/xmppconsole.c:799
+#: ../pidgin/plugins/xmppconsole.c:802
 msgid "Insert a <presence/> stanza."
 msgstr "Inserir um comando (stanza) <presence/>"
 
-#: ../pidgin/plugins/xmppconsole.c:808
+#: ../pidgin/plugins/xmppconsole.c:811
 msgid "Insert a <message/> stanza."
 msgstr "Inserir um comando (stanza) <message/>"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/xmppconsole.c:863
+#: ../pidgin/plugins/xmppconsole.c:866
 msgid "Send and receive raw XMPP stanzas."
 msgstr "Envia e recebe comandos (stanzas) do XMPP puros."
 
 #. *  description
-#: ../pidgin/plugins/xmppconsole.c:865
+#: ../pidgin/plugins/xmppconsole.c:868
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Este plugin é útil para depurar servidores ou clientes XMPP."
-
-#, fuzzy
-#~ msgid "Show"
-#~ msgstr "Mostrar todos"
-
-#, fuzzy
-#~ msgid "Offline buddies"
-#~ msgstr "Exibir amigos desconectados"
-
-#, fuzzy
-#~ msgid "Sort"
-#~ msgstr "Porta"
-
-#, fuzzy
-#~ msgid "By Status"
-#~ msgstr "Por status"
-
-#, fuzzy
-#~ msgid "By Log Size"
-#~ msgstr "Por tamanho do log"
-
-#, fuzzy
-#~ msgid "Unable to connect to contact server"
-#~ msgstr "Não foi possível conectar ao servidor."
-
-#, fuzzy
-#~ msgid "Unable to retrieve MSN Address Book"
-#~ msgstr "Selecionar catálogo de endereços do Notes"
-
-#, fuzzy
-#~ msgid "Current media"
-#~ msgstr "Token atual"
-
-#, fuzzy
-#~ msgid "Windows Live Messenger Protocol Plugin"
-#~ msgstr "Plugin de protocolo do mensageiro do Novell GroupWise"
-
-#, fuzzy
-#~ msgid "Windows Live ID authentication Failed"
-#~ msgstr "Falha: Autenticação mal sucedida"
-
-#, fuzzy
-#~ msgid "%s just sent you a Nudge!"
-#~ msgstr "%s te enviou uma mensagem"
-
-#, fuzzy
-#~ msgid "Unknown error (%d)"
-#~ msgstr "Erro desconhecido"
-
-#, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "Não foi possível conectar ao servidor."
-
-#, fuzzy
-#~ msgid "%s (%s) changed status from %s to %s"
-#~ msgstr "%s mudou o tópico de %s para %s"
-
-#, fuzzy
-#~ msgid "%s (%s) is now %s"
-#~ msgstr "%s agora é %s"
-
-#, fuzzy
-#~ msgid "%s (%s) is no longer %s"
-#~ msgstr "%s não é mais %s"
-
-#, fuzzy
-#~ msgid "_Merge"
-#~ msgstr "_Mensagem:"
-
-#, fuzzy
-#~ msgid "_Send File..."
-#~ msgstr "_Enviar arquivo"
-
-#, fuzzy
-#~ msgid "Add Buddy _Pounce..."
-#~ msgstr "Adicionar ação de usuário..."
-
-#, fuzzy
-#~ msgid "Hide when offline"
-#~ msgstr "Não permitido enquanto desconectado"
-
-#, fuzzy
-#~ msgid "Show when offline"
-#~ msgstr "Não permitido enquanto desconectado"
-
-#, fuzzy
-#~ msgid "Add _Buddy..."
-#~ msgstr "Adicionar amigo"
-
-#, fuzzy
-#~ msgid "Add C_hat..."
-#~ msgstr "Adicionar bate-papo"
-
-#, fuzzy
-#~ msgid "Persistent"
-#~ msgstr "Persa"
-
-#, fuzzy
-#~ msgid "/Accounts/Manage"
-#~ msgstr "/Contas"
-
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "Conta:"
-
-#, fuzzy
-#~ msgid "S_end To"
-#~ msgstr "Enviar para"
-
-#, fuzzy
-#~ msgid "_Smile!"
-#~ msgstr "Emoticon!"
--- a/po/ro.po	Sat Nov 17 18:26:03 2007 +0000
+++ b/po/ro.po	Sat Nov 17 19:41:05 2007 +0000
@@ -1,22 +1,20 @@
 # Pidgin Romanian translation
-# This file is distributed under the same license as the Gaim package.
+# This file is distributed under the same license as the Pidgin package.
 # Copyright (C) 2002-2007, Mişu Moldovan <dumol@gnome.ro>
-# Contributions: 
-# 2007, Alexandru Szasz <alexxed@gmail.com>
+# Contributions: 2007, Alexandru Szasz <alexxed@gmail.com>
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: pidgin-2.1.0\n"
+"Project-Id-Version: pidgin-2.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-28 15:32-0500\n"
-"PO-Revision-Date: 2007-07-26 12:53+0300\n"
+"POT-Creation-Date: 2007-11-15 03:22-0500\n"
+"PO-Revision-Date: 2007-11-15 16:05+0200\n"
 "Last-Translator: Mişu Moldovan <dumol@gnome.ro>\n"
 "Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3;plural=(n==1?0:(n==0||((n%100)>0&&(n%100)<20))?"
-"1:2)\n"
+"Plural-Forms: nplurals=3;plural=(n==1?0:(n==0||((n%100)>0&&(n%100)<20))?1:2)\n"
 
 #: ../finch/finch.c:64 ../finch/finch.c:301 ../finch/finch.c:330
 #: ../finch/finch.c:418
@@ -45,11 +43,11 @@
 "\n"
 "  -c, --config=DIR    utilizează calea DIR pentru fişierele de configurare\n"
 "  -d, --debug         arată mesaje de depanare în ieşirea standard (stdout)\n"
-"  -h, --help          arată aceste mesaje de ajutor şi ieşi\n"
+"  -h, --help          arată aceste mesaje de ajutor\n"
 "  -n, --nologin       fără autentificare automată\n"
-"  -v, --version       arată versiunea curentă şi ieşi\n"
-
-#: ../finch/finch.c:328 ../pidgin/gtkmain.c:711
+"  -v, --version       arată versiunea curentă\n"
+
+#: ../finch/finch.c:328 ../pidgin/gtkmain.c:730
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -61,17 +59,17 @@
 "eroare la http://developer.pidgin.im"
 
 #: ../finch/gntaccount.c:124 ../finch/gntaccount.c:484 ../finch/gntblist.c:300
-#: ../finch/gntblist.c:433 ../finch/gntblist.c:446 ../finch/gntplugin.c:186
-#: ../finch/gntplugin.c:234 ../finch/gntstatus.c:301 ../finch/gntstatus.c:310
+#: ../finch/gntblist.c:433 ../finch/gntblist.c:446 ../finch/gntplugin.c:189
+#: ../finch/gntplugin.c:237 ../finch/gntstatus.c:301 ../finch/gntstatus.c:310
 #: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
 #: ../finch/plugins/gntclipboard.c:128
-#: ../libpurple/protocols/jabber/buddy.c:2029
+#: ../libpurple/protocols/jabber/buddy.c:2032
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1515
+#: ../libpurple/protocols/jabber/jabber.c:1553
 #: ../libpurple/protocols/qq/group_join.c:328
 #: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:57
-#: ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/silc/ops.c:1460
 #: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "Eroare"
@@ -100,8 +98,8 @@
 msgid "(You probably forgot to 'make install'.)"
 msgstr "(Probabil aţi uitat să faceţi „make install”.)"
 
-#: ../finch/gntaccount.c:496 ../finch/gntconn.c:136
-#: ../pidgin/gtkaccount.c:1473 ../pidgin/gtkblist.c:4040
+#: ../finch/gntaccount.c:496 ../finch/gntconn.c:137
+#: ../pidgin/gtkaccount.c:1478 ../pidgin/gtkblist.c:4501
 msgid "Modify Account"
 msgstr "Modificare cont"
 
@@ -131,32 +129,36 @@
 #: ../finch/gntaccount.c:575 ../finch/gntaccount.c:638
 #: ../finch/gntaccount.c:889 ../finch/gntblist.c:344 ../finch/gntblist.c:421
 #: ../finch/gntblist.c:456 ../finch/gntblist.c:803 ../finch/gntblist.c:1005
-#: ../finch/gntblist.c:1101 ../finch/gntblist.c:2222 ../finch/gntcertmgr.c:91
-#: ../finch/gntplugin.c:379 ../finch/gntpounce.c:459 ../finch/gntpounce.c:667
-#: ../finch/gntprefs.c:265 ../finch/gntsound.c:1058 ../finch/gntstatus.c:145
-#: ../finch/gntstatus.c:485 ../finch/gntstatus.c:610
-#: ../libpurple/account.c:1013 ../libpurple/account.c:1263
-#: ../libpurple/account.c:1298 ../libpurple/conversation.c:1215
-#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:507
-#: ../libpurple/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803
-#: ../libpurple/protocols/gg/gg.c:884
+#: ../finch/gntblist.c:1101 ../finch/gntblist.c:2226 ../finch/gntblist.c:2289
+#: ../finch/gntcertmgr.c:91 ../finch/gntplugin.c:475 ../finch/gntpounce.c:472
+#: ../finch/gntpounce.c:680 ../finch/gntprefs.c:265 ../finch/gntsound.c:1058
+#: ../finch/gntstatus.c:145 ../finch/gntstatus.c:485 ../finch/gntstatus.c:610
+#: ../finch/plugins/gnthistory.c:181 ../libpurple/account.c:1105
+#: ../libpurple/account.c:1394 ../libpurple/account.c:1429
+#: ../libpurple/conversation.c:1215 ../libpurple/plugins/buddynote.c:51
+#: ../libpurple/protocols/gg/gg.c:508 ../libpurple/protocols/gg/gg.c:667
+#: ../libpurple/protocols/gg/gg.c:804 ../libpurple/protocols/gg/gg.c:886
 #: ../libpurple/protocols/jabber/buddy.c:728
-#: ../libpurple/protocols/jabber/buddy.c:2413
-#: ../libpurple/protocols/jabber/buddy.c:2449
+#: ../libpurple/protocols/jabber/buddy.c:2426
+#: ../libpurple/protocols/jabber/buddy.c:2462
 #: ../libpurple/protocols/jabber/chat.c:786
-#: ../libpurple/protocols/jabber/jabber.c:1008
-#: ../libpurple/protocols/jabber/jabber.c:1017
-#: ../libpurple/protocols/jabber/jabber.c:1737
+#: ../libpurple/protocols/jabber/jabber.c:1035
+#: ../libpurple/protocols/jabber/jabber.c:1044
+#: ../libpurple/protocols/jabber/jabber.c:1746
 #: ../libpurple/protocols/jabber/si.c:874
-#: ../libpurple/protocols/jabber/usermood.c:184
+#: ../libpurple/protocols/jabber/usermood.c:202
 #: ../libpurple/protocols/jabber/usernick.c:78
 #: ../libpurple/protocols/jabber/xdata.c:400
-#: ../libpurple/protocols/msn/msn.c:287 ../libpurple/protocols/msn/msn.c:304
-#: ../libpurple/protocols/msn/msn.c:321 ../libpurple/protocols/msn/msn.c:338
-#: ../libpurple/protocols/msn/msn.c:359
-#: ../libpurple/protocols/oscar/oscar.c:6094
-#: ../libpurple/protocols/oscar/peer.c:1046
-#: ../libpurple/protocols/qq/buddy_info.c:484
+#: ../libpurple/protocols/msn/msn.c:291 ../libpurple/protocols/msn/msn.c:308
+#: ../libpurple/protocols/msn/msn.c:325 ../libpurple/protocols/msn/msn.c:342
+#: ../libpurple/protocols/msn/msn.c:363 ../libpurple/protocols/msnp9/msn.c:287
+#: ../libpurple/protocols/msnp9/msn.c:304
+#: ../libpurple/protocols/msnp9/msn.c:321
+#: ../libpurple/protocols/msnp9/msn.c:338
+#: ../libpurple/protocols/msnp9/msn.c:359
+#: ../libpurple/protocols/oscar/oscar.c:6144
+#: ../libpurple/protocols/oscar/peer.c:1048
+#: ../libpurple/protocols/qq/buddy_info.c:525
 #: ../libpurple/protocols/qq/buddy_opt.c:214
 #: ../libpurple/protocols/qq/buddy_opt.c:411
 #: ../libpurple/protocols/qq/group.c:124
@@ -167,60 +169,60 @@
 #: ../libpurple/protocols/qq/sys_msg.c:113
 #: ../libpurple/protocols/qq/sys_msg.c:172
 #: ../libpurple/protocols/qq/sys_msg.c:266
-#: ../libpurple/protocols/sametime/sametime.c:3388
-#: ../libpurple/protocols/sametime/sametime.c:3474
-#: ../libpurple/protocols/sametime/sametime.c:3645
-#: ../libpurple/protocols/sametime/sametime.c:5397
-#: ../libpurple/protocols/sametime/sametime.c:5487
-#: ../libpurple/protocols/sametime/sametime.c:5612
+#: ../libpurple/protocols/sametime/sametime.c:3430
+#: ../libpurple/protocols/sametime/sametime.c:3516
+#: ../libpurple/protocols/sametime/sametime.c:3690
+#: ../libpurple/protocols/sametime/sametime.c:5443
+#: ../libpurple/protocols/sametime/sametime.c:5533
+#: ../libpurple/protocols/sametime/sametime.c:5658
 #: ../libpurple/protocols/silc/buddy.c:455
-#: ../libpurple/protocols/silc/buddy.c:1076
-#: ../libpurple/protocols/silc/buddy.c:1191
-#: ../libpurple/protocols/silc/chat.c:616
-#: ../libpurple/protocols/silc/chat.c:746
-#: ../libpurple/protocols/silc/ops.c:1816
-#: ../libpurple/protocols/silc/silc.c:823
-#: ../libpurple/protocols/silc/silc.c:1031
+#: ../libpurple/protocols/silc/buddy.c:1079
+#: ../libpurple/protocols/silc/buddy.c:1194
+#: ../libpurple/protocols/silc/chat.c:620
+#: ../libpurple/protocols/silc/chat.c:750
+#: ../libpurple/protocols/silc/ops.c:1820
+#: ../libpurple/protocols/silc/silc.c:966
+#: ../libpurple/protocols/silc/silc.c:1174
 #: ../libpurple/protocols/silc10/buddy.c:468
-#: ../libpurple/protocols/silc10/buddy.c:1084
-#: ../libpurple/protocols/silc10/buddy.c:1189
+#: ../libpurple/protocols/silc10/buddy.c:1087
+#: ../libpurple/protocols/silc10/buddy.c:1192
 #: ../libpurple/protocols/silc10/chat.c:600
 #: ../libpurple/protocols/silc10/chat.c:730
 #: ../libpurple/protocols/silc10/ops.c:1904
 #: ../libpurple/protocols/silc10/silc.c:736
-#: ../libpurple/protocols/silc10/silc.c:942
-#: ../libpurple/protocols/yahoo/yahoo.c:1032
-#: ../libpurple/protocols/yahoo/yahoo.c:3498
-#: ../libpurple/protocols/yahoo/yahoo.c:3509 ../pidgin/gtkaccount.c:1908
-#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:5967
-#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:773
-#: ../pidgin/gtkdialogs.c:912 ../pidgin/gtkdialogs.c:1004
-#: ../pidgin/gtkdialogs.c:1024 ../pidgin/gtkdialogs.c:1048
-#: ../pidgin/gtkdialogs.c:1070 ../pidgin/gtkdialogs.c:1118
-#: ../pidgin/gtkdialogs.c:1159 ../pidgin/gtkdialogs.c:1215
-#: ../pidgin/gtkdialogs.c:1254 ../pidgin/gtkdialogs.c:1281
-#: ../pidgin/gtkimhtmltoolbar.c:435 ../pidgin/gtklog.c:328
-#: ../pidgin/gtkplugin.c:289 ../pidgin/gtkpounce.c:1101
-#: ../pidgin/gtkprivacy.c:563 ../pidgin/gtkprivacy.c:579
-#: ../pidgin/gtkprivacy.c:604 ../pidgin/gtkprivacy.c:618
-#: ../pidgin/gtkrequest.c:271 ../pidgin/gtksavedstatuses.c:345
-#: ../pidgin/gtkstatusbox.c:1574
+#: ../libpurple/protocols/silc10/silc.c:943
+#: ../libpurple/protocols/yahoo/yahoo.c:1034
+#: ../libpurple/protocols/yahoo/yahoo.c:3509
+#: ../libpurple/protocols/yahoo/yahoo.c:3520 ../pidgin/gtkaccount.c:1913
+#: ../pidgin/gtkaccount.c:2501 ../pidgin/gtkblist.c:6678
+#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:789
+#: ../pidgin/gtkdialogs.c:928 ../pidgin/gtkdialogs.c:1020
+#: ../pidgin/gtkdialogs.c:1040 ../pidgin/gtkdialogs.c:1064
+#: ../pidgin/gtkdialogs.c:1086 ../pidgin/gtkdialogs.c:1134
+#: ../pidgin/gtkdialogs.c:1175 ../pidgin/gtkdialogs.c:1231
+#: ../pidgin/gtkdialogs.c:1270 ../pidgin/gtkdialogs.c:1297
+#: ../pidgin/gtkimhtmltoolbar.c:437 ../pidgin/gtklog.c:328
+#: ../pidgin/gtkplugin.c:289 ../pidgin/gtkpounce.c:1121
+#: ../pidgin/gtkprivacy.c:565 ../pidgin/gtkprivacy.c:581
+#: ../pidgin/gtkprivacy.c:606 ../pidgin/gtkprivacy.c:620
+#: ../pidgin/gtkrequest.c:321 ../pidgin/gtksavedstatuses.c:345
+#: ../pidgin/gtkstatusbox.c:1593
 msgid "Cancel"
 msgstr "Renunţă"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:311
-#: ../finch/gntplugin.c:379 ../finch/gntpounce.c:465 ../finch/gntprefs.c:265
+#: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:311 ../finch/gntdebug.c:297
+#: ../finch/gntplugin.c:475 ../finch/gntpounce.c:478 ../finch/gntprefs.c:265
 #: ../finch/gntsound.c:1055 ../finch/gntstatus.c:488 ../finch/gntstatus.c:598
-#: ../libpurple/account.c:1297 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:727 ../pidgin/gtkdebug.c:749
-#: ../pidgin/gtkrequest.c:277
+#: ../libpurple/account.c:1428 ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:727 ../pidgin/gtkdebug.c:754
+#: ../pidgin/gtkrequest.c:327
 msgid "Save"
 msgstr "Salvează"
 
-#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1900
-#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1568
+#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1905
+#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1587
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Sigur doriţi să ştergeţi %s?"
@@ -231,16 +233,16 @@
 
 #. Delete button
 #: ../finch/gntaccount.c:637 ../finch/gntaccount.c:707
-#: ../finch/gntcertmgr.c:319 ../finch/gntpounce.c:666 ../finch/gntpounce.c:729
+#: ../finch/gntcertmgr.c:319 ../finch/gntpounce.c:679 ../finch/gntpounce.c:742
 #: ../finch/gntstatus.c:144 ../finch/gntstatus.c:210
-#: ../pidgin/gtkaccount.c:1907 ../pidgin/gtklog.c:327
-#: ../pidgin/gtkpounce.c:1100 ../pidgin/gtkrequest.c:274
-#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1573
+#: ../pidgin/gtkaccount.c:1912 ../pidgin/gtklog.c:327
+#: ../pidgin/gtkpounce.c:1120 ../pidgin/gtkrequest.c:324
+#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1592
 msgid "Delete"
 msgstr "Şterge"
 
-#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2119 ../finch/gntui.c:82
-#: ../pidgin/gtkaccount.c:2325 ../pidgin/gtkdocklet.c:522
+#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2123 ../finch/gntui.c:82
+#: ../pidgin/gtkaccount.c:2331 ../pidgin/gtkdocklet.c:715
 msgid "Accounts"
 msgstr "Conturi"
 
@@ -250,52 +252,53 @@
 
 #. Add button
 #: ../finch/gntaccount.c:698 ../finch/gntaccount.c:888 ../finch/gntblist.c:343
-#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntcertmgr.c:306
-#: ../finch/gntnotify.c:380 ../finch/gntpounce.c:713 ../finch/gntstatus.c:199
-#: ../libpurple/protocols/gg/gg.c:883 ../libpurple/protocols/qq/sys_msg.c:114
+#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntblist.c:2381
+#: ../finch/gntcertmgr.c:306 ../finch/gntnotify.c:385 ../finch/gntpounce.c:726
+#: ../finch/gntstatus.c:199 ../libpurple/protocols/gg/gg.c:885
+#: ../libpurple/protocols/qq/sys_msg.c:114
 #: ../libpurple/protocols/qq/sys_msg.c:173
 #: ../libpurple/protocols/qq/sys_msg.c:267
-#: ../libpurple/protocols/sametime/sametime.c:5486
-#: ../libpurple/protocols/silc/chat.c:615
-#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2494
-#: ../pidgin/gtkblist.c:5966 ../pidgin/gtkconv.c:1659
-#: ../pidgin/gtkrequest.c:275
+#: ../libpurple/protocols/sametime/sametime.c:5532
+#: ../libpurple/protocols/silc/chat.c:619
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2500
+#: ../pidgin/gtkblist.c:6677 ../pidgin/gtkconv.c:1713
+#: ../pidgin/gtkrequest.c:325
 msgid "Add"
 msgstr "Adăugare"
 
 #. Modify button
-#: ../finch/gntaccount.c:703 ../finch/gntpounce.c:721
+#: ../finch/gntaccount.c:703 ../finch/gntpounce.c:734
 msgid "Modify"
 msgstr "Modificare"
 
-#: ../finch/gntaccount.c:811 ../pidgin/gtkaccount.c:2441
+#: ../finch/gntaccount.c:811 ../pidgin/gtkaccount.c:2447
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s l-a făcut pe %s contactul său%s%s"
 
-#: ../finch/gntaccount.c:884 ../pidgin/gtkaccount.c:2493
+#: ../finch/gntaccount.c:884 ../pidgin/gtkaccount.c:2499
 msgid "Add buddy to your list?"
 msgstr "Doriţi adăugarea utilizatorului în lista de contacte?"
 
-#: ../finch/gntaccount.c:944 ../pidgin/gtkaccount.c:2551
+#: ../finch/gntaccount.c:944 ../pidgin/gtkaccount.c:2557
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr ""
 "%s%s%s%s doreşte să adauge utilizatorul %s în lista sa de contacte%s%s."
 
 #: ../finch/gntaccount.c:969 ../finch/gntaccount.c:972
-#: ../finch/gntaccount.c:999 ../pidgin/gtkaccount.c:2574
-#: ../pidgin/gtkaccount.c:2580
+#: ../finch/gntaccount.c:999 ../pidgin/gtkaccount.c:2580
+#: ../pidgin/gtkaccount.c:2586
 msgid "Authorize buddy?"
 msgstr "Autorizaţi contactul?"
 
 #: ../finch/gntaccount.c:976 ../finch/gntaccount.c:1003
-#: ../pidgin/gtkaccount.c:2575 ../pidgin/gtkaccount.c:2581
+#: ../pidgin/gtkaccount.c:2581 ../pidgin/gtkaccount.c:2587
 msgid "Authorize"
 msgstr "Autorizează"
 
 #: ../finch/gntaccount.c:977 ../finch/gntaccount.c:1004
-#: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
+#: ../pidgin/gtkaccount.c:2582 ../pidgin/gtkaccount.c:2588
 msgid "Deny"
 msgstr "Refuză"
 
@@ -319,20 +322,21 @@
 msgid "Error adding buddy"
 msgstr "Eroare la adăugarea contactului"
 
-#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2888
-#: ../pidgin/gtkaccount.c:1981 ../pidgin/gtksavedstatuses.c:980
+#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2898
+#: ../pidgin/gtkaccount.c:1986 ../pidgin/gtksavedstatuses.c:986
 msgid "Screen Name"
 msgstr "Nume de identificare"
 
 #: ../finch/gntblist.c:328 ../finch/gntblist.c:410 ../finch/gntblist.c:1250
-#: ../libpurple/protocols/msn/msn.c:1395
-#: ../libpurple/protocols/silc/chat.c:606
+#: ../libpurple/protocols/msn/msn.c:1551
+#: ../libpurple/protocols/msnp9/msn.c:1402
+#: ../libpurple/protocols/silc/chat.c:610
 #: ../libpurple/protocols/silc10/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:704
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1023
-#: ../pidgin/gtkdialogs.c:1047 ../pidgin/gtkdialogs.c:1069
-#: ../pidgin/gtkrequest.c:278
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1039
+#: ../pidgin/gtkdialogs.c:1063 ../pidgin/gtkdialogs.c:1085
+#: ../pidgin/gtkrequest.c:328
 msgid "Alias"
 msgstr "Alias"
 
@@ -341,23 +345,24 @@
 msgstr "Grup"
 
 #: ../finch/gntblist.c:335 ../finch/gntblist.c:401 ../finch/gntblist.c:1305
-#: ../finch/gntnotify.c:174 ../finch/gntstatus.c:576
-#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:3008 ../pidgin/gtknotify.c:506
-#: ../pidgin/gtkpounce.c:1268 ../pidgin/plugins/gevolution/gevolution.c:445
+#: ../finch/gntblist.c:2212 ../finch/gntblist.c:2276 ../finch/gntnotify.c:174
+#: ../finch/gntstatus.c:576 ../libpurple/plugins/idle.c:153
+#: ../libpurple/plugins/idle.c:190 ../pidgin/gtkblist.c:3242
+#: ../pidgin/gtknotify.c:512 ../pidgin/gtkpounce.c:1288
+#: ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "Cont"
 
 #: ../finch/gntblist.c:341 ../finch/gntblist.c:852
 #: ../libpurple/protocols/silc/buddy.c:725
-#: ../libpurple/protocols/silc/buddy.c:1027
-#: ../libpurple/protocols/silc/buddy.c:1072
-#: ../libpurple/protocols/silc/buddy.c:1182
+#: ../libpurple/protocols/silc/buddy.c:1030
+#: ../libpurple/protocols/silc/buddy.c:1075
+#: ../libpurple/protocols/silc/buddy.c:1185
 #: ../libpurple/protocols/silc10/buddy.c:737
-#: ../libpurple/protocols/silc10/buddy.c:1033
-#: ../libpurple/protocols/silc10/buddy.c:1080
-#: ../libpurple/protocols/silc10/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3343 ../pidgin/gtkblist.c:5483
+#: ../libpurple/protocols/silc10/buddy.c:1036
+#: ../libpurple/protocols/silc10/buddy.c:1083
+#: ../libpurple/protocols/silc10/buddy.c:1183
+#: ../libpurple/protocols/yahoo/yahoo.c:3354 ../pidgin/gtkblist.c:6179
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "Adaugă contact"
@@ -366,17 +371,21 @@
 msgid "Please enter buddy information."
 msgstr "Introduceţi informaţii despre contact."
 
-#: ../finch/gntblist.c:370 ../libpurple/blist.c:1209
+#: ../finch/gntblist.c:370 ../libpurple/blist.c:1210
 msgid "Chats"
 msgstr "Chat-uri"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:407 ../libpurple/protocols/jabber/jabber.c:924
-#: ../libpurple/protocols/jabber/jabber.c:927
-#: ../libpurple/protocols/msn/msn.c:1584 ../libpurple/protocols/msn/msn.c:1649
-#: ../libpurple/protocols/msn/msn.c:1676
-#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:582
-#: ../pidgin/gtkroomlist.c:618
+#: ../finch/gntblist.c:407 ../finch/gntblist.c:2207
+#: ../libpurple/protocols/jabber/jabber.c:951
+#: ../libpurple/protocols/jabber/jabber.c:954
+#: ../libpurple/protocols/msn/msn.c:1732 ../libpurple/protocols/msn/msn.c:1797
+#: ../libpurple/protocols/msn/msn.c:1824
+#: ../libpurple/protocols/msnp9/msn.c:1585
+#: ../libpurple/protocols/msnp9/msn.c:1650
+#: ../libpurple/protocols/msnp9/msn.c:1677
+#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:608
+#: ../pidgin/gtkroomlist.c:931
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
@@ -386,7 +395,7 @@
 msgid "Auto-join"
 msgstr "Intră automat"
 
-#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:5859
+#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:6563
 msgid "Add Chat"
 msgstr "Adaugă un chat"
 
@@ -407,8 +416,8 @@
 msgstr "Există deja un grup cu acest nume."
 
 #: ../finch/gntblist.c:454 ../finch/gntblist.c:856
-#: ../libpurple/protocols/sametime/sametime.c:5396
-#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5963
+#: ../libpurple/protocols/sametime/sametime.c:5442
+#: ../libpurple/protocols/sametime/sametime.c:5530 ../pidgin/gtkblist.c:6674
 msgid "Add Group"
 msgstr "Adaugă grup"
 
@@ -440,8 +449,8 @@
 msgid "Retrieving..."
 msgstr "Descărcare..."
 
-#: ../finch/gntblist.c:904 ../finch/gntconv.c:507
-#: ../libpurple/protocols/silc/chat.c:899
+#: ../finch/gntblist.c:904 ../finch/gntconv.c:528
+#: ../libpurple/protocols/silc/chat.c:903
 #: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "Detalii"
@@ -451,10 +460,10 @@
 msgstr "Adăugare întâmpinare"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:915 ../finch/gntconv.c:519
+#: ../finch/gntblist.c:915 ../finch/gntconv.c:540
 #: ../libpurple/protocols/jabber/si.c:874
-#: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:587
-#: ../pidgin/gtkconv.c:1607
+#: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:588
+#: ../pidgin/gtkconv.c:1661
 msgid "Send File"
 msgstr "Trimitere fişier"
 
@@ -498,14 +507,14 @@
 msgstr "Confirmare eliminare"
 
 #: ../finch/gntblist.c:1100 ../finch/gntblist.c:1252 ../finch/gntft.c:227
-#: ../pidgin/gtkconv.c:1656 ../pidgin/gtkrequest.c:276
+#: ../pidgin/gtkconv.c:1710 ../pidgin/gtkrequest.c:326
 #: ../pidgin/gtkstatusbox.c:264
 msgid "Remove"
 msgstr "Ştergere"
 
 #. Buddy List
-#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2307 ../finch/gntprefs.c:258
-#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2688 ../pidgin/gtkblist.c:4284
+#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2434 ../finch/gntprefs.c:258
+#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2908 ../pidgin/gtkblist.c:4937
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "Listă de contacte"
@@ -519,44 +528,49 @@
 msgstr "Schimbă eticheta"
 
 #. General
-#: ../finch/gntblist.c:1298 ../libpurple/protocols/gg/gg.c:637
-#: ../libpurple/protocols/gg/gg.c:1050 ../libpurple/protocols/gg/gg.c:1123
-#: ../libpurple/protocols/gg/gg.c:2207
+#: ../finch/gntblist.c:1298 ../libpurple/protocols/gg/gg.c:638
+#: ../libpurple/protocols/gg/gg.c:1052 ../libpurple/protocols/gg/gg.c:1125
+#: ../libpurple/protocols/gg/gg.c:2228
 #: ../libpurple/protocols/jabber/buddy.c:286
 #: ../libpurple/protocols/jabber/buddy.c:1247
-#: ../libpurple/protocols/jabber/buddy.c:2214
-#: ../libpurple/protocols/jabber/buddy.c:2396
-#: ../libpurple/protocols/jabber/jabber.c:937
-#: ../libpurple/protocols/jabber/jabber.c:1544
-#: ../libpurple/protocols/jabber/jabber.c:1567
-#: ../libpurple/protocols/jabber/jabber.c:1590
-#: ../libpurple/protocols/jabber/jabber.c:1613
-#: ../libpurple/protocols/jabber/jabber.c:1636
-#: ../libpurple/protocols/msn/msn.c:1403 ../libpurple/protocols/msn/msn.c:1587
+#: ../libpurple/protocols/jabber/buddy.c:2217
+#: ../libpurple/protocols/jabber/buddy.c:2409
+#: ../libpurple/protocols/jabber/jabber.c:964
+#: ../libpurple/protocols/jabber/jabber.c:1573
+#: ../libpurple/protocols/jabber/jabber.c:1587
+#: ../libpurple/protocols/jabber/jabber.c:1601
+#: ../libpurple/protocols/jabber/jabber.c:1615
+#: ../libpurple/protocols/jabber/jabber.c:1629
+#: ../libpurple/protocols/msn/msn.c:1559 ../libpurple/protocols/msn/msn.c:1735
+#: ../libpurple/protocols/msnp9/msn.c:1410
+#: ../libpurple/protocols/msnp9/msn.c:1588
 #: ../libpurple/protocols/qq/buddy_info.c:43
-#: ../libpurple/protocols/silc/buddy.c:1535
+#: ../libpurple/protocols/silc/buddy.c:1538
 #: ../libpurple/protocols/silc/ops.c:1002
 #: ../libpurple/protocols/silc/ops.c:1186
-#: ../libpurple/protocols/silc/ops.c:1322
-#: ../libpurple/protocols/silc10/buddy.c:1535
+#: ../libpurple/protocols/silc/ops.c:1324
+#: ../libpurple/protocols/silc10/buddy.c:1538
 #: ../libpurple/protocols/silc10/ops.c:1036
 #: ../libpurple/protocols/silc10/ops.c:1179
 #: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3032
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3266
 msgid "Nickname"
 msgstr "Pseudonim"
 
 #. Idle stuff
 #: ../finch/gntblist.c:1320 ../finch/gntprefs.c:261
-#: ../libpurple/protocols/bonjour/bonjour.c:340
+#: ../libpurple/protocols/bonjour/bonjour.c:359
 #: ../libpurple/protocols/jabber/buddy.c:787
 #: ../libpurple/protocols/jabber/buddy.c:951
-#: ../libpurple/protocols/msn/msn.c:544 ../libpurple/protocols/msn/state.c:32
-#: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2912
-#: ../libpurple/protocols/yahoo/yahoo.c:3097
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3060
-#: ../pidgin/gtkblist.c:3460 ../pidgin/gtkprefs.c:1925
+#: ../libpurple/protocols/msn/msn.c:611 ../libpurple/protocols/msn/msn.c:629
+#: ../libpurple/protocols/msn/msn.c:637 ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/msnp9/msn.c:544
+#: ../libpurple/protocols/msnp9/state.c:32
+#: ../libpurple/protocols/novell/novell.c:2842
+#: ../libpurple/protocols/oscar/oscar.c:2922
+#: ../libpurple/protocols/yahoo/yahoo.c:3108
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3294
+#: ../pidgin/gtkblist.c:3700 ../pidgin/gtkprefs.c:2026
 msgid "Idle"
 msgstr "Inactiv(ă)"
 
@@ -587,36 +601,24 @@
 "\n"
 "Ultima oară: acum %s"
 
-#: ../finch/gntblist.c:1702 ../pidgin/gtkdocklet.c:470
-#: ../pidgin/gtkstatusbox.c:1072
+#: ../finch/gntblist.c:1706 ../pidgin/gtkdocklet.c:582
 msgid "New..."
 msgstr "Nou..."
 
-#: ../finch/gntblist.c:1709 ../pidgin/gtkdocklet.c:471
-#: ../pidgin/gtkstatusbox.c:1073
+#: ../finch/gntblist.c:1713 ../pidgin/gtkdocklet.c:583
 msgid "Saved..."
 msgstr "Salvat..."
 
-#: ../finch/gntblist.c:2087 ../finch/gntplugin.c:255 ../finch/gntui.c:88
-#: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:531
+#: ../finch/gntblist.c:2091 ../finch/gntplugin.c:345 ../finch/gntui.c:88
+#: ../pidgin/gtkdocklet.c:716 ../pidgin/gtkplugin.c:555
 msgid "Plugins"
 msgstr "Module"
 
-#: ../finch/gntblist.c:2203 ../pidgin/gtkdialogs.c:754
-#: ../pidgin/gtkdialogs.c:893 ../pidgin/gtkdialogs.c:974
-msgid "_Name"
-msgstr "_Nume"
-
-#: ../finch/gntblist.c:2208 ../pidgin/gtkdialogs.c:759
-#: ../pidgin/gtkdialogs.c:898 ../pidgin/gtkdialogs.c:979
-msgid "_Account"
-msgstr "_Cont"
-
-#: ../finch/gntblist.c:2216 ../pidgin/gtkdialogs.c:767
+#: ../finch/gntblist.c:2220 ../pidgin/gtkdialogs.c:783
 msgid "New Instant Message"
 msgstr "Mesaj nou"
 
-#: ../finch/gntblist.c:2218 ../pidgin/gtkdialogs.c:769
+#: ../finch/gntblist.c:2222 ../pidgin/gtkdialogs.c:785
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr ""
@@ -626,83 +628,113 @@
 #. Not multiline
 #. Not masked?
 #. No hints?
-#: ../finch/gntblist.c:2221 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:135
-#: ../finch/gntnotify.c:80 ../libpurple/account.c:1012
-#: ../libpurple/account.c:1262 ../libpurple/protocols/gg/gg.c:506
-#: ../libpurple/protocols/gg/gg.c:665 ../libpurple/protocols/gg/gg.c:802
-#: ../libpurple/protocols/jabber/jabber.c:1736
+#: ../finch/gntblist.c:2225 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:136
+#: ../finch/gntnotify.c:80 ../finch/plugins/gnthistory.c:180
+#: ../libpurple/account.c:1104 ../libpurple/account.c:1393
+#: ../libpurple/protocols/gg/gg.c:507 ../libpurple/protocols/gg/gg.c:666
+#: ../libpurple/protocols/gg/gg.c:803
+#: ../libpurple/protocols/jabber/jabber.c:1745
 #: ../libpurple/protocols/jabber/xdata.c:399
-#: ../libpurple/protocols/msn/msn.c:286 ../libpurple/protocols/msn/msn.c:303
-#: ../libpurple/protocols/msn/msn.c:320 ../libpurple/protocols/msn/msn.c:337
-#: ../libpurple/protocols/oscar/oscar.c:6093
+#: ../libpurple/protocols/msn/msn.c:290 ../libpurple/protocols/msn/msn.c:307
+#: ../libpurple/protocols/msn/msn.c:324 ../libpurple/protocols/msn/msn.c:341
+#: ../libpurple/protocols/msnp9/msn.c:286
+#: ../libpurple/protocols/msnp9/msn.c:303
+#: ../libpurple/protocols/msnp9/msn.c:320
+#: ../libpurple/protocols/msnp9/msn.c:337
+#: ../libpurple/protocols/oscar/oscar.c:6143
 #: ../libpurple/protocols/silc/buddy.c:454
-#: ../libpurple/protocols/silc/buddy.c:1190
-#: ../libpurple/protocols/silc/chat.c:447
-#: ../libpurple/protocols/silc/chat.c:482
-#: ../libpurple/protocols/silc/chat.c:745
-#: ../libpurple/protocols/silc/ops.c:1291
-#: ../libpurple/protocols/silc/ops.c:1815
-#: ../libpurple/protocols/silc/silc.c:822
+#: ../libpurple/protocols/silc/buddy.c:1193
+#: ../libpurple/protocols/silc/chat.c:449
+#: ../libpurple/protocols/silc/chat.c:486
+#: ../libpurple/protocols/silc/chat.c:749
+#: ../libpurple/protocols/silc/ops.c:1293
+#: ../libpurple/protocols/silc/ops.c:1819
+#: ../libpurple/protocols/silc/silc.c:965
 #: ../libpurple/protocols/silc10/buddy.c:467
-#: ../libpurple/protocols/silc10/buddy.c:1188
+#: ../libpurple/protocols/silc10/buddy.c:1191
 #: ../libpurple/protocols/silc10/chat.c:425
 #: ../libpurple/protocols/silc10/chat.c:464
 #: ../libpurple/protocols/silc10/chat.c:729
 #: ../libpurple/protocols/silc10/ops.c:1297
 #: ../libpurple/protocols/silc10/ops.c:1903
 #: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/yahoo/yahoo.c:1031
-#: ../libpurple/protocols/yahoo/yahoo.c:3497
-#: ../libpurple/protocols/yahoo/yahoo.c:3508 ../pidgin/gtkblist.c:4039
-#: ../pidgin/gtkcertmgr.c:195 ../pidgin/gtkdialogs.c:772
-#: ../pidgin/gtkdialogs.c:911 ../pidgin/gtkdialogs.c:1003
-#: ../pidgin/gtkrequest.c:270
+#: ../libpurple/protocols/yahoo/yahoo.c:1033
+#: ../libpurple/protocols/yahoo/yahoo.c:3508
+#: ../libpurple/protocols/yahoo/yahoo.c:3519 ../pidgin/gtkcertmgr.c:195
+#: ../pidgin/gtkdialogs.c:788 ../pidgin/gtkdialogs.c:927
+#: ../pidgin/gtkdialogs.c:1019 ../pidgin/gtkrequest.c:320
 msgid "OK"
 msgstr "OK"
 
+#: ../finch/gntblist.c:2272
+msgid "Channel"
+msgstr "Canal"
+
+#: ../finch/gntblist.c:2284 ../pidgin/gtkblist.c:940
+msgid "Join a Chat"
+msgstr "Intră într-un chat"
+
+#: ../finch/gntblist.c:2286
+msgid "Please enter the name of the chat you want to join."
+msgstr "Introduceţi numele chat-ului în care doriţi să intraţi."
+
+#: ../finch/gntblist.c:2288 ../finch/gntnotify.c:394
+msgid "Join"
+msgstr "Intră"
+
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2241 ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:790
+#: ../finch/gntblist.c:2326 ../finch/gntpounce.c:460 ../pidgin/gtkpounce.c:810
 msgid "Options"
 msgstr "Opţiuni"
 
-#: ../finch/gntblist.c:2247
+#: ../finch/gntblist.c:2332
 msgid "Send IM..."
 msgstr "Trimitere mesaj..."
 
-#: ../finch/gntblist.c:2251
-#, fuzzy
-msgid "Show empty groups"
-msgstr "Arată grupurile fără contacte"
-
-#: ../finch/gntblist.c:2257
-#, fuzzy
-msgid "Show offline buddies"
-msgstr "Arată contactele deconectate"
-
-#: ../finch/gntblist.c:2263
-msgid "Sort by status"
-msgstr "Sortează după status"
-
-#: ../finch/gntblist.c:2267
-msgid "Sort alphabetically"
-msgstr "Sortează alfabetic"
-
-#: ../finch/gntblist.c:2271
-msgid "Sort by log size"
-msgstr "Sortează după mărimea înregistrărilor"
+#: ../finch/gntblist.c:2337
+msgid "Join Chat..."
+msgstr "Intră în chat..."
+
+#: ../finch/gntblist.c:2342
+msgid "Show"
+msgstr "Arată"
+
+#: ../finch/gntblist.c:2347
+msgid "Empty groups"
+msgstr "Grupuri fără contacte"
+
+#: ../finch/gntblist.c:2354
+msgid "Offline buddies"
+msgstr "Contacte deconectate"
+
+#: ../finch/gntblist.c:2361
+msgid "Sort"
+msgstr "Sortare"
+
+#: ../finch/gntblist.c:2366
+msgid "By Status"
+msgstr "După status"
+
+#: ../finch/gntblist.c:2371 ../pidgin/gtkblist.c:4191
+msgid "Alphabetically"
+msgstr "Alfabetică"
+
+#: ../finch/gntblist.c:2376
+msgid "By Log Size"
+msgstr "După mărimea înregistrărilor"
 
 #: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:188
-#, fuzzy
 msgid "Certificate Import"
-msgstr "Port de conectare"
+msgstr "Importare certificat"
 
 #: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:189
 msgid "Specify a hostname"
-msgstr ""
+msgstr "Trebuie specificat numele calculatorului"
 
 #: ../finch/gntcertmgr.c:88 ../pidgin/gtkcertmgr.c:190
 msgid "Type the host name this certificate is for."
 msgstr ""
+"Introduceţi numele calculatorului pentru care a fost eliberat certificatul"
 
 #: ../finch/gntcertmgr.c:97 ../pidgin/gtkcertmgr.c:210
 #, c-format
@@ -710,19 +742,20 @@
 "File %s could not be imported.\n"
 "Make sure that the file is readable and in PEM format.\n"
 msgstr ""
+"Fişierul %s nu a putut fi importat\n"
+"Asiguraţi-vă că fişierul este în format PEM şi poate fi citit.\n"
 
 #: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:212
 msgid "Certificate Import Error"
-msgstr ""
+msgstr "Eroare la importarea certificatului"
 
 #: ../finch/gntcertmgr.c:100 ../pidgin/gtkcertmgr.c:213
 msgid "X.509 certificate import failed"
-msgstr ""
+msgstr "Importarea certificatului X.509 a eşuat"
 
 #: ../finch/gntcertmgr.c:110 ../pidgin/gtkcertmgr.c:224
-#, fuzzy
 msgid "Select a PEM certificate"
-msgstr "Selectaţi un fişier"
+msgstr "Selectaţi un certificat PEM"
 
 #: ../finch/gntcertmgr.c:127 ../pidgin/gtkcertmgr.c:245
 #, c-format
@@ -730,23 +763,25 @@
 "Export to file %s failed.\n"
 "Check that you have write permission to the target path\n"
 msgstr ""
+"Exportarea în fişierul %s a eşuat.\n"
+"Verificaţi dacă aveţi drepturi de scriere în acel director\n"
 
 #: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:247
 msgid "Certificate Export Error"
-msgstr ""
+msgstr "Eroare la exportarea certicatului"
 
 #: ../finch/gntcertmgr.c:130 ../pidgin/gtkcertmgr.c:248
 msgid "X.509 certificate export failed"
-msgstr ""
+msgstr "Exportarea certificatului X.509 a eşuat"
 
 #: ../finch/gntcertmgr.c:159 ../pidgin/gtkcertmgr.c:299
 msgid "PEM X.509 Certificate Export"
-msgstr ""
+msgstr "Exportare certificat PEM X.509"
 
 #: ../finch/gntcertmgr.c:188
-#, fuzzy, c-format
+#, c-format
 msgid "Certificate for %s"
-msgstr "Status pentru %s"
+msgstr "Certificat pentru %s"
 
 #: ../finch/gntcertmgr.c:195
 #, c-format
@@ -756,57 +791,62 @@
 "SHA1 fingerprint:\n"
 "%s"
 msgstr ""
+"Nume comun: %s\n"
+"\n"
+"Amprentă SHA1:\n"
+"%s"
 
 #: ../finch/gntcertmgr.c:198
 msgid "SSL Host Certificate"
-msgstr ""
+msgstr "Certificat SSL server"
 
 #: ../finch/gntcertmgr.c:233 ../pidgin/gtkcertmgr.c:372
 #, c-format
 msgid "Really delete certificate for %s?"
-msgstr ""
+msgstr "Sigur doriţi ştergerea certificatului pentru %s?"
 
 #: ../finch/gntcertmgr.c:236 ../pidgin/gtkcertmgr.c:374
 msgid "Confirm certificate delete"
-msgstr ""
-
-#: ../finch/gntcertmgr.c:293 ../pidgin/gtkcertmgr.c:602
+msgstr "Confirmare ştergere certificat"
+
+#: ../finch/gntcertmgr.c:293 ../pidgin/gtkcertmgr.c:603
 msgid "Certificate Manager"
-msgstr ""
+msgstr "Administrator de certificate"
 
 #. Creating the user splits
-#: ../finch/gntcertmgr.c:298 ../libpurple/protocols/bonjour/bonjour.c:652
-#: ../libpurple/protocols/silc/silc.c:1007
+#: ../finch/gntcertmgr.c:298 ../libpurple/protocols/bonjour/bonjour.c:671
+#: ../libpurple/protocols/silc/silc.c:1150
 #: ../libpurple/protocols/silc10/silc.c:918
 msgid "Hostname"
 msgstr "Nume calculator"
 
-#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:383 ../pidgin/gtkconv.c:1635
-#: ../pidgin/gtkdebug.c:835
+#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:388 ../pidgin/gtkconv.c:1689
+#: ../pidgin/gtkdebug.c:840
 msgid "Info"
 msgstr "Detalii"
 
 #. Close button
 #: ../finch/gntcertmgr.c:324 ../finch/gntft.c:237 ../finch/gntnotify.c:182
-#: ../finch/gntplugin.c:210 ../finch/gntplugin.c:310 ../finch/gntpounce.c:738
-#: ../finch/gntstatus.c:216 ../libpurple/protocols/msn/msn.c:403
-#: ../libpurple/protocols/silc/util.c:382
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2468
-#: ../pidgin/gtkrequest.c:273
+#: ../finch/gntplugin.c:213 ../finch/gntplugin.c:406 ../finch/gntpounce.c:751
+#: ../finch/gntstatus.c:216 ../libpurple/protocols/msn/msn.c:407
+#: ../libpurple/protocols/msnp9/msn.c:403
+#: ../libpurple/protocols/silc/util.c:388
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2474
+#: ../pidgin/gtkrequest.c:323
 msgid "Close"
 msgstr "Închide"
 
-#: ../finch/gntconn.c:124
+#: ../finch/gntconn.c:125
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:127
+#: ../finch/gntconn.c:128
 #, c-format
 msgid "%s disconnected."
 msgstr "%s s-a deconectat."
 
-#: ../finch/gntconn.c:128
+#: ../finch/gntconn.c:129
 #, c-format
 msgid ""
 "%s\n"
@@ -819,52 +859,51 @@
 "Nu se va mai reîncerca conectarea cu acest cont. Trebuie să corectaţi "
 "eroarea şi să reactivaţi contul."
 
-#: ../finch/gntconn.c:137 ../pidgin/gtkblist.c:4041
+#: ../finch/gntconn.c:138
 msgid "Re-enable Account"
 msgstr "Reactivare cont"
 
-#: ../finch/gntconv.c:139
+#: ../finch/gntconv.c:137
 msgid "No such command."
 msgstr "Nu există o asemenea comandă."
 
-#: ../finch/gntconv.c:143 ../pidgin/gtkconv.c:489
+#: ../finch/gntconv.c:141 ../pidgin/gtkconv.c:531
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
 "Eroare de sintaxă: Aţi introdus un număr greşit de argumente pentru această "
 "comandă."
 
-#: ../finch/gntconv.c:148 ../pidgin/gtkconv.c:495
+#: ../finch/gntconv.c:146 ../pidgin/gtkconv.c:537
 msgid "Your command failed for an unknown reason."
 msgstr "Comanda dată a eşuat din motive necunoscute."
 
-#: ../finch/gntconv.c:153 ../pidgin/gtkconv.c:502
+#: ../finch/gntconv.c:151 ../pidgin/gtkconv.c:544
 msgid "That command only works in chats, not IMs."
 msgstr "Această comandă funcţionează doar în chat-uri, nu şi în discuţii."
 
-#: ../finch/gntconv.c:156 ../pidgin/gtkconv.c:505
+#: ../finch/gntconv.c:154 ../pidgin/gtkconv.c:547
 msgid "That command only works in IMs, not chats."
 msgstr "Această comandă funcţionează doar în discuţii, nu şi în chat-uri."
 
-#: ../finch/gntconv.c:160 ../pidgin/gtkconv.c:510
+#: ../finch/gntconv.c:158 ../pidgin/gtkconv.c:552
 msgid "That command doesn't work on this protocol."
 msgstr "Această comandă nu funcţionează în acest protocol."
 
-#: ../finch/gntconv.c:168
-#, fuzzy
+#: ../finch/gntconv.c:166
 msgid "Message was not sent, because you are not signed on."
-msgstr "Mesajul nu a putut fi trimis pentru că se trimit prea multe date:"
-
-#: ../finch/gntconv.c:251
+msgstr "Mesajul nu a fost trimis pentru că nu v-aţi conectat."
+
+#: ../finch/gntconv.c:245
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:274
+#: ../finch/gntconv.c:268
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:279 ../finch/gntconv.c:773
+#: ../finch/gntconv.c:273 ../finch/gntconv.c:795
 #, c-format
 msgid ""
 "\n"
@@ -873,71 +912,69 @@
 "\n"
 "%s vă scrie..."
 
-#: ../finch/gntconv.c:298
+#: ../finch/gntconv.c:292
 msgid "You have left this chat."
 msgstr "Aţi ieşit din acest chat."
 
-#: ../finch/gntconv.c:387 ../pidgin/gtkconv.c:1362
+#: ../finch/gntconv.c:408 ../pidgin/gtkconv.c:1416
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
 "Înregistrarea a fost activată. Mesajele viitoare din această discuţie vor fi "
 "înregistrate."
 
-#: ../finch/gntconv.c:393 ../pidgin/gtkconv.c:1370
+#: ../finch/gntconv.c:414 ../pidgin/gtkconv.c:1424
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
 "Înregistrarea a fost dezactivată. Mesajele viitoare din această discuţie nu "
 "vor fi înregistrate."
 
-#: ../finch/gntconv.c:442
+#: ../finch/gntconv.c:463
 msgid "Send To"
 msgstr "Trimite către"
 
-#: ../finch/gntconv.c:486
+#: ../finch/gntconv.c:507
 msgid "Conversation"
 msgstr "Discuţie"
 
-#: ../finch/gntconv.c:492
+#: ../finch/gntconv.c:513
 msgid "Clear Scrollback"
 msgstr "Goleşte fereastra"
 
-#: ../finch/gntconv.c:496 ../finch/gntprefs.c:191
+#: ../finch/gntconv.c:517 ../finch/gntprefs.c:191
 msgid "Show Timestamps"
 msgstr "Arată marcaje de timp"
 
-#: ../finch/gntconv.c:512
+#: ../finch/gntconv.c:533
 msgid "Add Buddy Pounce..."
 msgstr "Adăugare întâmpinare..."
 
-#: ../finch/gntconv.c:527
-#, fuzzy
+#: ../finch/gntconv.c:548
 msgid "Enable Logging"
-msgstr "/Opţiuni/Activează înregistrarea"
-
-#: ../finch/gntconv.c:533
-#, fuzzy
+msgstr "Activează înregistrarea"
+
+#: ../finch/gntconv.c:554
 msgid "Enable Sounds"
-msgstr "Activare sunete:"
-
-#: ../finch/gntconv.c:739
+msgstr "Activează sunetul"
+
+#: ../finch/gntconv.c:760
 msgid "<AUTO-REPLY> "
 msgstr "<Răspuns-Automat> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:861
+#: ../finch/gntconv.c:883
 msgid "List of users:\n"
 msgstr "Lista utilizatorilor:\n"
 
-#: ../finch/gntconv.c:1023 ../pidgin/gtkconv.c:331
+#: ../finch/gntconv.c:1045 ../pidgin/gtkconv.c:371
 msgid "Supported debug options are:  version"
 msgstr "Opţiunile de depanare suportate sunt:  version"
 
-#: ../finch/gntconv.c:1059 ../pidgin/gtkconv.c:381
+#: ../finch/gntconv.c:1081 ../pidgin/gtkconv.c:423
 msgid "No such command (in this context)."
 msgstr "Nu există o asemenea comandă (în acest context)."
 
-#: ../finch/gntconv.c:1062 ../pidgin/gtkconv.c:384
+#: ../finch/gntconv.c:1084 ../pidgin/gtkconv.c:426
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -945,7 +982,7 @@
 "Utilizaţi „/help &lt;comandă&gt;” pentru ajutor referitor la o comandă.\n"
 "Următoarele comenzi sunt disponibile în acest context:\n"
 
-#: ../finch/gntconv.c:1120 ../pidgin/gtkconv.c:7560
+#: ../finch/gntconv.c:1142 ../pidgin/gtkconv.c:7755
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -953,12 +990,12 @@
 "say &lt;mesaj&gt;:  Trimite un mesaj normal, ca şi cum nu s-ar fi folosit o "
 "comandă."
 
-#: ../finch/gntconv.c:1123 ../pidgin/gtkconv.c:7563
+#: ../finch/gntconv.c:1145 ../pidgin/gtkconv.c:7758
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;acţiune&gt;:  Trimite o acţiune tip IRC către un contact sau un chat."
 
-#: ../finch/gntconv.c:1126 ../pidgin/gtkconv.c:7566
+#: ../finch/gntconv.c:1148 ../pidgin/gtkconv.c:7761
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -966,43 +1003,48 @@
 "debug &lt;opţiune&gt;:  Trimite diverse informaţii de depanare în discuţia "
 "curentă."
 
-#: ../finch/gntconv.c:1129 ../pidgin/gtkconv.c:7569
+#: ../finch/gntconv.c:1151 ../pidgin/gtkconv.c:7764
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Goleşte conţinutul ferestrei de discuţii."
 
-#: ../finch/gntconv.c:1132 ../pidgin/gtkconv.c:7575
+#: ../finch/gntconv.c:1154 ../pidgin/gtkconv.c:7770
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;comandă&gt;:  Ajutor pentru o comandă specifică."
 
-#: ../finch/gntconv.c:1135
+#: ../finch/gntconv.c:1157
 msgid "users:  Show the list of users in the chat."
 msgstr "users: Arată lista utilizatorilor din chat."
 
-#: ../finch/gntconv.c:1140
+#: ../finch/gntconv.c:1162
 msgid "plugins: Show the plugins window."
 msgstr "plugins: Arată fereastra de module."
 
-#: ../finch/gntconv.c:1143
+#: ../finch/gntconv.c:1165
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: Arată lista de contacte"
 
-#: ../finch/gntconv.c:1146
+#: ../finch/gntconv.c:1168
 msgid "accounts: Show the accounts window."
 msgstr "accounts: Arată fereastra de editare a conturilor."
 
-#: ../finch/gntconv.c:1149
+#: ../finch/gntconv.c:1171
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: Arată fereastra de depanare."
 
-#: ../finch/gntconv.c:1152
+#: ../finch/gntconv.c:1174
 msgid "prefs: Show the preference window."
 msgstr "prefs: Arată fereastra cu preferinţe."
 
-#: ../finch/gntconv.c:1155
+#: ../finch/gntconv.c:1177
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: Arată fereastra de statusuri salvate."
 
-#: ../finch/gntdebug.c:235 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:695
+#: ../finch/gntdebug.c:231 ../pidgin/gtkconv.c:989 ../pidgin/gtkconv.c:2663
+#: ../pidgin/gtkdebug.c:220 ../pidgin/gtkft.c:543
+msgid "Unable to open file."
+msgstr "Nu se poate deschide fişierul."
+
+#: ../finch/gntdebug.c:271 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:700
 msgid "Debug Window"
 msgstr "Fereastră de depanare"
 
@@ -1010,15 +1052,15 @@
 #. * it's necessary to make the width of the debug window resizable ... like I said,
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #.
-#: ../finch/gntdebug.c:256 ../pidgin/gtkdebug.c:754
+#: ../finch/gntdebug.c:292 ../pidgin/gtkdebug.c:759
 msgid "Clear"
 msgstr "Goleşte"
 
-#: ../finch/gntdebug.c:262
-msgid "Filter: "
-msgstr "Filtru: "
-
-#: ../finch/gntdebug.c:266 ../pidgin/gtkdebug.c:763
+#: ../finch/gntdebug.c:303
+msgid "Filter:"
+msgstr "Filtru:"
+
+#: ../finch/gntdebug.c:309 ../pidgin/gtkdebug.c:768
 msgid "Pause"
 msgstr "Pauză"
 
@@ -1055,25 +1097,27 @@
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
 #: ../finch/gntft.c:201 ../finch/gntstatus.c:547 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:344
-#: ../libpurple/protocols/gg/gg.c:1039 ../libpurple/protocols/gg/gg.c:1576
-#: ../libpurple/protocols/gg/gg.c:1584
+#: ../libpurple/protocols/bonjour/bonjour.c:363
+#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1584
+#: ../libpurple/protocols/gg/gg.c:1592
 #: ../libpurple/protocols/jabber/buddy.c:778
 #: ../libpurple/protocols/jabber/buddy.c:782
 #: ../libpurple/protocols/jabber/buddy.c:941
-#: ../libpurple/protocols/jabber/jabber.c:1500
-#: ../libpurple/protocols/msn/msn.c:543
-#: ../libpurple/protocols/novell/novell.c:2835
+#: ../libpurple/protocols/jabber/jabber.c:1538
+#: ../libpurple/protocols/msn/msn.c:621 ../libpurple/protocols/msn/msn.c:631
+#: ../libpurple/protocols/msn/msn.c:636 ../libpurple/protocols/msn/msn.c:639
+#: ../libpurple/protocols/msnp9/msn.c:543
+#: ../libpurple/protocols/novell/novell.c:2852
 #: ../libpurple/protocols/oscar/oscar.c:821
 #: ../libpurple/protocols/oscar/oscar.c:826
 #: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:2700
-#: ../libpurple/protocols/oscar/oscar.c:3780
-#: ../libpurple/protocols/sametime/sametime.c:3263
-#: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3248 ../pidgin/gtkblist.c:3104
-#: ../pidgin/gtkblist.c:3118 ../pidgin/gtkblist.c:3120
-#: ../pidgin/gtksavedstatuses.c:999 ../pidgin/gtksavedstatuses.c:1144
+#: ../libpurple/protocols/oscar/oscar.c:2710
+#: ../libpurple/protocols/oscar/oscar.c:3790
+#: ../libpurple/protocols/sametime/sametime.c:3305
+#: ../libpurple/protocols/sametime/sametime.c:4196
+#: ../libpurple/protocols/yahoo/yahoo.c:3259 ../pidgin/gtkblist.c:3338
+#: ../pidgin/gtkblist.c:3352 ../pidgin/gtkblist.c:3354
+#: ../pidgin/gtksavedstatuses.c:1005 ../pidgin/gtksavedstatuses.c:1150
 msgid "Status"
 msgstr "Status"
 
@@ -1109,14 +1153,15 @@
 #: ../finch/gntft.c:431
 #, c-format
 msgid "The file was saved as %s."
-msgstr ""
+msgstr "Fişierul a fost salvat ca %s."
 
 #: ../finch/gntft.c:432 ../finch/gntft.c:433 ../pidgin/gtkft.c:163
 #: ../pidgin/gtkft.c:1116
 msgid "Finished"
 msgstr "Terminat"
 
-#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:347
+#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:404
+#: ../libpurple/protocols/msnp9/session.c:357
 msgid "Transferring"
 msgstr "Transfer"
 
@@ -1124,19 +1169,19 @@
 msgid "Emails"
 msgstr "Mailuri"
 
-#: ../finch/gntnotify.c:171 ../finch/gntnotify.c:225
+#: ../finch/gntnotify.c:171 ../finch/gntnotify.c:226
 msgid "You have mail!"
 msgstr "Aveţi mail nou!"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:513
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:519
 msgid "Sender"
 msgstr "Expeditor"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:520
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:526
 msgid "Subject"
 msgstr "Subiect"
 
-#: ../finch/gntnotify.c:201
+#: ../finch/gntnotify.c:202
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
@@ -1144,53 +1189,49 @@
 msgstr[1] "%s (%s) are %d mesaje noi."
 msgstr[2] "%s (%s) are %d de mesaje noi."
 
-#: ../finch/gntnotify.c:225 ../pidgin/gtknotify.c:341
+#: ../finch/gntnotify.c:226 ../pidgin/gtknotify.c:342
 msgid "New Mail"
 msgstr "Mail nou"
 
-#: ../finch/gntnotify.c:290 ../pidgin/gtknotify.c:940
+#: ../finch/gntnotify.c:291 ../pidgin/gtknotify.c:949
 #, c-format
 msgid "Info for %s"
 msgstr "Detalii pentru %s"
 
-#: ../finch/gntnotify.c:291 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:941
+#: ../finch/gntnotify.c:292 ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:950
 msgid "Buddy Information"
 msgstr "Detalii contact"
 
-#: ../finch/gntnotify.c:377 ../libpurple/protocols/qq/group_join.c:367
+#: ../finch/gntnotify.c:382 ../libpurple/protocols/qq/group_join.c:367
 msgid "Continue"
 msgstr "Continuă"
 
-#: ../finch/gntnotify.c:386 ../pidgin/gtkconv.c:1596
+#: ../finch/gntnotify.c:391 ../pidgin/gtkconv.c:1650
 msgid "IM"
 msgstr "Mesaj"
 
-#: ../finch/gntnotify.c:389
-msgid "Join"
-msgstr "Intră"
-
-#: ../finch/gntnotify.c:392 ../libpurple/protocols/sametime/sametime.c:3473
+#: ../finch/gntnotify.c:397 ../libpurple/protocols/sametime/sametime.c:3515
 msgid "Invite"
 msgstr "Invită"
 
-#: ../finch/gntnotify.c:395
+#: ../finch/gntnotify.c:400
 msgid "(none)"
 msgstr "(nimic)"
 
-#: ../finch/gntplugin.c:75 ../finch/gntplugin.c:84
+#: ../finch/gntplugin.c:77 ../finch/gntplugin.c:86
 msgid "ERROR"
 msgstr "EROARE"
 
-#: ../finch/gntplugin.c:75
+#: ../finch/gntplugin.c:77
 msgid "loading plugin failed"
 msgstr "activarea modulului a eşuat"
 
-#: ../finch/gntplugin.c:84
+#: ../finch/gntplugin.c:86
 msgid "unloading plugin failed"
 msgstr "dezactivarea modului a eşuat"
 
-#: ../finch/gntplugin.c:129
+#: ../finch/gntplugin.c:132
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1207,19 +1248,42 @@
 "Adresă Internet: %s\n"
 "Nume fişier: %s\n"
 
-#: ../finch/gntplugin.c:187
+#: ../finch/gntplugin.c:190
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "Modulul trebuie încărcat înainte de a-l putea configura."
 
-#: ../finch/gntplugin.c:235
+#: ../finch/gntplugin.c:238
 msgid "No configuration options for this plugin."
 msgstr "Nu există preferinţe pentru acest modul."
 
+#: ../finch/gntplugin.c:259
+msgid "Error loading plugin"
+msgstr "Au apărut erori la încărcarea modulului"
+
 #: ../finch/gntplugin.c:260
+msgid "The selected file is not a valid plugin."
+msgstr "Fişierul selectat nu este un modul valid."
+
+#: ../finch/gntplugin.c:261
+msgid ""
+"Please open the debug window and try again to see the exact error message."
+msgstr ""
+"Deschideţi fereastra de depanare şi încercaţi din nou să localizaţi mesajul "
+"de eroare."
+
+#: ../finch/gntplugin.c:324
+msgid "Select plugin to install"
+msgstr "Selectaţi modulul de instalat"
+
+#: ../finch/gntplugin.c:350
 msgid "You can (un)load plugins from the following list."
 msgstr "Puteţi (dez)activa module din lista următoare."
 
-#: ../finch/gntplugin.c:315
+#: ../finch/gntplugin.c:401
+msgid "Install Plugin..."
+msgstr "Instalare modul..."
+
+#: ../finch/gntplugin.c:411
 msgid "Configure Plugin"
 msgstr "Configurare modul"
 
@@ -1228,189 +1292,186 @@
 #. (that should have been "effect," right?)
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
-#: ../finch/gntplugin.c:371 ../finch/gntplugin.c:378 ../finch/gntprefs.c:264
-#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2067
+#: ../finch/gntplugin.c:467 ../finch/gntplugin.c:474 ../finch/gntprefs.c:264
+#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:717 ../pidgin/gtkprefs.c:2169
 msgid "Preferences"
 msgstr "Preferinţe"
 
-#: ../finch/gntpounce.c:183 ../pidgin/gtkpounce.c:256
+#: ../finch/gntpounce.c:194 ../pidgin/gtkpounce.c:256
 msgid "Please enter a buddy to pounce."
 msgstr "Precizaţi un contact pentru întâmpinare."
 
-#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:517
+#: ../finch/gntpounce.c:339 ../pidgin/gtkpounce.c:531
 msgid "New Buddy Pounce"
 msgstr "Întâmpinare nouă"
 
-#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:517
+#: ../finch/gntpounce.c:339 ../pidgin/gtkpounce.c:531
 msgid "Edit Buddy Pounce"
 msgstr "Editare întâmpinare"
 
-#: ../finch/gntpounce.c:333
+#: ../finch/gntpounce.c:344
 msgid "Pounce Who"
 msgstr "Întâmpinare pentru"
 
 #. Account:
-#: ../finch/gntpounce.c:336 ../finch/gntstatus.c:456
+#: ../finch/gntpounce.c:347 ../finch/gntstatus.c:456
 msgid "Account:"
 msgstr "Cont:"
 
-#: ../finch/gntpounce.c:358
+#: ../finch/gntpounce.c:369
 msgid "Buddy name:"
 msgstr "Nume contact:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:374 ../pidgin/gtkpounce.c:585
+#: ../finch/gntpounce.c:387 ../pidgin/gtkpounce.c:600
 msgid "Pounce When Buddy..."
 msgstr "Întâmpinare la..."
 
-#: ../finch/gntpounce.c:376
+#: ../finch/gntpounce.c:389
 msgid "Signs on"
 msgstr "Autentificare"
 
-#: ../finch/gntpounce.c:377
+#: ../finch/gntpounce.c:390
 msgid "Signs off"
 msgstr "Deconectare"
 
-#: ../finch/gntpounce.c:378
+#: ../finch/gntpounce.c:391
 msgid "Goes away"
 msgstr "Intrarea în absenţă"
 
-#: ../finch/gntpounce.c:379
+#: ../finch/gntpounce.c:392
 msgid "Returns from away"
 msgstr "Întoarcerea din absenţă"
 
-#: ../finch/gntpounce.c:380
+#: ../finch/gntpounce.c:393
 msgid "Becomes idle"
 msgstr "Intrarea în inactivitate"
 
-#: ../finch/gntpounce.c:381
+#: ../finch/gntpounce.c:394
 msgid "Is no longer idle"
 msgstr "Revenirea din inactivitate"
 
-#: ../finch/gntpounce.c:382
+#: ../finch/gntpounce.c:395
 msgid "Starts typing"
 msgstr "Tastarea unui mesaj nou"
 
-#: ../finch/gntpounce.c:383
+#: ../finch/gntpounce.c:396
 msgid "Pauses while typing"
 msgstr "Pauză în timpul tastării"
 
-#: ../finch/gntpounce.c:384
+#: ../finch/gntpounce.c:397
 msgid "Stops typing"
 msgstr "Oprirea din tastare"
 
-#: ../finch/gntpounce.c:385
+#: ../finch/gntpounce.c:398
 msgid "Sends a message"
 msgstr "Trimiterea unui mesaj"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:414 ../pidgin/gtkpounce.c:646
+#: ../finch/gntpounce.c:427 ../pidgin/gtkpounce.c:661
 msgid "Action"
 msgstr "Acţiune"
 
-#: ../finch/gntpounce.c:416
+#: ../finch/gntpounce.c:429
 msgid "Open an IM window"
 msgstr "Deschide o discuţie"
 
-#: ../finch/gntpounce.c:417
+#: ../finch/gntpounce.c:430
 msgid "Pop up a notification"
 msgstr "Deschide o fereastră de notificare"
 
-#: ../finch/gntpounce.c:418
+#: ../finch/gntpounce.c:431
 msgid "Send a message"
 msgstr "Trimite un mesaj"
 
-#: ../finch/gntpounce.c:419
+#: ../finch/gntpounce.c:432
 msgid "Execute a command"
 msgstr "Execută o comandă"
 
-#: ../finch/gntpounce.c:420
+#: ../finch/gntpounce.c:433
 msgid "Play a sound"
 msgstr "Redă un sunet"
 
-#: ../finch/gntpounce.c:448
+#: ../finch/gntpounce.c:461
 msgid "Pounce only when my status is not available"
 msgstr "Întâmpinare doar în starea de indisponibilitate"
 
-#: ../finch/gntpounce.c:450 ../pidgin/gtkpounce.c:1281
+#: ../finch/gntpounce.c:463 ../pidgin/gtkpounce.c:1301
 msgid "Recurring"
 msgstr "Recurentă"
 
-#: ../finch/gntpounce.c:618
-#, fuzzy
+#: ../finch/gntpounce.c:631
 msgid "Cannot create pounce"
-msgstr "Nu se reuşeşte schimbarea pseudonimului"
-
-#: ../finch/gntpounce.c:619
-#, fuzzy
+msgstr "Nu se poate crea întâmpinarea"
+
+#: ../finch/gntpounce.c:632
 msgid "You do not have any accounts."
-msgstr "Trebuie să selectaţi un cont."
-
-#: ../finch/gntpounce.c:620
+msgstr "Nu aveţi nici măcar un cont creat."
+
+#: ../finch/gntpounce.c:633
 msgid "You must create an account first before you can create a pounce."
-msgstr ""
-
-#: ../finch/gntpounce.c:662 ../pidgin/gtkpounce.c:1096
+msgstr "Trebuie să creaţi un cont înainte de a putea crea o întâmpinare."
+
+#: ../finch/gntpounce.c:675 ../pidgin/gtkpounce.c:1116
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "Sigur doriţi să ştergeţi întâmpinarea la %s pentru %s?"
 
-#: ../finch/gntpounce.c:696 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1325
+#: ../finch/gntpounce.c:709 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1352
 msgid "Buddy Pounces"
 msgstr "Întâmpinări contacte"
 
-#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1452
+#: ../finch/gntpounce.c:823 ../pidgin/gtkpounce.c:1480
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s a început să vă scrie (%s)"
 
-#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1454
+#: ../finch/gntpounce.c:825 ../pidgin/gtkpounce.c:1482
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s s-a oprit în timp ce vă scria (%s)"
 
-#: ../finch/gntpounce.c:814 ../pidgin/gtkpounce.c:1456
+#: ../finch/gntpounce.c:827 ../pidgin/gtkpounce.c:1484
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s s-a autentificat (%s)"
 
-#: ../finch/gntpounce.c:816 ../pidgin/gtkpounce.c:1458
+#: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1486
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s s-a întors din inactivitate (%s)"
 
-#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1460
+#: ../finch/gntpounce.c:831 ../pidgin/gtkpounce.c:1488
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s s-a întors din absenţă (%s)"
 
-#: ../finch/gntpounce.c:820 ../pidgin/gtkpounce.c:1462
+#: ../finch/gntpounce.c:833 ../pidgin/gtkpounce.c:1490
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s a încetat să vă scrie (%s)"
 
-#: ../finch/gntpounce.c:822 ../pidgin/gtkpounce.c:1464
+#: ../finch/gntpounce.c:835 ../pidgin/gtkpounce.c:1492
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s s-a deconectat (%s)"
 
-#: ../finch/gntpounce.c:824 ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:837 ../pidgin/gtkpounce.c:1494
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s a intrat în inactivitate (%s)"
 
-#: ../finch/gntpounce.c:826 ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:839 ../pidgin/gtkpounce.c:1496
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s a intrat în absenţă (%s)"
 
-#: ../finch/gntpounce.c:828 ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:841 ../pidgin/gtkpounce.c:1498
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s v-a trimis un mesaj. (%s)"
 
-#: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1471
-#, c-format
+#: ../finch/gntpounce.c:842 ../pidgin/gtkpounce.c:1499
 msgid "Unknown pounce event. Please report this!"
 msgstr "Eveniment necunoscut în întâmpinare. Raportaţi această eroare."
 
@@ -1418,12 +1479,12 @@
 msgid "Based on keyboard use"
 msgstr "În funcţie de tastare"
 
-#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1930
+#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:2031
 msgid "From last sent message"
 msgstr "Începând cu ultimul mesaj trimis"
 
-#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:907
-#: ../pidgin/gtkprefs.c:1929 ../pidgin/gtkprefs.c:1943
+#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:900 ../pidgin/gtkprefs.c:908
+#: ../pidgin/gtkprefs.c:2030 ../pidgin/gtkprefs.c:2044
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "Niciodată"
@@ -1440,15 +1501,15 @@
 msgid "Notify buddies when you are typing"
 msgstr "Notifică contactele când le scriu"
 
-#: ../finch/gntprefs.c:198
+#: ../finch/gntprefs.c:198 ../finch/plugins/gnthistory.c:156
 msgid "Log format"
 msgstr "Format înregistrări"
 
-#: ../finch/gntprefs.c:199
+#: ../finch/gntprefs.c:199 ../finch/plugins/gnthistory.c:146
 msgid "Log IMs"
 msgstr "Înregistrează mesajele"
 
-#: ../finch/gntprefs.c:200
+#: ../finch/gntprefs.c:200 ../finch/plugins/gnthistory.c:147
 msgid "Log chats"
 msgstr "Înregistrează chat-urile"
 
@@ -1473,186 +1534,178 @@
 msgstr "Schimbă statusul în:"
 
 #. Conversations
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:993 ../pidgin/gtkprefs.c:2033
+#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:995 ../pidgin/gtkprefs.c:2135
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "Discuţii"
 
-#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1467 ../pidgin/gtkprefs.c:2044
+#: ../finch/gntprefs.c:260 ../finch/plugins/gnthistory.c:154
+#: ../pidgin/gtkprefs.c:1563 ../pidgin/gtkprefs.c:2146
 msgid "Logging"
 msgstr "Înregistrare"
 
-#: ../finch/gntrequest.c:583
+#: ../finch/gntrequest.c:585
 msgid "Not implemented yet."
 msgstr "Neimplementat încă."
 
-#: ../finch/gntrequest.c:659 ../pidgin/gtkrequest.c:1555
-#: ../pidgin/gtkrequest.c:1601
+#: ../finch/gntrequest.c:661 ../pidgin/gtkrequest.c:1699
+#: ../pidgin/gtkrequest.c:1745
 msgid "Save File..."
 msgstr "Salvează fişierul..."
 
-#: ../finch/gntrequest.c:659 ../pidgin/gtkrequest.c:1556
-#: ../pidgin/gtkrequest.c:1602
+#: ../finch/gntrequest.c:661 ../pidgin/gtkrequest.c:1700
+#: ../pidgin/gtkrequest.c:1746
 msgid "Open File..."
 msgstr "Deschide fişierul..."
 
-#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:64
+#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:62
 msgid "Buddy logs in"
 msgstr "Un contact se autentifică"
 
-#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:65
+#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:63
 msgid "Buddy logs out"
 msgstr "Un contact se deconectează"
 
-#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:66
+#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:64
 msgid "Message received"
 msgstr "Aţi primit un mesaj"
 
-#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:67
+#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:65
 msgid "Message received begins conversation"
 msgstr "Aţi primit un mesaj ce începe o discuţie"
 
-#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:68
+#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:66
 msgid "Message sent"
 msgstr "Aţi trimis un mesaj"
 
-#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:69
+#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:67
 msgid "Person enters chat"
 msgstr "Cineva intră în chat"
 
-#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:70
+#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:68
 msgid "Person leaves chat"
 msgstr "Cineva iese din chat"
 
-#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:71
+#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:69
 msgid "You talk in chat"
 msgstr "Spuneţi ceva într-un chat"
 
-#: ../finch/gntsound.c:105 ../pidgin/gtksound.c:72
+#: ../finch/gntsound.c:105 ../pidgin/gtksound.c:70
 msgid "Others talk in chat"
 msgstr "Alţii spun ceva într-un chat"
 
-#: ../finch/gntsound.c:107 ../pidgin/gtksound.c:75
+#: ../finch/gntsound.c:107 ../pidgin/gtksound.c:73
 msgid "Someone says your screen name in chat"
 msgstr "Cineva vă spune numele de identificare într-un chat"
 
-#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:311
+#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:306
 msgid "GStreamer Failure"
 msgstr "Eroare GStreamer"
 
-#: ../finch/gntsound.c:362 ../pidgin/gtksound.c:312
+#: ../finch/gntsound.c:362 ../pidgin/gtksound.c:307
 msgid "GStreamer failed to initialize."
-msgstr "GStreamer nu s-a putut iniţializa."
-
-#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1587
-#: ../pidgin/gtkprefs.c:1676 ../pidgin/gtkprefs.c:1872
+msgstr "Iniţializarea GStreamer a eşuat."
+
+#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1687
+#: ../pidgin/gtkprefs.c:1776 ../pidgin/gtkprefs.c:1972
 msgid "(default)"
 msgstr "(implicit)"
 
 #: ../finch/gntsound.c:729
-#, fuzzy
 msgid "Select Sound File ..."
-msgstr "Alegeţi un director..."
+msgstr "Selectaţi un fişier de sunet..."
 
 #: ../finch/gntsound.c:904
-#, fuzzy
 msgid "Sound Preferences"
-msgstr "Preferinţe"
+msgstr "Preferinţe sunet"
 
 #: ../finch/gntsound.c:915
-#, fuzzy
 msgid "Profiles"
-msgstr "Profil"
-
-#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1717
+msgstr "Profile"
+
+#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1817
 msgid "Automatic"
 msgstr "Automat"
 
 #: ../finch/gntsound.c:957
-#, fuzzy
 msgid "Console Beep"
-msgstr "Bip"
-
-#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1721
+msgstr "Bip în consolă"
+
+#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1821
 msgid "Command"
 msgstr "Comandă"
 
 #: ../finch/gntsound.c:959
-#, fuzzy
 msgid "No Sound"
 msgstr "Fără sunete"
 
-#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1712
+#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1812
 msgid "Sound Method"
 msgstr "Sistemul de sunet"
 
 #: ../finch/gntsound.c:966
-#, fuzzy
 msgid "Method: "
-msgstr "_Sistem:"
+msgstr "Sistem:"
 
 #: ../finch/gntsound.c:973
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Sound Command\n"
 "(%s for filename)"
 msgstr ""
-"Comandă de _redare sunet\n"
+"Comandă de redare sunet\n"
 "(%s pentru numele fişierului)"
 
 #. Sound options
-#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1756
+#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1856
 msgid "Sound Options"
 msgstr "Opţiuni sunet"
 
 #: ../finch/gntsound.c:982
-#, fuzzy
 msgid "Sounds when conversation has focus"
-msgstr "Utilizează sunete când fereastra de discuţii are _focus"
-
-#: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:909
-#: ../pidgin/gtkprefs.c:1763 ../pidgin/plugins/timestamp_format.c:42
+msgstr "Utilizează sunete când fereastra de discuţii are focus"
+
+#: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:910
+#: ../pidgin/gtkprefs.c:1863 ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:334
 msgid "Always"
 msgstr "Întotdeauna"
 
-#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1761
+#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1861
 msgid "Only when available"
 msgstr "Doar când sunt disponibil(ă)"
 
-#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1762
+#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1862
 msgid "Only when not available"
 msgstr "Doar când nu sunt disponibil(ă)"
 
 #: ../finch/gntsound.c:999
-#, fuzzy
 msgid "Volume(0-100):"
-msgstr "Volum:"
+msgstr "Volum (0-100):"
 
 #. Sound events
-#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1798
+#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1898
 msgid "Sound Events"
 msgstr "Evenimente sonore"
 
-#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1857
+#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1957
 msgid "Event"
 msgstr "Eveniment"
 
 #: ../finch/gntsound.c:1020
-#, fuzzy
 msgid "File"
-msgstr "Eşuat"
-
-#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1876
+msgstr "Fişier"
+
+#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1976
 msgid "Test"
 msgstr "Testare"
 
-#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1880
+#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1980
 msgid "Reset"
 msgstr "Resetare"
 
-#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1884
+#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1984
 msgid "Choose..."
 msgstr "Alegeţi..."
 
@@ -1672,7 +1725,8 @@
 #: ../finch/gntstatus.c:183 ../finch/gntstatus.c:539
 #: ../libpurple/protocols/jabber/buddy.c:298
 #: ../libpurple/protocols/jabber/buddy.c:1359
-#: ../libpurple/protocols/novell/novell.c:1484
+#: ../libpurple/protocols/msn/msn.c:725
+#: ../libpurple/protocols/novell/novell.c:1493
 #: ../pidgin/gtksavedstatuses.c:500
 msgid "Title"
 msgstr "Titlu"
@@ -1690,41 +1744,44 @@
 #. not independent
 #. Attributes - each status can have a message.
 #: ../finch/gntstatus.c:183 ../finch/gntstatus.c:564 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:256
-#: ../libpurple/protocols/bonjour/bonjour.c:263
-#: ../libpurple/protocols/bonjour/bonjour.c:346
-#: ../libpurple/protocols/gg/gg.c:1077 ../libpurple/protocols/gg/gg.c:1579
-#: ../libpurple/protocols/gg/gg.c:1597 ../libpurple/protocols/gg/gg.c:1607
-#: ../libpurple/protocols/gg/gg.c:1613 ../libpurple/protocols/gg/gg.c:1622
-#: ../libpurple/protocols/gg/gg.c:1627 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1532
-#: ../libpurple/protocols/jabber/jabber.c:1555
-#: ../libpurple/protocols/jabber/jabber.c:1578
-#: ../libpurple/protocols/jabber/jabber.c:1601
-#: ../libpurple/protocols/jabber/jabber.c:1624
-#: ../libpurple/protocols/jabber/jabber.c:1649
+#: ../libpurple/protocols/bonjour/bonjour.c:275
+#: ../libpurple/protocols/bonjour/bonjour.c:282
+#: ../libpurple/protocols/bonjour/bonjour.c:365
+#: ../libpurple/protocols/gg/gg.c:1079 ../libpurple/protocols/gg/gg.c:1587
+#: ../libpurple/protocols/gg/gg.c:1605 ../libpurple/protocols/gg/gg.c:1615
+#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/gg/gg.c:1630
+#: ../libpurple/protocols/gg/gg.c:1635 ../libpurple/protocols/irc/irc.c:238
+#: ../libpurple/protocols/jabber/jabber.c:1570
+#: ../libpurple/protocols/jabber/jabber.c:1584
+#: ../libpurple/protocols/jabber/jabber.c:1598
+#: ../libpurple/protocols/jabber/jabber.c:1612
+#: ../libpurple/protocols/jabber/jabber.c:1626
+#: ../libpurple/protocols/jabber/jabber.c:1642
+#: ../libpurple/protocols/msn/msn.c:677 ../libpurple/protocols/msn/msn.c:683
+#: ../libpurple/protocols/msn/msn.c:689 ../libpurple/protocols/msn/msn.c:695
+#: ../libpurple/protocols/msn/msn.c:700 ../libpurple/protocols/msn/msn.c:705
 #: ../libpurple/protocols/myspace/myspace.c:148
-#: ../libpurple/protocols/novell/novell.c:2838
-#: ../libpurple/protocols/novell/novell.c:2941
-#: ../libpurple/protocols/novell/novell.c:2947
-#: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/oscar/oscar.c:5554
-#: ../libpurple/protocols/oscar/oscar.c:5772
-#: ../libpurple/protocols/oscar/oscar.c:5786
-#: ../libpurple/protocols/oscar/oscar.c:5802
-#: ../libpurple/protocols/oscar/oscar.c:5809
-#: ../libpurple/protocols/oscar/oscar.c:5816
-#: ../libpurple/protocols/sametime/sametime.c:3286
-#: ../libpurple/protocols/sametime/sametime.c:3292
-#: ../libpurple/protocols/sametime/sametime.c:3298
-#: ../libpurple/protocols/sametime/sametime.c:3377
-#: ../libpurple/protocols/silc/buddy.c:1551
-#: ../libpurple/protocols/silc10/buddy.c:1551
-#: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3751
-#: ../libpurple/protocols/yahoo/yahoo.c:3757
+#: ../libpurple/protocols/novell/novell.c:2855
+#: ../libpurple/protocols/novell/novell.c:2958
+#: ../libpurple/protocols/novell/novell.c:2964
+#: ../libpurple/protocols/novell/novell.c:2970
+#: ../libpurple/protocols/oscar/oscar.c:5604
+#: ../libpurple/protocols/oscar/oscar.c:5822
+#: ../libpurple/protocols/oscar/oscar.c:5836
+#: ../libpurple/protocols/oscar/oscar.c:5852
+#: ../libpurple/protocols/oscar/oscar.c:5859
+#: ../libpurple/protocols/oscar/oscar.c:5866
+#: ../libpurple/protocols/sametime/sametime.c:3328
+#: ../libpurple/protocols/sametime/sametime.c:3334
+#: ../libpurple/protocols/sametime/sametime.c:3340
+#: ../libpurple/protocols/sametime/sametime.c:3419
+#: ../libpurple/protocols/silc/buddy.c:1554
+#: ../libpurple/protocols/silc10/buddy.c:1554
+#: ../libpurple/protocols/simple/simple.c:247
+#: ../libpurple/protocols/yahoo/yahoo.c:3762
+#: ../libpurple/protocols/yahoo/yahoo.c:3768
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
-#: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1010
+#: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1016
 msgid "Message"
 msgstr "Mesaj"
 
@@ -1776,9 +1833,9 @@
 
 #: ../finch/gntui.c:85
 msgid "Certificates"
-msgstr ""
-
-#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2035
+msgstr "Certificate"
+
+#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2137
 msgid "Sounds"
 msgstr "Sunete"
 
@@ -1788,23 +1845,21 @@
 
 #: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
 #: ../finch/plugins/gntclipboard.c:128
-#, fuzzy
 msgid "Error loading the plugin."
-msgstr "Au apărut erori la dezactivarea modulului."
+msgstr "Au apărut erori la încărcarea modulului."
 
 #: ../finch/plugins/gntclipboard.c:116
-#, fuzzy
 msgid "Couldn't find X display"
-msgstr "Nu s-a putut deschide fişierul"
+msgstr "Nu s-a găsit un ecran X"
 
 #: ../finch/plugins/gntclipboard.c:122
-#, fuzzy
 msgid "Couldn't find window"
-msgstr "Nu s-a putut deschide fişierul"
+msgstr "Nu s-a găsit o fereastră"
 
 #: ../finch/plugins/gntclipboard.c:129
 msgid "This plugin cannot be loaded because it was not built with X11 support."
 msgstr ""
+"Acest modul nu poate fi încărcat deoarece nu a fost compilat cu suport X11."
 
 #: ../finch/plugins/gntclipboard.c:158
 msgid "GntClipboard"
@@ -1883,16 +1938,16 @@
 msgid "Toaster plugin"
 msgstr "Modul de notificare animată"
 
-#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:120
+#: ../finch/plugins/gnthistory.c:117 ../pidgin/plugins/history.c:125
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<h1>Discuţie cu %s în %s:</b><br>"
 
-#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:147
+#: ../finch/plugins/gnthistory.c:175 ../pidgin/plugins/history.c:153
 msgid "History Plugin Requires Logging"
 msgstr "Modulul „Istoric” necesită autentificare"
 
-#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:148
+#: ../finch/plugins/gnthistory.c:176 ../pidgin/plugins/history.c:154
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
@@ -1905,15 +1960,15 @@
 "Înregistrarea mesajelor pentru discuţii şi/sau chat-uri va activa istoricul "
 "pentru mesajele respective."
 
-#: ../finch/plugins/gnthistory.c:179
+#: ../finch/plugins/gnthistory.c:221
 msgid "GntHistory"
 msgstr "GntHistory"
 
-#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:190
+#: ../finch/plugins/gnthistory.c:223 ../pidgin/plugins/history.c:197
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Arată discuţiile recent înregistrate în noile discuţii."
 
-#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:191
+#: ../finch/plugins/gnthistory.c:224 ../pidgin/plugins/history.c:198
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -1938,89 +1993,88 @@
 msgid "Lastlog plugin."
 msgstr "Modul Lastlog."
 
-#: ../libpurple/account.c:791
+#: ../libpurple/account.c:875
 msgid "accounts"
 msgstr "conturi"
 
-#: ../libpurple/account.c:958 ../libpurple/protocols/jabber/auth.c:195
+#: ../libpurple/account.c:1050 ../libpurple/protocols/jabber/auth.c:199
 msgid "Password is required to sign on."
 msgstr "Se cere parola pentru autentificare."
 
-#: ../libpurple/account.c:992
+#: ../libpurple/account.c:1084
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Introduceţi parola pentru %s (%s)"
 
-#: ../libpurple/account.c:999
+#: ../libpurple/account.c:1091
 msgid "Enter Password"
 msgstr "Introduceţi parola"
 
-#: ../libpurple/account.c:1004
+#: ../libpurple/account.c:1096
 msgid "Save password"
 msgstr "Salvare parolă"
 
-#: ../libpurple/account.c:1039 ../libpurple/connection.c:105
+#: ../libpurple/account.c:1131 ../libpurple/connection.c:105
 #: ../libpurple/connection.c:178
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Lipseşte modulul de protocol pentru %s"
 
-#: ../libpurple/account.c:1041 ../libpurple/connection.c:108
-#: ../pidgin/gtkblist.c:4036
+#: ../libpurple/account.c:1133 ../libpurple/connection.c:108
 msgid "Connection Error"
 msgstr "Eroare la conectare"
 
-#: ../libpurple/account.c:1199 ../libpurple/protocols/gg/gg.c:707
-#: ../libpurple/protocols/jabber/jabber.c:1687
+#: ../libpurple/account.c:1330 ../libpurple/protocols/gg/gg.c:708
+#: ../libpurple/protocols/jabber/jabber.c:1698
 msgid "New passwords do not match."
 msgstr "Noua parolă a fost confirmată greşit."
 
-#: ../libpurple/account.c:1208
+#: ../libpurple/account.c:1339
 msgid "Fill out all fields completely."
 msgstr "E necesară completarea tuturor câmpurilor."
 
-#: ../libpurple/account.c:1231
+#: ../libpurple/account.c:1362
 msgid "Original password"
 msgstr "Vechea parolă"
 
-#: ../libpurple/account.c:1238
+#: ../libpurple/account.c:1369
 msgid "New password"
 msgstr "Noua parolă"
 
-#: ../libpurple/account.c:1245
+#: ../libpurple/account.c:1376
 msgid "New password (again)"
 msgstr "Confirmare parolă nouă"
 
-#: ../libpurple/account.c:1251
+#: ../libpurple/account.c:1382
 #, c-format
 msgid "Change password for %s"
 msgstr "Schimbare parolă pentru %s"
 
-#: ../libpurple/account.c:1259
+#: ../libpurple/account.c:1390
 msgid "Please enter your current password and your new password."
 msgstr "Introduceţi vechea parolă pentru a o schimba cu una nouă."
 
-#: ../libpurple/account.c:1290
+#: ../libpurple/account.c:1421
 #, c-format
 msgid "Change user information for %s"
 msgstr "Modificare detalii pentru %s"
 
-#: ../libpurple/account.c:1293 ../libpurple/protocols/toc/toc.c:1670
+#: ../libpurple/account.c:1424 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "Detalii utilizator"
 
-#: ../libpurple/account.c:1764 ../libpurple/protocols/gg/gg.c:1017
+#: ../libpurple/account.c:1895 ../libpurple/protocols/gg/gg.c:1019
 #: ../libpurple/protocols/jabber/buddy.c:782
-#: ../libpurple/protocols/jabber/buddy.c:2027
-#: ../libpurple/protocols/jabber/buddy.c:2044
-#: ../libpurple/protocols/novell/novell.c:2831
-#: ../libpurple/protocols/qq/qq.c:232 ../pidgin/gtkft.c:160
+#: ../libpurple/protocols/jabber/buddy.c:2030
+#: ../libpurple/protocols/jabber/buddy.c:2047
+#: ../libpurple/protocols/novell/novell.c:2848
+#: ../libpurple/protocols/qq/qq.c:233 ../pidgin/gtkft.c:160
 msgid "Unknown"
 msgstr "Necunoscut"
 
-#: ../libpurple/blist.c:521 ../libpurple/blist.c:1320
-#: ../libpurple/blist.c:1552 ../libpurple/protocols/jabber/roster.c:69
-#: ../libpurple/protocols/myspace/myspace.c:3244 ../pidgin/gtkblist.c:5373
+#: ../libpurple/blist.c:521 ../libpurple/blist.c:1321
+#: ../libpurple/blist.c:1531 ../libpurple/protocols/jabber/roster.c:69
+#: ../libpurple/protocols/myspace/myspace.c:3272 ../pidgin/gtkblist.c:6069
 #: ../pidgin/plugins/gevolution/gevo-util.c:67
 #: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
@@ -2030,136 +2084,146 @@
 msgid "buddy list"
 msgstr "listă de contacte"
 
-#: ../libpurple/certificate.c:545
+#: ../libpurple/certificate.c:558
 msgid "(DOES NOT MATCH)"
-msgstr ""
+msgstr "(NU SE POTRIVEŞTE)"
 
 #. Make messages
-#: ../libpurple/certificate.c:549
+#: ../libpurple/certificate.c:562
 #, c-format
 msgid "%s has presented the following certificate for just-this-once use:"
-msgstr ""
-
-#: ../libpurple/certificate.c:550
+msgstr "%s a prezentat următorul certificat pentru unică folosinţă:"
+
+#: ../libpurple/certificate.c:563
 #, c-format
 msgid ""
 "Common name: %s %s\n"
 "Fingerprint (SHA1): %s"
 msgstr ""
+"Nume comun: %s %s\n"
+"Amprentă SHA1: %s"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:555
+#: ../libpurple/certificate.c:568
 msgid "Single-use Certificate Verification"
-msgstr ""
+msgstr "Verificare certificat de unică folosinţă"
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:872
+#: ../libpurple/certificate.c:886
 msgid "Certificate Authorities"
-msgstr ""
+msgstr "Autorităţi de certificare"
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:1040
+#: ../libpurple/certificate.c:1054
 msgid "SSL Peers Cache"
-msgstr ""
+msgstr "Cache de certificate SSL"
 
 #. Make messages
-#: ../libpurple/certificate.c:1171
-#, fuzzy, c-format
+#: ../libpurple/certificate.c:1185
+#, c-format
 msgid "Accept certificate for %s?"
-msgstr "Acceptaţi invitaţia la chat?"
+msgstr "Acceptaţi certificatul pentru %s?"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1177
+#: ../libpurple/certificate.c:1191
 msgid "SSL Certificate Verification"
-msgstr ""
+msgstr "Verificare certificat SSL"
 
 #. Number of actions
-#: ../libpurple/certificate.c:1186
-#, fuzzy
+#: ../libpurple/certificate.c:1201
 msgid "Accept"
-msgstr "_Acceptă"
-
-#: ../libpurple/certificate.c:1187 ../libpurple/protocols/qq/buddy_opt.c:214
+msgstr "Acceptare"
+
+#: ../libpurple/certificate.c:1202 ../libpurple/protocols/qq/buddy_opt.c:214
 #: ../libpurple/protocols/qq/group_im.c:144
 #: ../libpurple/protocols/qq/group_opt.c:127
 #: ../libpurple/protocols/qq/sys_msg.c:90
 #: ../libpurple/protocols/qq/sys_msg.c:246
 msgid "Reject"
-msgstr "Respinge"
-
-#: ../libpurple/certificate.c:1188
+msgstr "Respingere"
+
+#: ../libpurple/certificate.c:1203
 msgid "_View Certificate..."
-msgstr ""
+msgstr "_Vizualizare certificat..."
 
 #. Prompt the user to authenticate the certificate
 #. TODO: Provide the user with more guidance about why he is
 #. being prompted
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1288
+#: ../libpurple/certificate.c:1303
 #, c-format
 msgid ""
 "The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
 "could mean that you are not connecting to the service you believe you are."
 msgstr ""
+"Certificatul prezentat de „%s” pretinde însă că e de la „%s”. Aceast ar "
+"putea însemna că nu vă conectaţi la serviciul la care credeţi că vă "
+"conectaţi."
 
 #. Prompt the user to authenticate the certificate
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1313
+#: ../libpurple/certificate.c:1328
 #, c-format
 msgid ""
 "The certificate presented by \"%s\" is self-signed. It cannot be "
 "automatically checked."
 msgstr ""
-
-#: ../libpurple/certificate.c:1331
+"Certificatul prezentat de „%s” este semnat în nume propriu. Nu poate fi "
+"verificat automat."
+
+#: ../libpurple/certificate.c:1346
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
-msgstr ""
+msgstr "Lanţul de certificare prezentat de %s nu este valid."
 
 #. TODO: Make this error either block the ensuing SSL
 #. connection error until the user dismisses this one, or
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
-#: ../libpurple/certificate.c:1339 ../libpurple/certificate.c:1416
-#, fuzzy
+#: ../libpurple/certificate.c:1354 ../libpurple/certificate.c:1423
 msgid "SSL Certificate Error"
-msgstr "Eroare la scriere"
-
-#: ../libpurple/certificate.c:1340
-#, fuzzy
+msgstr "Eroare în certificatul SSL"
+
+#: ../libpurple/certificate.c:1355
 msgid "Invalid certificate chain"
-msgstr "Titlu invalid"
+msgstr "Lanţ de certificare invalid"
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1360
+#: ../libpurple/certificate.c:1375
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
 "validated."
 msgstr ""
+"Nu aveţi o bază de date de certificate root, deci acest certificat nu poate "
+"fi validat."
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1382
+#: ../libpurple/certificate.c:1398
 msgid ""
 "The root certificate this one claims to be issued by is unknown to Pidgin."
 msgstr ""
-
-#: ../libpurple/certificate.c:1408
+"Acest certificat pretinde că a fost creat cu un certificat root necunoscut "
+"pentru Pidgin."
+
+#: ../libpurple/certificate.c:1415
 #, c-format
 msgid ""
 "The certificate chain presented by %s does not have a valid digital "
 "signature from the Certificate Authority from which it claims to have a "
 "signature."
 msgstr ""
-
-#: ../libpurple/certificate.c:1417
+"Lanţul de certificare prezentat de %s nu are o semnătură digitală validă de "
+"la autoritatea de certificare cu care pretinde că a fost creat."
+
+#: ../libpurple/certificate.c:1424
 msgid "Invalid certificate authority signature"
-msgstr ""
+msgstr "Semnătura invalidă de la autoritatea de certificare"
 
 #. Make messages
-#: ../libpurple/certificate.c:1881
+#: ../libpurple/certificate.c:1888
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -2169,21 +2233,25 @@
 "Activation date: %s\n"
 "Expiration date: %s\n"
 msgstr ""
+"Nume comun: %s\n"
+"\n"
+"Amprentă SHA1: %s\n"
+"\n"
+"Dată de activare: %s\n"
+"Dată de expirare: %s\n"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1890
-#, fuzzy
+#: ../libpurple/certificate.c:1897
 msgid "Certificate Information"
-msgstr "Informaţii server"
+msgstr "Detalii certificat"
 
 #: ../libpurple/connection.c:107
 msgid "Registration Error"
 msgstr "Eroare la înregistrare"
 
 #: ../libpurple/connection.c:180
-#, fuzzy
 msgid "Unregistration Error"
-msgstr "Eroare la înregistrare"
+msgstr "Eroare la ştergerea înregistrării"
 
 #: ../libpurple/connection.c:350
 #, c-format
@@ -2195,10 +2263,12 @@
 msgid "+++ %s signed off"
 msgstr "+++ %s s-a deconectat"
 
-#: ../libpurple/connection.c:497 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:2337
+#: ../libpurple/connection.c:525 ../libpurple/plugin.c:277
+#: ../libpurple/protocols/jabber/buddy.c:2350
 #: ../libpurple/protocols/msn/servconn.c:141
-#: ../libpurple/protocols/msn/session.c:322
+#: ../libpurple/protocols/msn/session.c:377
+#: ../libpurple/protocols/msnp9/servconn.c:139
+#: ../libpurple/protocols/msnp9/session.c:330
 msgid "Unknown error"
 msgstr "Eroare necunoscută"
 
@@ -2215,8 +2285,8 @@
 msgid "The message is too large."
 msgstr "Mesaj în absenţă prea mare."
 
-#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:255
-#: ../libpurple/protocols/bonjour/jabber.c:298
+#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:267
+#: ../libpurple/protocols/bonjour/jabber.c:310
 msgid "Unable to send message."
 msgstr "Nu se poate trimite mesajul."
 
@@ -2273,7 +2343,7 @@
 msgid "Failed to get serv name: %s"
 msgstr "Nu s-a putut obţine un nume „serv”: %s"
 
-#: ../libpurple/dbus-server.h:85
+#: ../libpurple/dbus-server.h:84
 msgid "Purple's D-BUS server is not running for the reason listed below"
 msgstr "Serverul D-BUS Purple nu este pornit din următoarele motive:"
 
@@ -2289,7 +2359,7 @@
 msgid "Unable to send request to resolver process\n"
 msgstr "Nu s-a putut trimite cererea către procesul „resolver”\n"
 
-#: ../libpurple/dnsquery.c:549 ../libpurple/dnsquery.c:697
+#: ../libpurple/dnsquery.c:549 ../libpurple/dnsquery.c:698
 #, c-format
 msgid ""
 "Error resolving %s:\n"
@@ -2298,8 +2368,8 @@
 "Eroare la rezolvarea %s:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:552 ../libpurple/dnsquery.c:711
-#: ../libpurple/dnsquery.c:831
+#: ../libpurple/dnsquery.c:552 ../libpurple/dnsquery.c:712
+#: ../libpurple/dnsquery.c:830
 #, c-format
 msgid "Error resolving %s: %d"
 msgstr "Eroare la rezolvarea %s: %d"
@@ -2314,16 +2384,15 @@
 "%s"
 
 #: ../libpurple/dnsquery.c:578
-#, c-format
 msgid "EOF while reading from resolver process"
 msgstr "EOF la citirea de la procesul „resolver”"
 
-#: ../libpurple/dnsquery.c:761
+#: ../libpurple/dnsquery.c:762
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "Eroare la crearea firului de execuţie: %s"
 
-#: ../libpurple/dnsquery.c:762
+#: ../libpurple/dnsquery.c:763
 msgid "Unknown reason"
 msgstr "Motiv necunoscut"
 
@@ -2423,7 +2492,6 @@
 msgstr "Transferul fişierului %s s-a terminat"
 
 #: ../libpurple/ft.c:685
-#, c-format
 msgid "File transfer complete"
 msgstr "Transferul fişierelor s-a terminat"
 
@@ -2433,7 +2501,6 @@
 msgstr "Aţi întrerupt transferul fişierului %s"
 
 #: ../libpurple/ft.c:1108
-#, c-format
 msgid "File transfer cancelled"
 msgstr "Transferul fişierului a fost întrerupt"
 
@@ -2695,31 +2762,30 @@
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <Răspuns-Automat>: %s\n"
 
-#: ../libpurple/plugin.c:365
+#: ../libpurple/plugin.c:360
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Utilizaţi %s, dar acest modul necesită %s."
 
-#: ../libpurple/plugin.c:380
-#, c-format
+#: ../libpurple/plugin.c:375
 msgid "This plugin has not defined an ID."
 msgstr "Acest modul nu are un ID definit."
 
-#: ../libpurple/plugin.c:448
+#: ../libpurple/plugin.c:443
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
 msgstr "Nepotrivire număr magic modul: %d (necesită %d)"
 
-#: ../libpurple/plugin.c:465
+#: ../libpurple/plugin.c:460
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr "Nepotrivire versiune ABI %d.%d.x (necesită %d.%d.x)"
 
-#: ../libpurple/plugin.c:482
+#: ../libpurple/plugin.c:477
 msgid "Plugin does not implement all required functions"
 msgstr "Modulul nu implementează toate funcţiile necesare"
 
-#: ../libpurple/plugin.c:547
+#: ../libpurple/plugin.c:542
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -2727,27 +2793,23 @@
 msgstr ""
 "Modulul %s cerut nu a fost găsit. Instalaţi acest modul şi încercaţi din nou."
 
-#: ../libpurple/plugin.c:552
+#: ../libpurple/plugin.c:547
 msgid "Unable to load the plugin"
 msgstr "Acest modul nu a putut fi încărcat."
 
-#: ../libpurple/plugin.c:574
+#: ../libpurple/plugin.c:569
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "Modulul cerut %s cerut nu a putut fi încărcat."
 
-#: ../libpurple/plugin.c:578
+#: ../libpurple/plugin.c:573
 msgid "Unable to load your plugin."
 msgstr "Acest modul nu a putut fi încărcat."
 
-#: ../libpurple/plugin.c:677
-#, c-format
-msgid "The dependent plugin %s failed to unload."
-msgstr "Încărcarea modulului necesar %s a eşuat."
-
-#: ../libpurple/plugin.c:681
-msgid "There were errors unloading the plugin."
-msgstr "Au apărut erori la dezactivarea modulului."
+#: ../libpurple/plugin.c:663
+#, c-format
+msgid "%s requires %s, but it failed to unload."
+msgstr "%s necesită %s, dar descărcărea sa a eşuat."
 
 #: ../libpurple/plugins/autoaccept.c:23
 msgid "Autoaccept"
@@ -2755,9 +2817,8 @@
 
 #: ../libpurple/plugins/autoaccept.c:25 ../libpurple/plugins/autoaccept.c:26
 msgid "Auto-accept file transfer requests from selected users."
-msgstr ""
-"Permite acceptarea automată a transferurilor de fişiere iniţiate de anumiţi "
-"utilizatori."
+msgstr "Permite acceptarea automată a transferurilor de fişiere iniţiate de "
+"anumiţi utilizatori."
 
 #: ../libpurple/plugins/autoaccept.c:80
 #, c-format
@@ -2772,7 +2833,7 @@
 #: ../libpurple/plugins/autoaccept.c:160
 #, c-format
 msgid "When a file-transfer request arrives from %s"
-msgstr "Când o cerere de transfer de fişiere ajunge de la %s"
+msgstr "Când %s trimite o cerere de transfer de fişiere"
 
 #: ../libpurple/plugins/autoaccept.c:162
 msgid "Set Autoaccept Setting"
@@ -2784,14 +2845,15 @@
 
 #: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
 #: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
-#: ../libpurple/protocols/oscar/oscar.c:1453
-#: ../libpurple/protocols/oscar/oscar.c:2233
-#: ../libpurple/protocols/oscar/oscar.c:2282
-#: ../libpurple/protocols/oscar/oscar.c:5886
-#: ../libpurple/protocols/oscar/oscar.c:5941
-#: ../libpurple/protocols/oscar/oscar.c:6167
-#: ../libpurple/protocols/oscar/oscar.c:6237 ../libpurple/request.h:1388
-#: ../libpurple/request.h:1398
+#: ../libpurple/protocols/oscar/oscar.c:1451
+#: ../libpurple/protocols/oscar/oscar.c:2243
+#: ../libpurple/protocols/oscar/oscar.c:2292
+#: ../libpurple/protocols/oscar/oscar.c:5936
+#: ../libpurple/protocols/oscar/oscar.c:5991
+#: ../libpurple/protocols/oscar/oscar.c:6217
+#: ../libpurple/protocols/oscar/oscar.c:6287 ../libpurple/request.h:1828
+#: ../libpurple/request.h:1841 ../libpurple/request.h:1854
+#: ../libpurple/request.h:1867 ../pidgin/gtkblist.c:546
 msgid "_Cancel"
 msgstr "_Renunţă"
 
@@ -2801,7 +2863,7 @@
 
 #: ../libpurple/plugins/autoaccept.c:169
 msgid "Auto Accept"
-msgstr "_Acceptă automat"
+msgstr "Acceptă automat"
 
 #: ../libpurple/plugins/autoaccept.c:170
 msgid "Auto Reject"
@@ -2809,7 +2871,7 @@
 
 #: ../libpurple/plugins/autoaccept.c:185
 msgid "Autoaccept File Transfers..."
-msgstr "Acceptă automat transferurile de fişiere..."
+msgstr "Acceptare fişiere..."
 
 #. XXX: Is there a better way than this? There really should be.
 #: ../libpurple/plugins/autoaccept.c:215
@@ -2833,8 +2895,10 @@
 "Notifică printr-o fereastră popup când se finalizează un transfer de\n"
 "fişiere acceptat automat şi nu există o discuţie deschisă cu expeditorul"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1660
-#: ../libpurple/protocols/msn/msn.c:1690
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1808
+#: ../libpurple/protocols/msn/msn.c:1838
+#: ../libpurple/protocols/msnp9/msn.c:1661
+#: ../libpurple/protocols/msnp9/msn.c:1691
 msgid "Notes"
 msgstr "Notiţe"
 
@@ -3059,34 +3123,34 @@
 #. * offset is way off.  The user should never really see it, but
 #. * it's here just in case.  The parens are to make it clear it's
 #. * not a real timezone.
-#: ../libpurple/plugins/log_reader.c:493
+#: ../libpurple/plugins/log_reader.c:499
 msgid "(UTC)"
 msgstr "(UTC)"
 
-#: ../libpurple/plugins/log_reader.c:1577
+#: ../libpurple/plugins/log_reader.c:1554
 msgid "User is offline."
 msgstr "Utilizatorul este deconectat."
 
-#: ../libpurple/plugins/log_reader.c:1583
+#: ../libpurple/plugins/log_reader.c:1560
 msgid "Auto-response sent:"
 msgstr "Răspuns automat trimis:"
 
-#: ../libpurple/plugins/log_reader.c:1593
-#: ../libpurple/plugins/log_reader.c:1596
+#: ../libpurple/plugins/log_reader.c:1570
+#: ../libpurple/plugins/log_reader.c:1573
 #: ../libpurple/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s s-a deconectat."
 
-#: ../libpurple/plugins/log_reader.c:1610
+#: ../libpurple/plugins/log_reader.c:1587
 msgid "One or more messages may have been undeliverable."
 msgstr "Se poate să nu fi ajuns unul sau mai multe mesaje."
 
-#: ../libpurple/plugins/log_reader.c:1620
+#: ../libpurple/plugins/log_reader.c:1597
 msgid "You were disconnected from the server."
 msgstr "Aţi fost deconectat de la server."
 
-#: ../libpurple/plugins/log_reader.c:1628
+#: ../libpurple/plugins/log_reader.c:1605
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
@@ -3094,77 +3158,85 @@
 "Sunteţi momentan deconectat(ă). Nu veţi mai primi mesaje până la următoarea "
 "autentificare."
 
-#: ../libpurple/plugins/log_reader.c:1643
+#: ../libpurple/plugins/log_reader.c:1620
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr "Mesajul nu a putut fi trimis pentru că a depăşit mărimea maximă."
 
-#: ../libpurple/plugins/log_reader.c:1648
+#: ../libpurple/plugins/log_reader.c:1625
 msgid "Message could not be sent."
 msgstr "Mesajul nu a putut fi trimis."
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2349
-#: ../libpurple/plugins/log_reader.c:2472
+#: ../libpurple/plugins/log_reader.c:2699
+#: ../libpurple/plugins/log_reader.c:2835
 msgid "Adium"
 msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2362
-#: ../libpurple/plugins/log_reader.c:2477
+#: ../libpurple/plugins/log_reader.c:2712
+#: ../libpurple/plugins/log_reader.c:2840
 msgid "Fire"
 msgstr "Fire"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2374
-#: ../libpurple/plugins/log_reader.c:2481
+#: ../libpurple/plugins/log_reader.c:2724
+#: ../libpurple/plugins/log_reader.c:2844
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2388
-#: ../libpurple/plugins/log_reader.c:2486
+#: ../libpurple/plugins/log_reader.c:2738
+#: ../libpurple/plugins/log_reader.c:2849
 msgid "QIP"
 msgstr "QIP"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2400
-#: ../libpurple/plugins/log_reader.c:2490
+#: ../libpurple/plugins/log_reader.c:2750
+#: ../libpurple/plugins/log_reader.c:2853
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2412
-#: ../libpurple/plugins/log_reader.c:2494
+#: ../libpurple/plugins/log_reader.c:2762
+#: ../libpurple/plugins/log_reader.c:2857
 msgid "Trillian"
 msgstr "Trillian"
 
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libpurple/plugins/log_reader.c:2774
+#: ../libpurple/plugins/log_reader.c:2861
+msgid "aMSN"
+msgstr "aMSN"
+
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2454
+#: ../libpurple/plugins/log_reader.c:2817
 msgid "General Log Reading Configuration"
 msgstr "Configurare citire înregistrări generale"
 
-#: ../libpurple/plugins/log_reader.c:2458
+#: ../libpurple/plugins/log_reader.c:2821
 msgid "Fast size calculations"
 msgstr "Calcul rapid mărime"
 
-#: ../libpurple/plugins/log_reader.c:2462
+#: ../libpurple/plugins/log_reader.c:2825
 msgid "Use name heuristics"
 msgstr "Euristică pentru nume"
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2468
+#: ../libpurple/plugins/log_reader.c:2831
 msgid "Log Directory"
 msgstr "Director înregistrări"
 
@@ -3174,19 +3246,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2523
+#: ../libpurple/plugins/log_reader.c:2890
 msgid "Log Reader"
 msgstr "Citire înregistrări"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2527
+#: ../libpurple/plugins/log_reader.c:2894
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Importă înregistrările altor clienţi IM în Gaim."
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2531
+#: ../libpurple/plugins/log_reader.c:2898
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -3273,26 +3345,32 @@
 "Puteţi edita ori şterge întâmpinarea din fereastra „Întâmpinări contacte"
 
 #: ../libpurple/plugins/offlinemsg.c:165
-#: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
-#: ../libpurple/protocols/novell/novell.c:1917
+#: ../libpurple/protocols/msn/dialog.c:141
+#: ../libpurple/protocols/msn/msn.c:665
+#: ../libpurple/protocols/msnp9/dialog.c:133
+#: ../libpurple/protocols/msnp9/msn.c:550
+#: ../libpurple/protocols/msnp9/msn.c:564
+#: ../libpurple/protocols/novell/novell.c:1928
 #: ../libpurple/protocols/silc/buddy.c:317
-#: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
+#: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:308
 #: ../libpurple/protocols/silc10/buddy.c:314
 #: ../libpurple/protocols/silc10/pk.c:119
-#: ../libpurple/protocols/silc10/wb.c:304 ../pidgin/gtkrequest.c:268
+#: ../libpurple/protocols/silc10/wb.c:307 ../pidgin/gtkrequest.c:318
 msgid "Yes"
 msgstr "Da"
 
 #: ../libpurple/plugins/offlinemsg.c:166
-#: ../libpurple/protocols/msn/dialog.c:134
-#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
-#: ../libpurple/protocols/novell/novell.c:1918
+#: ../libpurple/protocols/msn/dialog.c:142
+#: ../libpurple/protocols/msn/msn.c:665
+#: ../libpurple/protocols/msnp9/dialog.c:134
+#: ../libpurple/protocols/msnp9/msn.c:550
+#: ../libpurple/protocols/msnp9/msn.c:564
+#: ../libpurple/protocols/novell/novell.c:1929
 #: ../libpurple/protocols/silc/buddy.c:318
-#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
+#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:309
 #: ../libpurple/protocols/silc10/buddy.c:315
 #: ../libpurple/protocols/silc10/pk.c:120
-#: ../libpurple/protocols/silc10/wb.c:305 ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/silc10/wb.c:308 ../pidgin/gtkrequest.c:319
 msgid "No"
 msgstr "Nu"
 
@@ -3363,7 +3441,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/signals-test.c:711
+#: ../libpurple/plugins/signals-test.c:753
 msgid "Signals Test"
 msgstr "Test semnale"
 
@@ -3371,8 +3449,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/signals-test.c:714
-#: ../libpurple/plugins/signals-test.c:716
+#: ../libpurple/plugins/signals-test.c:756
+#: ../libpurple/plugins/signals-test.c:758
 msgid "Test to see that all signals are working properly."
 msgstr "Testează toate semnalele pentru a verifica funcţionarea corectă."
 
@@ -3395,10 +3473,10 @@
 msgstr "Testează dacă lucrurile merg cum trebuie."
 
 #. Scheme name
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:902
-#: ../libpurple/plugins/ssl/ssl-nss.c:725
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:911
+#: ../libpurple/plugins/ssl/ssl-nss.c:731
 msgid "X.509 Certificates"
-msgstr ""
+msgstr "Certificate X.509"
 
 #. *< type
 #. *< ui_requirement
@@ -3406,7 +3484,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:986
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:995
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -3414,8 +3492,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:989
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:991
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:998
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:1000
 msgid "Provides SSL support through GNUTLS."
 msgstr "Oferă suport SSL prin bibliotecile GNUTLS."
 
@@ -3425,7 +3503,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:810
+#: ../libpurple/plugins/ssl/ssl-nss.c:816
 msgid "NSS"
 msgstr "NSS"
 
@@ -3433,8 +3511,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:813
-#: ../libpurple/plugins/ssl/ssl-nss.c:815
+#: ../libpurple/plugins/ssl/ssl-nss.c:819
+#: ../libpurple/plugins/ssl/ssl-nss.c:821
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Oferă suport SSL prin bibliotecile Mozilla NSS."
 
@@ -3519,15 +3597,15 @@
 msgstr ""
 "Notifică în fereastra de discuţii la schimbarea statusului unui contact."
 
-#: ../libpurple/plugins/tcl/tcl.c:421
+#: ../libpurple/plugins/tcl/tcl.c:423
 msgid "Tcl Plugin Loader"
 msgstr "Încărcare module Tcl"
 
-#: ../libpurple/plugins/tcl/tcl.c:423 ../libpurple/plugins/tcl/tcl.c:424
+#: ../libpurple/plugins/tcl/tcl.c:425 ../libpurple/plugins/tcl/tcl.c:426
 msgid "Provides support for loading Tcl plugins"
 msgstr "Permite încărcarea de module Tcl."
 
-#: ../libpurple/plugins/tcl/tcl.c:507
+#: ../libpurple/plugins/tcl/tcl.c:509
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
@@ -3535,51 +3613,57 @@
 "Nu s-a detectat o instalare ActiveTCL. Dacă doriţi să utilizaţi module TCL, "
 "instalaţi ActiveTCL de la http://www.activestate.com\n"
 
-#. Send a message about the connection error
-#: ../libpurple/protocols/bonjour/bonjour.c:112
+#: ../libpurple/protocols/bonjour/bonjour.c:108
+msgid ""
+"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://"
+"developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-"
+"LocalMessaging for more information."
+msgstr ""
+
+#: ../libpurple/protocols/bonjour/bonjour.c:127
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "Ascultarea interfaţei de reţea pentru noi conexiuni IM a eşuat\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:137
+#: ../libpurple/protocols/bonjour/bonjour.c:154
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr "Nu se poate deschide o conexiune cu serverul local mDNS. E pornit?"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:351
-#: ../libpurple/protocols/bonjour/bonjour.c:656
-#: ../libpurple/protocols/gg/gg.c:632
-#: ../libpurple/protocols/jabber/jabber.c:942
+#: ../libpurple/protocols/bonjour/bonjour.c:370
+#: ../libpurple/protocols/bonjour/bonjour.c:675
+#: ../libpurple/protocols/gg/gg.c:633
+#: ../libpurple/protocols/jabber/jabber.c:969
 msgid "First name"
 msgstr "Prenume"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:353
-#: ../libpurple/protocols/bonjour/bonjour.c:659
-#: ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/jabber/jabber.c:947
+#: ../libpurple/protocols/bonjour/bonjour.c:372
+#: ../libpurple/protocols/bonjour/bonjour.c:678
+#: ../libpurple/protocols/gg/gg.c:628
+#: ../libpurple/protocols/jabber/jabber.c:974
 msgid "Last name"
 msgstr "Nume de familie"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:357
+#: ../libpurple/protocols/bonjour/bonjour.c:376
 #: ../libpurple/protocols/jabber/buddy.c:295
 #: ../libpurple/protocols/jabber/buddy.c:1325
 #: ../libpurple/protocols/jabber/buddy.c:1335
-#: ../libpurple/protocols/jabber/buddy.c:2216
+#: ../libpurple/protocols/jabber/buddy.c:2219
 #: ../libpurple/protocols/silc/ops.c:1041
-#: ../libpurple/protocols/silc/util.c:555
+#: ../libpurple/protocols/silc/util.c:561
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
 msgid "E-Mail"
 msgstr "Mail"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:360
-#: ../libpurple/protocols/bonjour/bonjour.c:665
+#: ../libpurple/protocols/bonjour/bonjour.c:379
+#: ../libpurple/protocols/bonjour/bonjour.c:684
 msgid "AIM Account"
 msgstr "Cont AIM"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:363
-#: ../libpurple/protocols/bonjour/bonjour.c:668
+#: ../libpurple/protocols/bonjour/bonjour.c:382
+#: ../libpurple/protocols/bonjour/bonjour.c:687
 msgid "XMPP Account"
 msgstr "Cont XMPP"
 
@@ -3593,20 +3677,20 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:467
-#: ../libpurple/protocols/bonjour/bonjour.c:469
+#: ../libpurple/protocols/bonjour/bonjour.c:486
+#: ../libpurple/protocols/bonjour/bonjour.c:488
 msgid "Bonjour Protocol Plugin"
 msgstr "Modul de protocol Bonjour"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:610
+#: ../libpurple/protocols/bonjour/bonjour.c:629
 msgid "Purple Person"
 msgstr "Persoană Purple"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:662
-#: ../libpurple/protocols/gg/gg.c:477
-#: ../libpurple/protocols/jabber/jabber.c:932
-#: ../libpurple/protocols/silc/silc.c:770
-#: ../libpurple/protocols/silc/silc.c:1011
+#: ../libpurple/protocols/bonjour/bonjour.c:681
+#: ../libpurple/protocols/gg/gg.c:478
+#: ../libpurple/protocols/jabber/jabber.c:959
+#: ../libpurple/protocols/silc/silc.c:913
+#: ../libpurple/protocols/silc/silc.c:1154
 #: ../libpurple/protocols/silc10/silc.c:681
 #: ../libpurple/protocols/silc10/silc.c:922
 msgid "E-mail"
@@ -3616,38 +3700,38 @@
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:380
+#: ../libpurple/protocols/bonjour/jabber.c:395
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s a încheiat discuţia."
 
-#: ../libpurple/protocols/bonjour/jabber.c:437
-#: ../libpurple/protocols/bonjour/jabber.c:660
-#: ../libpurple/protocols/bonjour/jabber.c:678
+#: ../libpurple/protocols/bonjour/jabber.c:453
+#: ../libpurple/protocols/bonjour/jabber.c:686
+#: ../libpurple/protocols/bonjour/jabber.c:704
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Nu s-a putut trimite mesajul, discuţia nu a putut fi iniţiată."
 
-#: ../libpurple/protocols/bonjour/jabber.c:583
+#: ../libpurple/protocols/bonjour/jabber.c:603
 msgid "Cannot open socket"
 msgstr "Nu s-a putut deschide un socket"
 
-#: ../libpurple/protocols/bonjour/jabber.c:591
+#: ../libpurple/protocols/bonjour/jabber.c:613
 msgid "Error setting socket options"
 msgstr "Eroare la setarea opţiunilor socket-ului"
 
-#: ../libpurple/protocols/bonjour/jabber.c:615
+#: ../libpurple/protocols/bonjour/jabber.c:639
 msgid "Could not bind socket to port"
 msgstr "Nu se poate face bind pentru socket pe port"
 
-#: ../libpurple/protocols/bonjour/jabber.c:623
+#: ../libpurple/protocols/bonjour/jabber.c:649
 msgid "Could not listen on socket"
 msgstr "Nu se poate asculta pe socket"
 
-#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1829
+#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1845
 msgid "Invalid proxy settings"
 msgstr "Setări proxy invalide"
 
-#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1829
+#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1845
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -3664,39 +3748,41 @@
 msgid "Unable to fetch the token.\n"
 msgstr "Nu se poate obţine o verificare.\n"
 
-#: ../libpurple/protocols/gg/gg.c:269 ../libpurple/protocols/gg/gg.c:288
+#: ../libpurple/protocols/gg/gg.c:267 ../libpurple/protocols/gg/gg.c:274
+#: ../libpurple/protocols/gg/gg.c:280
 msgid "Save Buddylist..."
 msgstr "Salvează lista de contacte..."
 
-#: ../libpurple/protocols/gg/gg.c:270
+#: ../libpurple/protocols/gg/gg.c:268
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr "Lista de contacte e goală, nu s-a scris nimic în fişier."
 
-#: ../libpurple/protocols/gg/gg.c:276 ../libpurple/protocols/gg/gg.c:278
-msgid "Couldn't open file"
-msgstr "Nu s-a putut deschide fişierul"
-
-#: ../libpurple/protocols/gg/gg.c:289
+#: ../libpurple/protocols/gg/gg.c:275
 msgid "Buddylist saved successfully!"
 msgstr "Lista contactelor a fost salvată cu succes!"
 
-#: ../libpurple/protocols/gg/gg.c:307 ../libpurple/protocols/gg/gg.c:308
+#: ../libpurple/protocols/gg/gg.c:278
+#, c-format
+msgid "Couldn't write buddy list for %s to %s"
+msgstr "Nu s-a putut scrie lista de contacte pentru %s în %s"
+
+#: ../libpurple/protocols/gg/gg.c:303 ../libpurple/protocols/gg/gg.c:304
 msgid "Couldn't load buddylist"
 msgstr "Nu s-a putut încărca lista de contacte"
 
-#: ../libpurple/protocols/gg/gg.c:324
+#: ../libpurple/protocols/gg/gg.c:320
 msgid "Load Buddylist..."
 msgstr "Încarcă lista de contacte..."
 
-#: ../libpurple/protocols/gg/gg.c:325
+#: ../libpurple/protocols/gg/gg.c:321
 msgid "Buddylist loaded successfully!"
 msgstr "Lista de contacte a fost încărcată cu succes!"
 
-#: ../libpurple/protocols/gg/gg.c:336
+#: ../libpurple/protocols/gg/gg.c:332
 msgid "Save buddylist..."
 msgstr "Salvează lista de contacte..."
 
-#: ../libpurple/protocols/gg/gg.c:384
+#: ../libpurple/protocols/gg/gg.c:382
 msgid "Fill in the registration fields."
 msgstr "Completaţi câmpurile de înregistrare."
 
@@ -3704,305 +3790,310 @@
 msgid "Passwords do not match."
 msgstr "Parolele nu se potrivesc."
 
-#: ../libpurple/protocols/gg/gg.c:398
+#: ../libpurple/protocols/gg/gg.c:399
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "Noul cont nu poate fi înregistrat. A intervenit o eroare.\n"
 
-#: ../libpurple/protocols/gg/gg.c:411
-msgid "New Gadu-Gadu Account Registered"
-msgstr "Noul cont Gadu-Gadu a fost înregistrat"
-
 #: ../libpurple/protocols/gg/gg.c:412
+msgid "New Gadu-Gadu Account Registered"
+msgstr "Noul cont Gadu-Gadu a fost înregistrat"
+
+#: ../libpurple/protocols/gg/gg.c:413
 msgid "Registration completed successfully!"
 msgstr "Înregistrare terminată cu succes!"
 
-#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
-#: ../libpurple/protocols/jabber/jabber.c:913
-#: ../libpurple/protocols/jabber/jabber.c:916
-#: ../libpurple/protocols/jabber/jabber.c:1722
+#: ../libpurple/protocols/gg/gg.c:483 ../libpurple/protocols/gg/gg.c:776
+#: ../libpurple/protocols/jabber/jabber.c:940
+#: ../libpurple/protocols/jabber/jabber.c:943
+#: ../libpurple/protocols/jabber/jabber.c:1731
 msgid "Password"
 msgstr "Parolă"
 
-#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
+#: ../libpurple/protocols/gg/gg.c:488 ../libpurple/protocols/gg/gg.c:781
 msgid "Password (retype)"
 msgstr "Confirmare parolă"
 
-#: ../libpurple/protocols/gg/gg.c:492 ../libpurple/protocols/gg/gg.c:785
+#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:786
 msgid "Enter current token"
 msgstr "Introduceţi verificarea curentă"
 
-#: ../libpurple/protocols/gg/gg.c:498 ../libpurple/protocols/gg/gg.c:791
+#: ../libpurple/protocols/gg/gg.c:499 ../libpurple/protocols/gg/gg.c:792
 msgid "Current token"
 msgstr "Verificare curentă"
 
-#: ../libpurple/protocols/gg/gg.c:502 ../libpurple/protocols/gg/gg.c:503
+#: ../libpurple/protocols/gg/gg.c:503 ../libpurple/protocols/gg/gg.c:504
 msgid "Register New Gadu-Gadu Account"
 msgstr "Înregistrare cont nou Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:504
+#: ../libpurple/protocols/gg/gg.c:505
 msgid "Please, fill in the following fields"
 msgstr "Completaţi următoarele câmpuri:"
 
-#: ../libpurple/protocols/gg/gg.c:642 ../libpurple/protocols/gg/gg.c:1054
-#: ../libpurple/protocols/gg/gg.c:1126
-#: ../libpurple/protocols/jabber/jabber.c:957
-#: ../libpurple/protocols/oscar/oscar.c:3789
-#: ../libpurple/protocols/oscar/oscar.c:3802
+#: ../libpurple/protocols/gg/gg.c:643 ../libpurple/protocols/gg/gg.c:1056
+#: ../libpurple/protocols/gg/gg.c:1128
+#: ../libpurple/protocols/jabber/jabber.c:984
+#: ../libpurple/protocols/oscar/oscar.c:3799
+#: ../libpurple/protocols/oscar/oscar.c:3812
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Oraş"
 
-#: ../libpurple/protocols/gg/gg.c:647
+#: ../libpurple/protocols/gg/gg.c:648
 msgid "Year of birth"
 msgstr "An naştere"
 
-#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1589
-#: ../libpurple/protocols/myspace/user.c:115
-#: ../libpurple/protocols/oscar/oscar.c:3732
+#: ../libpurple/protocols/gg/gg.c:651 ../libpurple/protocols/msn/msn.c:1737
+#: ../libpurple/protocols/msnp9/msn.c:1590
+#: ../libpurple/protocols/myspace/user.c:119
+#: ../libpurple/protocols/oscar/oscar.c:3742
 #: ../libpurple/protocols/qq/buddy_info.c:46
-#: ../libpurple/protocols/qq/qq.c:226 ../libpurple/protocols/qq/qq.c:229
-#: ../libpurple/protocols/qq/qq.c:232 ../libpurple/protocols/qq/qq.c:236
+#: ../libpurple/protocols/qq/qq.c:227 ../libpurple/protocols/qq/qq.c:230
+#: ../libpurple/protocols/qq/qq.c:233 ../libpurple/protocols/qq/qq.c:237
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1091
 msgid "Gender"
 msgstr "Sex"
 
-#: ../libpurple/protocols/gg/gg.c:651
+#: ../libpurple/protocols/gg/gg.c:652
 msgid "Male or female"
 msgstr "Masculin sau feminin"
 
-#: ../libpurple/protocols/gg/gg.c:652
-#: ../libpurple/protocols/oscar/oscar.c:3732
-#: ../libpurple/protocols/qq/buddy_info.c:83
-#: ../libpurple/protocols/qq/qq.c:226
-msgid "Male"
-msgstr "Masculin"
-
 #: ../libpurple/protocols/gg/gg.c:653
-#: ../libpurple/protocols/oscar/oscar.c:3732
+#: ../libpurple/protocols/oscar/oscar.c:3742
+#: ../libpurple/protocols/qq/buddy_info.c:83
+#: ../libpurple/protocols/qq/qq.c:227
+msgid "Male"
+msgstr "Masculin"
+
+#: ../libpurple/protocols/gg/gg.c:654
+#: ../libpurple/protocols/oscar/oscar.c:3742
 #: ../libpurple/protocols/qq/buddy_info.c:84
-#: ../libpurple/protocols/qq/qq.c:229
+#: ../libpurple/protocols/qq/qq.c:230
 msgid "Female"
 msgstr "Feminin"
 
-#: ../libpurple/protocols/gg/gg.c:657
+#: ../libpurple/protocols/gg/gg.c:658
 msgid "Only online"
 msgstr "Doar conectate"
 
-#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:662
+#: ../libpurple/protocols/gg/gg.c:662 ../libpurple/protocols/gg/gg.c:663
 msgid "Find buddies"
 msgstr "Căutare contacte"
 
-#: ../libpurple/protocols/gg/gg.c:663
+#: ../libpurple/protocols/gg/gg.c:664
 msgid "Please, enter your search criteria below"
 msgstr "Introduceţi mai jos termenii căutării"
 
-#: ../libpurple/protocols/gg/gg.c:701
+#: ../libpurple/protocols/gg/gg.c:702
 msgid "Fill in the fields."
 msgstr "Completaţi câmpurile."
 
-#: ../libpurple/protocols/gg/gg.c:713
+#: ../libpurple/protocols/gg/gg.c:714
 msgid "Your current password is different from the one that you specified."
 msgstr "Parola curentă este diferită de cea specificată."
 
-#: ../libpurple/protocols/gg/gg.c:727
+#: ../libpurple/protocols/gg/gg.c:728
 msgid "Unable to change password. Error occurred.\n"
 msgstr "Nu s-a putut schimba parola. A intervenit o eroare.\n"
 
-#: ../libpurple/protocols/gg/gg.c:736
-msgid "Change password for the Gadu-Gadu account"
-msgstr "Schimbare parolă cont Gadu-Gadu"
-
 #: ../libpurple/protocols/gg/gg.c:737
+msgid "Change password for the Gadu-Gadu account"
+msgstr "Schimbare parolă cont Gadu-Gadu"
+
+#: ../libpurple/protocols/gg/gg.c:738
 msgid "Password was changed successfully!"
 msgstr "Parola a fost schimbată cu succes!"
 
-#: ../libpurple/protocols/gg/gg.c:770
+#: ../libpurple/protocols/gg/gg.c:771
 msgid "Current password"
 msgstr "Parolă curentă"
 
-#: ../libpurple/protocols/gg/gg.c:795
+#: ../libpurple/protocols/gg/gg.c:796
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Introduceţi parola curentă şi pe cea nouă pentru UIN-ul: "
 
-#: ../libpurple/protocols/gg/gg.c:799 ../libpurple/protocols/gg/gg.c:800
+#: ../libpurple/protocols/gg/gg.c:800 ../libpurple/protocols/gg/gg.c:801
 msgid "Change Gadu-Gadu Password"
 msgstr "Schimbare parolă Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:876
+#: ../libpurple/protocols/gg/gg.c:878
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "Selectaţi un chat pentru contactul: %s"
 
-#: ../libpurple/protocols/gg/gg.c:879 ../libpurple/protocols/gg/gg.c:880
+#: ../libpurple/protocols/gg/gg.c:881 ../libpurple/protocols/gg/gg.c:882
 msgid "Add to chat..."
 msgstr "Adăugare în chat..."
 
-#: ../libpurple/protocols/gg/gg.c:1008
-#: ../libpurple/protocols/jabber/buddy.c:2031
-#: ../libpurple/protocols/novell/novell.c:2828
+#: ../libpurple/protocols/gg/gg.c:1010
+#: ../libpurple/protocols/jabber/buddy.c:2034
+#: ../libpurple/protocols/novell/novell.c:2845
 #: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:5604
-#: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
-#: ../libpurple/protocols/qq/qq.c:292
-#: ../libpurple/protocols/yahoo/yahoo.c:3099 ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:3104 ../pidgin/gtkblist.c:3436
-#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1061
+#: ../libpurple/protocols/oscar/oscar.c:5654
+#: ../libpurple/protocols/qq/qq.c:171 ../libpurple/protocols/qq/qq.c:178
+#: ../libpurple/protocols/qq/qq.c:293
+#: ../libpurple/protocols/yahoo/yahoo.c:3110 ../libpurple/status.c:154
+#: ../pidgin/gtkblist.c:3338 ../pidgin/gtkblist.c:3676
+#: ../pidgin/gtkdocklet.c:561 ../pidgin/gtkstatusbox.c:1061
 msgid "Offline"
 msgstr "Deconectat(ă)"
 
-#: ../libpurple/protocols/gg/gg.c:1011
-#: ../libpurple/protocols/jabber/buddy.c:2033
+#: ../libpurple/protocols/gg/gg.c:1013
+#: ../libpurple/protocols/jabber/buddy.c:2036
 #: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
 #: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
-#: ../libpurple/protocols/novell/novell.c:2816
-#: ../libpurple/protocols/qq/qq.c:280
-#: ../libpurple/protocols/yahoo/yahoo.c:3101 ../libpurple/status.c:155
-#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1057
+#: ../libpurple/protocols/msnp9/state.c:29
+#: ../libpurple/protocols/msnp9/state.c:30
+#: ../libpurple/protocols/msnp9/state.c:37
+#: ../libpurple/protocols/msnp9/state.c:38
+#: ../libpurple/protocols/novell/novell.c:2833
+#: ../libpurple/protocols/qq/qq.c:281
+#: ../libpurple/protocols/yahoo/yahoo.c:3112 ../libpurple/status.c:155
+#: ../pidgin/gtkdocklet.c:545 ../pidgin/gtkstatusbox.c:1057
 msgid "Available"
 msgstr "Disponibil(ă)"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#: ../libpurple/protocols/gg/gg.c:1014 ../libpurple/protocols/irc/irc.c:528
+#: ../libpurple/protocols/gg/gg.c:1016 ../libpurple/protocols/irc/irc.c:537
 #: ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/buddy.c:2037
-#: ../libpurple/protocols/novell/novell.c:2819
+#: ../libpurple/protocols/jabber/buddy.c:2040
+#: ../libpurple/protocols/novell/novell.c:2836
 #: ../libpurple/protocols/oscar/oscar.c:733
-#: ../libpurple/protocols/oscar/oscar.c:4547
-#: ../libpurple/protocols/oscar/oscar.c:5632
-#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/qq/qq.c:284
-#: ../libpurple/protocols/silc/buddy.c:1476
-#: ../libpurple/protocols/silc10/buddy.c:1476
-#: ../libpurple/protocols/yahoo/yahoo.c:3653
-#: ../libpurple/protocols/yahoo/yahoo.c:3727 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1939
+#: ../libpurple/protocols/oscar/oscar.c:4557
+#: ../libpurple/protocols/oscar/oscar.c:5682
+#: ../libpurple/protocols/qq/qq.c:181 ../libpurple/protocols/qq/qq.c:285
+#: ../libpurple/protocols/silc/buddy.c:1479
+#: ../libpurple/protocols/silc10/buddy.c:1479
+#: ../libpurple/protocols/yahoo/yahoo.c:3664
+#: ../libpurple/protocols/yahoo/yahoo.c:3738 ../libpurple/status.c:158
+#: ../pidgin/gtkdocklet.c:549 ../pidgin/gtkprefs.c:2040
 #: ../pidgin/gtkstatusbox.c:1058
-#, c-format
 msgid "Away"
 msgstr "Absent(ă)"
 
-#: ../libpurple/protocols/gg/gg.c:1043 ../libpurple/protocols/gg/gg.c:1117
-#: ../libpurple/protocols/oscar/oscar.c:2699
-#: ../libpurple/protocols/oscar/oscar.c:3699
+#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1119
+#: ../libpurple/protocols/oscar/oscar.c:2709
+#: ../libpurple/protocols/oscar/oscar.c:3709
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libpurple/protocols/gg/gg.c:1046 ../libpurple/protocols/gg/gg.c:1120
-#: ../libpurple/protocols/jabber/buddy.c:2210
-#: ../libpurple/protocols/jabber/buddy.c:2386
-#: ../libpurple/protocols/oscar/oscar.c:3710
+#: ../libpurple/protocols/gg/gg.c:1048 ../libpurple/protocols/gg/gg.c:1122
+#: ../libpurple/protocols/jabber/buddy.c:2213
+#: ../libpurple/protocols/jabber/buddy.c:2399
+#: ../libpurple/protocols/oscar/oscar.c:3720
 #: ../libpurple/protocols/silc/ops.c:990
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "Prenume"
 
-#: ../libpurple/protocols/gg/gg.c:1059 ../libpurple/protocols/gg/gg.c:1129
+#: ../libpurple/protocols/gg/gg.c:1061 ../libpurple/protocols/gg/gg.c:1131
 msgid "Birth Year"
 msgstr "An naştere"
 
-#: ../libpurple/protocols/gg/gg.c:1111 ../libpurple/protocols/gg/gg.c:1180
-#: ../libpurple/protocols/oscar/oscar.c:3911
+#: ../libpurple/protocols/gg/gg.c:1113 ../libpurple/protocols/gg/gg.c:1182
+#: ../libpurple/protocols/oscar/oscar.c:3921
 msgid "Unable to display the search results."
 msgstr "Rezultatele căutării nu pot fi afişate."
 
-#: ../libpurple/protocols/gg/gg.c:1171
+#: ../libpurple/protocols/gg/gg.c:1173
 msgid "Gadu-Gadu Public Directory"
 msgstr "Director public Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:1172
+#: ../libpurple/protocols/gg/gg.c:1174
 msgid "Search results"
 msgstr "Rezultatele căutării"
 
-#: ../libpurple/protocols/gg/gg.c:1215
+#: ../libpurple/protocols/gg/gg.c:1217
 msgid "No matching users found"
 msgstr "Nu s-au găsit utilizatori care să corespundă"
 
-#: ../libpurple/protocols/gg/gg.c:1216
+#: ../libpurple/protocols/gg/gg.c:1218
 msgid "There are no users matching your search criteria."
 msgstr "Nu există utilizatori care să se potrivească termenilor căutării."
 
-#: ../libpurple/protocols/gg/gg.c:1310 ../libpurple/protocols/gg/gg.c:1463
+#: ../libpurple/protocols/gg/gg.c:1314 ../libpurple/protocols/gg/gg.c:1469
 msgid "Unable to read socket"
 msgstr "Nu se poate citi din socket"
 
-#: ../libpurple/protocols/gg/gg.c:1395
+#: ../libpurple/protocols/gg/gg.c:1399
 msgid "Buddy list downloaded"
 msgstr "Lista de contacte a fost descărcată"
 
-#: ../libpurple/protocols/gg/gg.c:1396
+#: ../libpurple/protocols/gg/gg.c:1400
 msgid "Your buddy list was downloaded from the server."
 msgstr "Lista de contacte a fost descărcată de pe server."
 
-#: ../libpurple/protocols/gg/gg.c:1403
+#: ../libpurple/protocols/gg/gg.c:1407
 msgid "Buddy list uploaded"
 msgstr "Listă de contacte stocată"
 
-#: ../libpurple/protocols/gg/gg.c:1404
+#: ../libpurple/protocols/gg/gg.c:1408
 msgid "Your buddy list was stored on the server."
 msgstr "Lista de contacte v-a fost stocată pe server."
 
-#: ../libpurple/protocols/gg/gg.c:1509 ../libpurple/protocols/gg/gg.c:1715
+#: ../libpurple/protocols/gg/gg.c:1517 ../libpurple/protocols/gg/gg.c:1725
 msgid "Connection failed."
 msgstr "Conexiunea a eşuat."
 
-#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/msn/msn.c:559
+#: ../libpurple/protocols/gg/gg.c:1629 ../libpurple/protocols/msn/msn.c:664
+#: ../libpurple/protocols/msnp9/msn.c:563
 msgid "Blocked"
 msgstr "Blocat(ă)"
 
-#: ../libpurple/protocols/gg/gg.c:1644
+#: ../libpurple/protocols/gg/gg.c:1652
 msgid "Add to chat"
 msgstr "Adaugă în chat"
 
-#: ../libpurple/protocols/gg/gg.c:1653
+#: ../libpurple/protocols/gg/gg.c:1661
 msgid "Unblock"
 msgstr "Deblocare"
 
-#: ../libpurple/protocols/gg/gg.c:1657
+#: ../libpurple/protocols/gg/gg.c:1665
 msgid "Block"
 msgstr "Blocare"
 
-#: ../libpurple/protocols/gg/gg.c:1674
+#: ../libpurple/protocols/gg/gg.c:1682
 msgid "Chat _name:"
 msgstr "_Nume chat:"
 
-#: ../libpurple/protocols/gg/gg.c:1914
+#: ../libpurple/protocols/gg/gg.c:1933
 msgid "Chat error"
 msgstr "Eroare de chat"
 
-#: ../libpurple/protocols/gg/gg.c:1915
+#: ../libpurple/protocols/gg/gg.c:1934
 msgid "This chat name is already in use"
 msgstr "Există deja un chat cu acest nume"
 
-#: ../libpurple/protocols/gg/gg.c:1998
+#: ../libpurple/protocols/gg/gg.c:2019
 msgid "Not connected to the server."
 msgstr "Neconectat(ă) la server."
 
-#: ../libpurple/protocols/gg/gg.c:2021
+#: ../libpurple/protocols/gg/gg.c:2042
 msgid "Find buddies..."
 msgstr "Căutare contacte..."
 
-#: ../libpurple/protocols/gg/gg.c:2027
+#: ../libpurple/protocols/gg/gg.c:2048
 msgid "Change password..."
 msgstr "Schimbare parolă..."
 
-#: ../libpurple/protocols/gg/gg.c:2033
+#: ../libpurple/protocols/gg/gg.c:2054
 msgid "Upload buddylist to Server"
 msgstr "Stochează lista de contacte pe server"
 
-#: ../libpurple/protocols/gg/gg.c:2037
+#: ../libpurple/protocols/gg/gg.c:2058
 msgid "Download buddylist from Server"
 msgstr "Descarcă lista de contacte de pe server"
 
-#: ../libpurple/protocols/gg/gg.c:2041
+#: ../libpurple/protocols/gg/gg.c:2062
 msgid "Delete buddylist from Server"
 msgstr "Şterge lista de contacte de pe server"
 
-#: ../libpurple/protocols/gg/gg.c:2045
+#: ../libpurple/protocols/gg/gg.c:2066
 msgid "Save buddylist to file..."
 msgstr "Salvează lista de contacte în fişierul..."
 
-#: ../libpurple/protocols/gg/gg.c:2049
+#: ../libpurple/protocols/gg/gg.c:2070
 msgid "Load buddylist from file..."
 msgstr "Încarcă lista de contacte din fişierul..."
 
@@ -4017,38 +4108,38 @@
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2153
+#: ../libpurple/protocols/gg/gg.c:2174
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Modul de protocol Gadu-Gadu"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2154
+#: ../libpurple/protocols/gg/gg.c:2175
 msgid "Polish popular IM"
 msgstr "Protocol popular în Polonia"
 
-#: ../libpurple/protocols/gg/gg.c:2208
+#: ../libpurple/protocols/gg/gg.c:2229
 msgid "Gadu-Gadu User"
 msgstr "Utilizator Gadu-Gadu"
 
 #: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1637
-#: ../libpurple/protocols/silc10/silc.c:1566
+#: ../libpurple/protocols/silc/silc.c:1780
+#: ../libpurple/protocols/silc10/silc.c:1569
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Comandă necunoscută: %s"
 
 #: ../libpurple/protocols/irc/cmds.c:503
 #: ../libpurple/protocols/jabber/chat.c:591
-#: ../libpurple/protocols/silc/silc.c:1345
-#: ../libpurple/protocols/silc10/silc.c:1274
+#: ../libpurple/protocols/silc/silc.c:1488
+#: ../libpurple/protocols/silc10/silc.c:1277
 #, c-format
 msgid "current topic is: %s"
 msgstr "topicul curent este: %s"
 
 #: ../libpurple/protocols/irc/cmds.c:507
 #: ../libpurple/protocols/jabber/chat.c:595
-#: ../libpurple/protocols/silc/silc.c:1349
-#: ../libpurple/protocols/silc10/silc.c:1278
+#: ../libpurple/protocols/silc/silc.c:1492
+#: ../libpurple/protocols/silc10/silc.c:1281
 msgid "No topic is set"
 msgstr "Nu există topic"
 
@@ -4082,83 +4173,81 @@
 msgid "MOTD for %s"
 msgstr "MOTD pentru %s"
 
-#: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
-#: ../libpurple/protocols/irc/irc.c:612 ../libpurple/protocols/irc/irc.c:637
-#: ../libpurple/protocols/myspace/myspace.c:2356
+#: ../libpurple/protocols/irc/irc.c:129 ../libpurple/protocols/irc/irc.c:169
+#: ../libpurple/protocols/irc/irc.c:625 ../libpurple/protocols/irc/irc.c:654
+#: ../libpurple/protocols/myspace/myspace.c:2378
 msgid "Server has disconnected"
 msgstr "Serverul s-a deconectat"
 
-#: ../libpurple/protocols/irc/irc.c:249
+#: ../libpurple/protocols/irc/irc.c:253
 msgid "View MOTD"
 msgstr "Afişare MOTD"
 
-#: ../libpurple/protocols/irc/irc.c:261 ../libpurple/protocols/silc/chat.c:33
+#: ../libpurple/protocols/irc/irc.c:265 ../libpurple/protocols/silc/chat.c:33
 #: ../libpurple/protocols/silc10/chat.c:33
 msgid "_Channel:"
 msgstr "C_hat:"
 
-#: ../libpurple/protocols/irc/irc.c:267
-#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:524
+#: ../libpurple/protocols/irc/irc.c:271
+#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:527
 msgid "_Password:"
 msgstr "_Parolă:"
 
-#: ../libpurple/protocols/irc/irc.c:298
+#: ../libpurple/protocols/irc/irc.c:304
 msgid "IRC nicks may not contain whitespace"
 msgstr "Pseudonimele IRC nu pot conţine spaţii"
 
 #. 1. connect to server
 #. connect to the server
-#: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1280
-#: ../libpurple/protocols/msn/session.c:345
-#: ../libpurple/protocols/myspace/myspace.c:301
-#: ../libpurple/protocols/novell/novell.c:2182
-#: ../libpurple/protocols/oscar/oscar.c:1287
+#: ../libpurple/protocols/irc/irc.c:325
+#: ../libpurple/protocols/jabber/jabber.c:1311
+#: ../libpurple/protocols/msn/session.c:402
+#: ../libpurple/protocols/msnp9/session.c:355
+#: ../libpurple/protocols/myspace/myspace.c:302
+#: ../libpurple/protocols/novell/novell.c:2198
+#: ../libpurple/protocols/oscar/oscar.c:1290
 #: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3723
-#: ../libpurple/protocols/simple/simple.c:1716
-#: ../libpurple/protocols/yahoo/yahoo.c:2939
+#: ../libpurple/protocols/sametime/sametime.c:3768
+#: ../libpurple/protocols/simple/simple.c:1893
+#: ../libpurple/protocols/yahoo/yahoo.c:2948
 #: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:662
 msgid "Connecting"
 msgstr "Autentificare"
 
-#: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:610
-#: ../libpurple/protocols/jabber/jabber.c:1095
+#: ../libpurple/protocols/irc/irc.c:335
+#: ../libpurple/protocols/jabber/jabber.c:637
+#: ../libpurple/protocols/jabber/jabber.c:1126
 msgid "SSL support unavailable"
 msgstr "Suportul SSL nu este disponibil"
 
-#. TODO: try other ports if in auto mode, then save
-#. * working port and try that first next time.
-#: ../libpurple/protocols/irc/irc.c:338
-#: ../libpurple/protocols/myspace/myspace.c:317
-#: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1631
+#: ../libpurple/protocols/irc/irc.c:348
+#: ../libpurple/protocols/myspace/myspace.c:320
+#: ../libpurple/protocols/simple/simple.c:469
+#: ../libpurple/protocols/simple/simple.c:1803
 msgid "Couldn't create socket"
 msgstr "Nu s-a putut crea un socket"
 
-#: ../libpurple/protocols/irc/irc.c:421
-#: ../libpurple/protocols/myspace/myspace.c:2469
-#: ../libpurple/protocols/oscar/oscar.c:1283
+#: ../libpurple/protocols/irc/irc.c:430
+#: ../libpurple/protocols/oscar/oscar.c:1286
 msgid "Couldn't connect to host"
 msgstr "Conectarea la server a eşuat"
 
-#: ../libpurple/protocols/irc/irc.c:609 ../libpurple/protocols/irc/irc.c:634
-#: ../libpurple/protocols/myspace/myspace.c:2352
+#: ../libpurple/protocols/irc/irc.c:620 ../libpurple/protocols/irc/irc.c:649
+#: ../libpurple/protocols/myspace/myspace.c:2372
 msgid "Read error"
 msgstr "Eroare la citire"
 
-#: ../libpurple/protocols/irc/irc.c:773
-#: ../libpurple/protocols/silc/chat.c:1412
+#: ../libpurple/protocols/irc/irc.c:790
+#: ../libpurple/protocols/silc/chat.c:1398
 #: ../libpurple/protocols/silc10/chat.c:1426
 #: ../libpurple/protocols/yahoo/yahoochat.c:1497
 msgid "Users"
 msgstr "Utilizatori"
 
-#: ../libpurple/protocols/irc/irc.c:776
-#: ../libpurple/protocols/sametime/sametime.c:3374
-#: ../libpurple/protocols/silc/chat.c:1415
-#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/irc/irc.c:793
+#: ../libpurple/protocols/sametime/sametime.c:3416
+#: ../libpurple/protocols/silc/chat.c:1401
+#: ../libpurple/protocols/silc/ops.c:1393
 #: ../libpurple/protocols/silc10/chat.c:1429
 #: ../libpurple/protocols/silc10/ops.c:1382
 #: ../libpurple/protocols/yahoo/yahoochat.c:1506
@@ -4173,55 +4262,57 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:914
+#: ../libpurple/protocols/irc/irc.c:931
 msgid "IRC Protocol Plugin"
 msgstr "Modul de protocol IRC"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:915
+#: ../libpurple/protocols/irc/irc.c:932
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Modul îmbunătăţit de protocol IRC"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:940 ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2185
-#: ../libpurple/protocols/oscar/oscar.c:6671
-#: ../libpurple/protocols/qq/qq.c:755
-#: ../libpurple/protocols/sametime/sametime.c:5727
+#: ../libpurple/protocols/irc/irc.c:957 ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/msn/msn.c:2335
+#: ../libpurple/protocols/msnp9/msn.c:2186
+#: ../libpurple/protocols/oscar/oscar.c:6721
+#: ../libpurple/protocols/qq/qq.c:756
+#: ../libpurple/protocols/sametime/sametime.c:5773
 #: ../libpurple/protocols/silc/ops.c:1249
-#: ../libpurple/protocols/silc/ops.c:1341
+#: ../libpurple/protocols/silc/ops.c:1343
 #: ../libpurple/protocols/silc10/ops.c:1244
 #: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1896
+#: ../libpurple/protocols/simple/simple.c:2083
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Server"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2190
-#: ../libpurple/protocols/oscar/oscar.c:6674
-#: ../libpurple/protocols/qq/qq.c:758
-#: ../libpurple/protocols/sametime/sametime.c:5732
-#: ../libpurple/protocols/silc/silc.c:1918
-#: ../libpurple/protocols/silc10/silc.c:1861
+#: ../libpurple/protocols/irc/irc.c:960 ../libpurple/protocols/msn/msn.c:2340
+#: ../libpurple/protocols/msnp9/msn.c:2191
+#: ../libpurple/protocols/oscar/oscar.c:6724
+#: ../libpurple/protocols/qq/qq.c:759
+#: ../libpurple/protocols/sametime/sametime.c:5778
+#: ../libpurple/protocols/silc/silc.c:2061
+#: ../libpurple/protocols/silc10/silc.c:1864
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Port"
 
-#: ../libpurple/protocols/irc/irc.c:946
+#: ../libpurple/protocols/irc/irc.c:963
 msgid "Encodings"
 msgstr "Codări"
 
-#: ../libpurple/protocols/irc/irc.c:949 ../libpurple/protocols/irc/msgs.c:316
-#: ../libpurple/protocols/jabber/jabber.c:904
-#: ../libpurple/protocols/jabber/jabber.c:907
-#: ../libpurple/protocols/silc/buddy.c:1539
+#: ../libpurple/protocols/irc/irc.c:966 ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/jabber/jabber.c:931
+#: ../libpurple/protocols/jabber/jabber.c:934
+#: ../libpurple/protocols/silc/buddy.c:1542
 #: ../libpurple/protocols/silc/ops.c:1197
 #: ../libpurple/protocols/silc/ops.c:1200
-#: ../libpurple/protocols/silc/ops.c:1334
-#: ../libpurple/protocols/silc/ops.c:1337
-#: ../libpurple/protocols/silc/silc.c:1005
-#: ../libpurple/protocols/silc10/buddy.c:1539
+#: ../libpurple/protocols/silc/ops.c:1336
+#: ../libpurple/protocols/silc/ops.c:1339
+#: ../libpurple/protocols/silc/silc.c:1148
+#: ../libpurple/protocols/silc10/buddy.c:1542
 #: ../libpurple/protocols/silc10/ops.c:1191
 #: ../libpurple/protocols/silc10/ops.c:1194
 #: ../libpurple/protocols/silc10/ops.c:1340
@@ -4230,8 +4321,8 @@
 msgid "Username"
 msgstr "Nume utilizator"
 
-#: ../libpurple/protocols/irc/irc.c:952 ../libpurple/protocols/irc/msgs.c:317
-#: ../libpurple/protocols/silc/silc.c:1009
+#: ../libpurple/protocols/irc/irc.c:969 ../libpurple/protocols/irc/msgs.c:317
+#: ../libpurple/protocols/silc/silc.c:1152
 #: ../libpurple/protocols/silc10/silc.c:920
 msgid "Real name"
 msgstr "Nume real"
@@ -4240,7 +4331,7 @@
 #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libpurple/protocols/irc/irc.c:960
+#: ../libpurple/protocols/irc/irc.c:977
 msgid "Use SSL"
 msgstr "Utilizare SSL"
 
@@ -4271,8 +4362,8 @@
 msgstr " <i>(identificat)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3700
-#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/oscar/oscar.c:3710
+#: ../libpurple/protocols/silc/ops.c:1422
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr "Pseudonim"
@@ -4370,28 +4461,28 @@
 msgid "Invitation only"
 msgstr "Doar cu invitaţie"
 
-#: ../libpurple/protocols/irc/msgs.c:795
+#: ../libpurple/protocols/irc/msgs.c:798
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Aţi fost dat afară din %s: (%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:800 ../libpurple/protocols/silc/ops.c:699
+#: ../libpurple/protocols/irc/msgs.c:803 ../libpurple/protocols/silc/ops.c:699
 #: ../libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Respins de %s: (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:823
+#: ../libpurple/protocols/irc/msgs.c:826
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "mod (%s %s) de către %s"
 
-#: ../libpurple/protocols/irc/msgs.c:908 ../libpurple/protocols/irc/msgs.c:909
+#: ../libpurple/protocols/irc/msgs.c:911 ../libpurple/protocols/irc/msgs.c:912
 msgid "Invalid nickname"
 msgstr "Pseudonim invalid"
 
-#: ../libpurple/protocols/irc/msgs.c:910
+#: ../libpurple/protocols/irc/msgs.c:913
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
@@ -4399,7 +4490,7 @@
 "Pseudonimul ales a fost respins de către server. Probabil conţine caractere "
 "invalide."
 
-#: ../libpurple/protocols/irc/msgs.c:915
+#: ../libpurple/protocols/irc/msgs.c:918
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -4407,44 +4498,44 @@
 "Numele de cont ales a fost respins de către server. Probabil conţine "
 "caractere invalide."
 
-#: ../libpurple/protocols/irc/msgs.c:954
+#: ../libpurple/protocols/irc/msgs.c:957
 msgid "Cannot change nick"
 msgstr "Nu se reuşeşte schimbarea pseudonimului"
 
-#: ../libpurple/protocols/irc/msgs.c:954
+#: ../libpurple/protocols/irc/msgs.c:957
 msgid "Could not change nick"
 msgstr "Nu s-a putut schimba pseudonimul"
 
-#: ../libpurple/protocols/irc/msgs.c:975
+#: ../libpurple/protocols/irc/msgs.c:978
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Aţi părăsit chat-ul%s%s"
 
-#: ../libpurple/protocols/irc/msgs.c:1017
+#: ../libpurple/protocols/irc/msgs.c:1020
 msgid "Error: invalid PONG from server"
 msgstr "Eroare: PONG invalid de la server"
 
-#: ../libpurple/protocols/irc/msgs.c:1019
+#: ../libpurple/protocols/irc/msgs.c:1022
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "Replică PING -- Întârziere: %lu secunde"
 
-#: ../libpurple/protocols/irc/msgs.c:1110
+#: ../libpurple/protocols/irc/msgs.c:1113
 #, c-format
 msgid "Cannot join %s: Registration is required."
 msgstr "Nu s-a putut intra în %s: E nevoie de înregistrare"
 
-#: ../libpurple/protocols/irc/msgs.c:1111
+#: ../libpurple/protocols/irc/msgs.c:1114
 #: ../libpurple/protocols/silc/ops.c:1093
 #: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Nu s-a putut intra în chat"
 
-#: ../libpurple/protocols/irc/msgs.c:1145
+#: ../libpurple/protocols/irc/msgs.c:1148
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Pseudonimul sau chat-ul sunt temporar indisponibile."
 
-#: ../libpurple/protocols/irc/msgs.c:1157
+#: ../libpurple/protocols/irc/msgs.c:1160
 #, c-format
 msgid "Wallops from %s"
 msgstr "Mesaje sistem de la %s"
@@ -4554,7 +4645,7 @@
 msgstr "names [chat]:  Listaţi utilizatorii din chat."
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:2261
+#: ../libpurple/protocols/jabber/jabber.c:2321
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;pseudonim nou&gt;:  Schimbaţi pseudonimul propriu."
 
@@ -4666,56 +4757,53 @@
 msgstr ""
 "whowas &lt;pseudonim&gt;:  Obţineţi detalii despre un utilizator deconectat."
 
-#: ../libpurple/protocols/irc/parse.c:465
+#: ../libpurple/protocols/irc/parse.c:520
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Timp de reacţie de la %s: %lu secunde"
 
-#: ../libpurple/protocols/irc/parse.c:466
+#: ../libpurple/protocols/irc/parse.c:521
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:466
+#: ../libpurple/protocols/irc/parse.c:521
 msgid "CTCP PING reply"
 msgstr "Replică CTCP PING"
 
-#: ../libpurple/protocols/irc/parse.c:577
-#: ../libpurple/protocols/irc/parse.c:581 ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/irc/parse.c:633
+#: ../libpurple/protocols/irc/parse.c:640 ../libpurple/protocols/toc/toc.c:191
 #: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
 #: ../libpurple/protocols/toc/toc.c:786
 msgid "Disconnected."
 msgstr "Deconectat(ă)."
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:137
-#: ../libpurple/protocols/jabber/jabber.c:671
-#: ../libpurple/protocols/jabber/jabber.c:701
-#: ../libpurple/protocols/jabber/jabber.c:1887
+#: ../libpurple/protocols/jabber/adhoccommands.c:143
+#: ../libpurple/protocols/jabber/jabber.c:698
+#: ../libpurple/protocols/jabber/jabber.c:728
+#: ../libpurple/protocols/jabber/jabber.c:1901
 msgid "Unknown Error"
 msgstr "Eroare necunoscută"
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:139
-#: ../libpurple/protocols/jabber/adhoccommands.c:140
-#, fuzzy
+#: ../libpurple/protocols/jabber/adhoccommands.c:145
+#: ../libpurple/protocols/jabber/adhoccommands.c:146
 msgid "Ad-Hoc Command Failed"
-msgstr "Comandă dezactivată"
-
-#: ../libpurple/protocols/jabber/adhoccommands.c:173
+msgstr "Comandă Ad-Hoc eşuată"
+
+#: ../libpurple/protocols/jabber/adhoccommands.c:182
 #, fuzzy
 msgid "execute"
 msgstr "Neaşteptat"
 
-#: ../libpurple/protocols/jabber/auth.c:53
+#: ../libpurple/protocols/jabber/auth.c:55
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
-msgstr ""
-"Serverul necesită TLS/SSL pentru autentificare. Nu s-a găsit nici un fel de "
-"suport TLS/SSL."
-
-#: ../libpurple/protocols/jabber/auth.c:116
+msgstr "Serverul necesită TLS/SSL pentru autentificare. Nu s-a găsit nici un fel de suport TLS/SSL."
+
+#: ../libpurple/protocols/jabber/auth.c:120
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "Serverul necesită autentificare în clar printr-o conexiune necriptată"
 
-#: ../libpurple/protocols/jabber/auth.c:319
-#: ../libpurple/protocols/jabber/auth.c:508
+#: ../libpurple/protocols/jabber/auth.c:323
+#: ../libpurple/protocols/jabber/auth.c:518
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -4724,33 +4812,32 @@
 "%s necesită autentificare în clar printr-o conexiune necriptată. Permiteţi "
 "autentificarea în aceste condiţii?"
 
-#: ../libpurple/protocols/jabber/auth.c:321
-#: ../libpurple/protocols/jabber/auth.c:322
-#: ../libpurple/protocols/jabber/auth.c:510
-#: ../libpurple/protocols/jabber/auth.c:511
-#: ../libpurple/protocols/jabber/auth.c:598
-#: ../libpurple/protocols/jabber/auth.c:599
+#: ../libpurple/protocols/jabber/auth.c:325
+#: ../libpurple/protocols/jabber/auth.c:326
+#: ../libpurple/protocols/jabber/auth.c:520
+#: ../libpurple/protocols/jabber/auth.c:521
+#: ../libpurple/protocols/jabber/auth.c:614
+#: ../libpurple/protocols/jabber/auth.c:615
 msgid "Plaintext Authentication"
 msgstr "Autentificare în clar (plaintext)"
 
-#: ../libpurple/protocols/jabber/auth.c:334
-#: ../libpurple/protocols/jabber/auth.c:523
-#: ../libpurple/protocols/jabber/auth.c:610
+#: ../libpurple/protocols/jabber/auth.c:340
+#: ../libpurple/protocols/jabber/auth.c:534
+#: ../libpurple/protocols/jabber/auth.c:627
 msgid "Server does not use any supported authentication method"
 msgstr "Serverul nu utilizează o metodă cunoscută de autentificare"
 
-#. This should never happen!
-#: ../libpurple/protocols/jabber/auth.c:462
-#: ../libpurple/protocols/jabber/auth.c:561
-#: ../libpurple/protocols/jabber/auth.c:776
-#: ../libpurple/protocols/jabber/auth.c:917
-#: ../libpurple/protocols/jabber/auth.c:942
-#: ../libpurple/protocols/jabber/auth.c:961
-#: ../libpurple/protocols/jabber/jabber.c:123
+#: ../libpurple/protocols/jabber/auth.c:472
+#: ../libpurple/protocols/jabber/auth.c:576
+#: ../libpurple/protocols/jabber/auth.c:795
+#: ../libpurple/protocols/jabber/auth.c:944
+#: ../libpurple/protocols/jabber/auth.c:971
+#: ../libpurple/protocols/jabber/auth.c:993
+#: ../libpurple/protocols/jabber/jabber.c:127
 msgid "Invalid response from server."
 msgstr "Răspuns invalid de la server."
 
-#: ../libpurple/protocols/jabber/auth.c:600
+#: ../libpurple/protocols/jabber/auth.c:616
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
@@ -4758,18 +4845,18 @@
 "Acest server necesită autentificare în clar printr-o conexiune necriptată. "
 "Permiteţi autentificarea în aceste condiţii?"
 
-#: ../libpurple/protocols/jabber/auth.c:797
-#: ../libpurple/protocols/jabber/auth.c:820
+#: ../libpurple/protocols/jabber/auth.c:818
+#: ../libpurple/protocols/jabber/auth.c:843
 msgid "Invalid challenge from server"
 msgstr "Cerere invalidă de la server"
 
-#: ../libpurple/protocols/jabber/auth.c:892
+#: ../libpurple/protocols/jabber/auth.c:917
 msgid "SASL error"
 msgstr "Eroare SASL"
 
 #: ../libpurple/protocols/jabber/buddy.c:283
 #: ../libpurple/protocols/jabber/buddy.c:1219
-#: ../libpurple/protocols/sametime/sametime.c:4128
+#: ../libpurple/protocols/sametime/sametime.c:4174
 #: ../libpurple/protocols/silc/ops.c:986
 #: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
@@ -4788,7 +4875,7 @@
 msgstr "Prenume"
 
 #: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/jabber.c:977
+#: ../libpurple/protocols/jabber/jabber.c:1004
 msgid "URL"
 msgstr "Pagină Internet"
 
@@ -4819,7 +4906,7 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:293
 #: ../libpurple/protocols/jabber/buddy.c:1295
-#: ../libpurple/protocols/silc/silc.c:1015
+#: ../libpurple/protocols/silc/silc.c:1158
 #: ../libpurple/protocols/silc10/silc.c:926
 msgid "Country"
 msgstr "Ţară"
@@ -4847,16 +4934,17 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:300
 #: ../libpurple/protocols/jabber/buddy.c:1250
-#: ../libpurple/protocols/msn/msn.c:1658
-#: ../libpurple/protocols/oscar/oscar.c:3749
+#: ../libpurple/protocols/msn/msn.c:1806
+#: ../libpurple/protocols/msnp9/msn.c:1659
+#: ../libpurple/protocols/oscar/oscar.c:3759
 msgid "Birthday"
 msgstr "Zi de naştere"
 
 #: ../libpurple/protocols/jabber/buddy.c:301
 #: ../libpurple/protocols/jabber/buddy.c:1365
 #: ../libpurple/protocols/jabber/chat.c:775
-#: ../libpurple/protocols/jabber/usermood.c:175 ../pidgin/gtkblist.c:3116
-#: ../pidgin/gtkprefs.c:739
+#: ../libpurple/protocols/jabber/usermood.c:193 ../pidgin/gtkblist.c:3350
+#: ../pidgin/gtkprefs.c:740
 msgid "Description"
 msgstr "Descriere"
 
@@ -4886,36 +4974,33 @@
 #: ../libpurple/protocols/jabber/buddy.c:815
 #: ../libpurple/protocols/jabber/buddy.c:975
 msgid "Last Activity"
-msgstr ""
+msgstr "Ultima activitate"
 
 #: ../libpurple/protocols/jabber/buddy.c:817
 #: ../libpurple/protocols/jabber/buddy.c:977
-#, fuzzy
 msgid "Service Discovery Info"
-msgstr "Setează detalii „Dir”"
+msgstr "Detalii servicii descoperite"
 
 #: ../libpurple/protocols/jabber/buddy.c:819
 #: ../libpurple/protocols/jabber/buddy.c:979
 msgid "Service Discovery Items"
-msgstr ""
+msgstr "Servicii descoperite"
 
 #: ../libpurple/protocols/jabber/buddy.c:821
 #: ../libpurple/protocols/jabber/buddy.c:981
-#, fuzzy
 msgid "Extended Stanza Addressing"
-msgstr "Adresă completă"
+msgstr "Adresare „stanza” extinsă"
 
 #: ../libpurple/protocols/jabber/buddy.c:823
 #: ../libpurple/protocols/jabber/buddy.c:983
-#, fuzzy
 msgid "Multi-User Chat"
-msgstr "Alias chat"
+msgstr "Chat cu mai mulţi utilizatori"
 
 #: ../libpurple/protocols/jabber/buddy.c:825
 #: ../libpurple/protocols/jabber/buddy.c:985
-#, fuzzy
 msgid "Multi-User Chat Extended Presence Information"
-msgstr "Nu există informaţii detaliate în director."
+msgstr ""
+"Detalii suplimentare despre prezenţa într-un chat cu mai mulţi utilizatori."
 
 #: ../libpurple/protocols/jabber/buddy.c:827
 #: ../libpurple/protocols/jabber/buddy.c:987
@@ -4924,19 +5009,18 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:829
 #: ../libpurple/protocols/jabber/buddy.c:989
-#, fuzzy
 msgid "Ad-Hoc Commands"
-msgstr "Comandă"
+msgstr "Comenzi ad-hoc"
 
 #: ../libpurple/protocols/jabber/buddy.c:831
 #: ../libpurple/protocols/jabber/buddy.c:991
 msgid "PubSub Service"
-msgstr ""
+msgstr "Serviciu PubSub"
 
 #: ../libpurple/protocols/jabber/buddy.c:833
 #: ../libpurple/protocols/jabber/buddy.c:993
 msgid "SOCKS5 Bytestreams"
-msgstr ""
+msgstr "Fluxuri de date SOCKS5"
 
 #: ../libpurple/protocols/jabber/buddy.c:835
 #: ../libpurple/protocols/jabber/buddy.c:995
@@ -4945,9 +5029,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:837
 #: ../libpurple/protocols/jabber/buddy.c:997
-#, fuzzy
 msgid "XHTML-IM"
-msgstr "HTML"
+msgstr "XHTML-IM"
 
 #: ../libpurple/protocols/jabber/buddy.c:839
 #: ../libpurple/protocols/jabber/buddy.c:999
@@ -4957,68 +5040,59 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:841
 #: ../libpurple/protocols/jabber/buddy.c:1001
-#, fuzzy
 msgid "User Location"
-msgstr "Locaţie"
+msgstr "Locaţie utilizator"
 
 #: ../libpurple/protocols/jabber/buddy.c:843
 #: ../libpurple/protocols/jabber/buddy.c:1003
-#, fuzzy
 msgid "User Avatar"
-msgstr "Căutare utilizator"
+msgstr "Avatar utilizator"
 
 #: ../libpurple/protocols/jabber/buddy.c:845
 #: ../libpurple/protocols/jabber/buddy.c:1005
-#, fuzzy
 msgid "Chat State Notifications"
-msgstr "Notificări stări contacte"
+msgstr "Notificări de stări pentru chat"
 
 #: ../libpurple/protocols/jabber/buddy.c:847
 #: ../libpurple/protocols/jabber/buddy.c:1007
-#, fuzzy
 msgid "Software Version"
-msgstr "Versiune nesuportată"
+msgstr "Versiune de software"
 
 #: ../libpurple/protocols/jabber/buddy.c:849
 #: ../libpurple/protocols/jabber/buddy.c:1009
-#, fuzzy
 msgid "Stream Initiation"
-msgstr "Orientare"
+msgstr "Iniţializare flux de date"
 
 #: ../libpurple/protocols/jabber/buddy.c:851
 #: ../libpurple/protocols/jabber/buddy.c:1011
-#: ../libpurple/protocols/sametime/sametime.c:3235
+#: ../libpurple/protocols/sametime/sametime.c:3277
 msgid "File Transfer"
 msgstr "Transfer de fişiere"
 
 #: ../libpurple/protocols/jabber/buddy.c:853
 #: ../libpurple/protocols/jabber/buddy.c:1013
-#, fuzzy
 msgid "User Mood"
-msgstr "Moduri utilizator"
+msgstr "Dispoziţia utilizatorului"
 
 #: ../libpurple/protocols/jabber/buddy.c:855
 #: ../libpurple/protocols/jabber/buddy.c:1015
-#, fuzzy
 msgid "User Activity"
-msgstr "Limită utilizatori"
+msgstr "Acitivatea utilizatorului"
 
 #: ../libpurple/protocols/jabber/buddy.c:857
 #: ../libpurple/protocols/jabber/buddy.c:1017
-#, fuzzy
 msgid "Entity Capabilities"
-msgstr "Facilităţi"
+msgstr "Facilităţile entităţii"
 
 #: ../libpurple/protocols/jabber/buddy.c:859
 #: ../libpurple/protocols/jabber/buddy.c:1019
 msgid "Encrypted Session Negotiations"
-msgstr ""
+msgstr "Negocieri sesiuni criptate"
 
 #: ../libpurple/protocols/jabber/buddy.c:861
 #: ../libpurple/protocols/jabber/buddy.c:1021
-#, fuzzy
 msgid "User Tune"
-msgstr "Nume utilizator"
+msgstr "Piesă utilizator"
 
 #: ../libpurple/protocols/jabber/buddy.c:863
 #: ../libpurple/protocols/jabber/buddy.c:1023
@@ -5034,9 +5108,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:867
 #: ../libpurple/protocols/jabber/buddy.c:1027
-#, fuzzy
 msgid "User Profile"
-msgstr "Profil"
+msgstr "Profil utilizator"
 
 #: ../libpurple/protocols/jabber/buddy.c:869
 #: ../libpurple/protocols/jabber/buddy.c:1029
@@ -5051,9 +5124,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:873
 #: ../libpurple/protocols/jabber/buddy.c:1033
-#, fuzzy
 msgid "User Nickname"
-msgstr "Nume utilizator"
+msgstr "Pseudonim utilizator"
 
 #: ../libpurple/protocols/jabber/buddy.c:875
 #: ../libpurple/protocols/jabber/buddy.c:1035
@@ -5119,8 +5191,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:897
 #: ../libpurple/protocols/jabber/buddy.c:1057
-#: ../libpurple/protocols/silc/ops.c:1596
-#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc/ops.c:1600
+#: ../libpurple/protocols/silc/ops.c:1605
 #: ../libpurple/protocols/silc10/ops.c:1612
 #: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping"
@@ -5169,22 +5241,22 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:921
 #: ../libpurple/protocols/jabber/buddy.c:1081
-#: ../libpurple/protocols/oscar/oscar.c:2906
+#: ../libpurple/protocols/oscar/oscar.c:2916
 msgid "Capabilities"
 msgstr "Facilităţi"
 
 #: ../libpurple/protocols/jabber/buddy.c:933
-#: ../libpurple/protocols/jabber/libxmpp.c:206
+#: ../libpurple/protocols/jabber/libxmpp.c:209
 #: ../libpurple/protocols/jabber/si.c:859
 msgid "Resource"
 msgstr "Resursă"
 
 #: ../libpurple/protocols/jabber/buddy.c:935
-#: ../libpurple/protocols/jabber/jabber.c:1531
-#: ../libpurple/protocols/jabber/jabber.c:1554
-#: ../libpurple/protocols/jabber/jabber.c:1577
-#: ../libpurple/protocols/jabber/jabber.c:1600
-#: ../libpurple/protocols/jabber/jabber.c:1623
+#: ../libpurple/protocols/jabber/jabber.c:1569
+#: ../libpurple/protocols/jabber/jabber.c:1583
+#: ../libpurple/protocols/jabber/jabber.c:1597
+#: ../libpurple/protocols/jabber/jabber.c:1611
+#: ../libpurple/protocols/jabber/jabber.c:1625
 msgid "Priority"
 msgstr "Prioritate"
 
@@ -5195,9 +5267,9 @@
 msgstr "Iniţială"
 
 #: ../libpurple/protocols/jabber/buddy.c:1270
-#: ../libpurple/protocols/jabber/jabber.c:952
-#: ../libpurple/protocols/oscar/oscar.c:3788
-#: ../libpurple/protocols/oscar/oscar.c:3801
+#: ../libpurple/protocols/jabber/jabber.c:979
+#: ../libpurple/protocols/oscar/oscar.c:3798
+#: ../libpurple/protocols/oscar/oscar.c:3811
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1030
 #: ../libpurple/protocols/silc10/ops.c:1064
@@ -5216,74 +5288,71 @@
 msgid "Logo"
 msgstr "Siglă"
 
-#: ../libpurple/protocols/jabber/buddy.c:1942
+#: ../libpurple/protocols/jabber/buddy.c:1945
 msgid "Un-hide From"
 msgstr "Arată-mă din nou pentru"
 
-#: ../libpurple/protocols/jabber/buddy.c:1946
+#: ../libpurple/protocols/jabber/buddy.c:1949
 msgid "Temporarily Hide From"
 msgstr "Ascunde-mă temporar de"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1954
+#: ../libpurple/protocols/jabber/buddy.c:1957
 msgid "Cancel Presence Notification"
 msgstr "Anulează notificarea prezenţei"
 
-#: ../libpurple/protocols/jabber/buddy.c:1961
+#: ../libpurple/protocols/jabber/buddy.c:1964
 msgid "(Re-)Request authorization"
 msgstr "Solicit (din nou) autorizare"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1970
+#: ../libpurple/protocols/jabber/buddy.c:1973
 msgid "Unsubscribe"
 msgstr "Desubscrie"
 
-#: ../libpurple/protocols/jabber/buddy.c:1985
-#, fuzzy
+#: ../libpurple/protocols/jabber/buddy.c:1988
 msgid "Log In"
-msgstr "Autentificat(ă)"
-
-#: ../libpurple/protocols/jabber/buddy.c:1989
-#, fuzzy
+msgstr "Conectare"
+
+#: ../libpurple/protocols/jabber/buddy.c:1992
 msgid "Log Out"
-msgstr "Înregistrează chat-urile"
-
-#: ../libpurple/protocols/jabber/buddy.c:2035
-#: ../libpurple/protocols/jabber/jabber.c:1553
+msgstr "Deconectare"
+
+#: ../libpurple/protocols/jabber/buddy.c:2038
+#: ../libpurple/protocols/jabber/jabber.c:1582
 msgid "Chatty"
 msgstr "Cu chef de vorbă"
 
-#: ../libpurple/protocols/jabber/buddy.c:2039
+#: ../libpurple/protocols/jabber/buddy.c:2042
 msgid "Extended Away"
 msgstr "Demult absent"
 
-#: ../libpurple/protocols/jabber/buddy.c:2041
-#: ../libpurple/protocols/jabber/jabber.c:1622
+#: ../libpurple/protocols/jabber/buddy.c:2044
+#: ../libpurple/protocols/jabber/jabber.c:1624
 #: ../libpurple/protocols/oscar/oscar.c:727
-#: ../libpurple/protocols/oscar/oscar.c:5808
-#: ../libpurple/protocols/sametime/sametime.c:3297
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:5858
+#: ../libpurple/protocols/sametime/sametime.c:3339
 msgid "Do Not Disturb"
 msgstr "Nu deranjaţi"
 
-#: ../libpurple/protocols/jabber/buddy.c:2208
+#: ../libpurple/protocols/jabber/buddy.c:2211
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:2212
-#: ../libpurple/protocols/jabber/buddy.c:2391
-#: ../libpurple/protocols/oscar/oscar.c:3711
+#: ../libpurple/protocols/jabber/buddy.c:2215
+#: ../libpurple/protocols/jabber/buddy.c:2404
+#: ../libpurple/protocols/oscar/oscar.c:3721
 msgid "Last Name"
 msgstr "Nume de familie"
 
-#: ../libpurple/protocols/jabber/buddy.c:2244
+#: ../libpurple/protocols/jabber/buddy.c:2247
 msgid "The following are the results of your search"
 msgstr "Acestea sunt rezultatele căutării:"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:2319
+#: ../libpurple/protocols/jabber/buddy.c:2332
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -5291,70 +5360,70 @@
 "Căutaţi un contact prin introducerea unui criteriu de căutare în câmpurile "
 "date. Notă: Fiecare câmp suportă căutare cu caractere de tip „wildcard” (%)"
 
-#: ../libpurple/protocols/jabber/buddy.c:2339
+#: ../libpurple/protocols/jabber/buddy.c:2352
 msgid "Directory Query Failed"
 msgstr "Interogarea directorului a eşuat"
 
-#: ../libpurple/protocols/jabber/buddy.c:2340
+#: ../libpurple/protocols/jabber/buddy.c:2353
 msgid "Could not query the directory server."
 msgstr "Nu s-a putut interoga serverul de directoare"
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:2374
+#: ../libpurple/protocols/jabber/buddy.c:2387
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Instrucţiuni server: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:2381
+#: ../libpurple/protocols/jabber/buddy.c:2394
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 "Completaţi unul sau mai multe câmpuri pentru a specifica criterii de căutare "
 "a utilizatorilor XMPP."
 
-#: ../libpurple/protocols/jabber/buddy.c:2401
-#: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3714
-#: ../libpurple/protocols/oscar/oscar.c:3723
+#: ../libpurple/protocols/jabber/buddy.c:2414
+#: ../libpurple/protocols/novell/novell.c:1497
+#: ../libpurple/protocols/oscar/oscar.c:3724
+#: ../libpurple/protocols/oscar/oscar.c:3733
 msgid "E-Mail Address"
 msgstr "Adresă de mail"
 
-#: ../libpurple/protocols/jabber/buddy.c:2410
-#: ../libpurple/protocols/jabber/buddy.c:2411
+#: ../libpurple/protocols/jabber/buddy.c:2423
+#: ../libpurple/protocols/jabber/buddy.c:2424
 msgid "Search for XMPP users"
 msgstr "Căutare utilizator XMPP"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:2412
+#: ../libpurple/protocols/jabber/buddy.c:2425
 #: ../libpurple/protocols/qq/group.c:123
 #: ../libpurple/protocols/qq/group_im.c:147
 #: ../libpurple/protocols/qq/sys_msg.c:174
 #: ../libpurple/protocols/qq/sys_msg.c:250
 #: ../libpurple/protocols/qq/sys_msg.c:268
-#: ../libpurple/protocols/sametime/sametime.c:5611
+#: ../libpurple/protocols/sametime/sametime.c:5657
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
 msgstr "Caută"
 
-#: ../libpurple/protocols/jabber/buddy.c:2427
+#: ../libpurple/protocols/jabber/buddy.c:2440
 msgid "Invalid Directory"
 msgstr "Director invalid"
 
-#: ../libpurple/protocols/jabber/buddy.c:2444
+#: ../libpurple/protocols/jabber/buddy.c:2457
 msgid "Enter a User Directory"
 msgstr "Introduceţi un director cu utilizatori"
 
-#: ../libpurple/protocols/jabber/buddy.c:2445
+#: ../libpurple/protocols/jabber/buddy.c:2458
 msgid "Select a user directory to search"
 msgstr "Selectaţi pentru interogare un director cu utilizatori"
 
-#: ../libpurple/protocols/jabber/buddy.c:2448
+#: ../libpurple/protocols/jabber/buddy.c:2461
 msgid "Search Directory"
 msgstr "Caută în acest director"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5294
+#: ../libpurple/protocols/oscar/oscar.c:5342
 #: ../libpurple/protocols/yahoo/yahoochat.c:1048
 msgid "_Room:"
 msgstr "Ca_meră:"
@@ -5424,7 +5493,7 @@
 
 #: ../libpurple/protocols/jabber/chat.c:678
 #: ../libpurple/protocols/jabber/chat.c:689
-#: ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/silc/ops.c:1460
 #: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "Eroare la obţinerea listei camerelor de chat"
@@ -5445,29 +5514,25 @@
 msgid "Find Rooms"
 msgstr "Caută camere de chat"
 
-#: ../libpurple/protocols/jabber/jabber.c:92
-msgid "Error initializing session"
-msgstr "Eroare la iniţializarea sesiunii"
-
-#: ../libpurple/protocols/jabber/jabber.c:145
+#: ../libpurple/protocols/jabber/jabber.c:151
 msgid "You require encryption, but it is not available on this server."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:259
-#: ../libpurple/protocols/jabber/jabber.c:312
-#: ../libpurple/protocols/jabber/jabber.c:340
+msgstr "Aţi cerut criptare, dar serverul nu suportă criptare"
+
+#: ../libpurple/protocols/jabber/jabber.c:269
+#: ../libpurple/protocols/jabber/jabber.c:324
+#: ../libpurple/protocols/jabber/jabber.c:354
 msgid "Write error"
 msgstr "Eroare la scriere"
 
-#: ../libpurple/protocols/jabber/jabber.c:408
-#: ../libpurple/protocols/jabber/jabber.c:445
+#: ../libpurple/protocols/jabber/jabber.c:424
+#: ../libpurple/protocols/jabber/jabber.c:463
 msgid "Read Error"
 msgstr "Eroare la citire"
 
-#: ../libpurple/protocols/jabber/jabber.c:482
-#: ../libpurple/protocols/oscar/flap_connection.c:394
-#: ../libpurple/protocols/yahoo/yahoo.c:2558
-#: ../libpurple/protocols/yahoo/yahoo.c:2590
+#: ../libpurple/protocols/jabber/jabber.c:500
+#: ../libpurple/protocols/oscar/flap_connection.c:398
+#: ../libpurple/protocols/yahoo/yahoo.c:2562
+#: ../libpurple/protocols/yahoo/yahoo.c:2594
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -5476,625 +5541,605 @@
 "Nu s-a putut face o conexiune cu serverul:\n"
 "%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:529
+#: ../libpurple/protocols/jabber/jabber.c:550
 msgid "Unable to create socket"
 msgstr "Nu se poate crea un socket"
 
-#: ../libpurple/protocols/jabber/jabber.c:575
-#: ../libpurple/protocols/jabber/jabber.c:1063
+#: ../libpurple/protocols/jabber/jabber.c:598
+#: ../libpurple/protocols/jabber/jabber.c:1092
 msgid "Invalid XMPP ID"
 msgstr "ID XMPP invalid"
 
-#: ../libpurple/protocols/jabber/jabber.c:580
+#: ../libpurple/protocols/jabber/jabber.c:605
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "ID XMPP invalid. Trebuie precizat domeniul."
 
-#: ../libpurple/protocols/jabber/jabber.c:656
+#: ../libpurple/protocols/jabber/jabber.c:683
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Înregistrarea %s@%s a reuşit"
 
-#: ../libpurple/protocols/jabber/jabber.c:662
-#, fuzzy, c-format
+#: ../libpurple/protocols/jabber/jabber.c:689
+#, c-format
 msgid "Registration to %s successful"
-msgstr "Înregistrarea %s@%s a reuşit"
-
-#: ../libpurple/protocols/jabber/jabber.c:664
-#: ../libpurple/protocols/jabber/jabber.c:665
+msgstr "Înregistrarea la %s a reuşit"
+
+#: ../libpurple/protocols/jabber/jabber.c:691
+#: ../libpurple/protocols/jabber/jabber.c:692
 msgid "Registration Successful"
 msgstr "Înregistrare reuşită"
 
-#: ../libpurple/protocols/jabber/jabber.c:673
-#: ../libpurple/protocols/jabber/jabber.c:674
+#: ../libpurple/protocols/jabber/jabber.c:700
+#: ../libpurple/protocols/jabber/jabber.c:701
 msgid "Registration Failed"
 msgstr "Înregistrare eşuată"
 
-#: ../libpurple/protocols/jabber/jabber.c:692
-#, fuzzy, c-format
+#: ../libpurple/protocols/jabber/jabber.c:719
+#, c-format
 msgid "Registration from %s successfully removed"
-msgstr "Înregistrarea %s@%s a reuşit"
-
-#: ../libpurple/protocols/jabber/jabber.c:694
-#: ../libpurple/protocols/jabber/jabber.c:695
-#, fuzzy
+msgstr "Înregistrarea de la %s a fost ştearsă cu succes"
+
+#: ../libpurple/protocols/jabber/jabber.c:721
+#: ../libpurple/protocols/jabber/jabber.c:722
 msgid "Unregistration Successful"
-msgstr "Înregistrare reuşită"
-
-#: ../libpurple/protocols/jabber/jabber.c:703
-#: ../libpurple/protocols/jabber/jabber.c:704
-#, fuzzy
+msgstr "Ştergere reuşită a înregistrării"
+
+#: ../libpurple/protocols/jabber/jabber.c:730
+#: ../libpurple/protocols/jabber/jabber.c:731
 msgid "Unregistration Failed"
-msgstr "Înregistrare eşuată"
-
-#: ../libpurple/protocols/jabber/jabber.c:864
-#: ../libpurple/protocols/jabber/jabber.c:865
+msgstr "Ştergere eşuată a înregistrării"
+
+#: ../libpurple/protocols/jabber/jabber.c:891
+#: ../libpurple/protocols/jabber/jabber.c:892
 msgid "Already Registered"
 msgstr "Este deja înregistrat"
 
-#: ../libpurple/protocols/jabber/jabber.c:962
-#: ../libpurple/protocols/oscar/oscar.c:3790
-#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/jabber/jabber.c:989
+#: ../libpurple/protocols/oscar/oscar.c:3800
+#: ../libpurple/protocols/oscar/oscar.c:3813
 msgid "State"
 msgstr "Stat"
 
-#: ../libpurple/protocols/jabber/jabber.c:967
+#: ../libpurple/protocols/jabber/jabber.c:994
 msgid "Postal code"
 msgstr "Cod poştal"
 
-#: ../libpurple/protocols/jabber/jabber.c:972
+#: ../libpurple/protocols/jabber/jabber.c:999
 #: ../libpurple/protocols/silc/ops.c:1035
-#: ../libpurple/protocols/silc/silc.c:772
-#: ../libpurple/protocols/silc/util.c:557
+#: ../libpurple/protocols/silc/silc.c:915
+#: ../libpurple/protocols/silc/util.c:563
 #: ../libpurple/protocols/silc10/ops.c:1069
 #: ../libpurple/protocols/silc10/silc.c:683
 #: ../libpurple/protocols/silc10/util.c:553
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../libpurple/protocols/jabber/jabber.c:982
+#: ../libpurple/protocols/jabber/jabber.c:1009
 msgid "Date"
 msgstr "Dată"
 
-#: ../libpurple/protocols/jabber/jabber.c:987
-#, fuzzy
+#: ../libpurple/protocols/jabber/jabber.c:1014
 msgid "Unregister"
-msgstr "Înregistrare cont"
-
-#: ../libpurple/protocols/jabber/jabber.c:994
-#, fuzzy
+msgstr "Ştergere înregistrare"
+
+#: ../libpurple/protocols/jabber/jabber.c:1021
 msgid ""
 "Please fill out the information below to change your account registration."
-msgstr "Completaţi informaţiile de mai jos pentru înregistrarea unui nou cont."
-
-#: ../libpurple/protocols/jabber/jabber.c:997
+msgstr ""
+"Completaţi informaţiile de mai jos pentru schimbarea contului înregistrat."
+
+#: ../libpurple/protocols/jabber/jabber.c:1024
 msgid "Please fill out the information below to register your new account."
 msgstr "Completaţi informaţiile de mai jos pentru înregistrarea unui nou cont."
 
-#: ../libpurple/protocols/jabber/jabber.c:1005
-#: ../libpurple/protocols/jabber/jabber.c:1006
+#: ../libpurple/protocols/jabber/jabber.c:1032
+#: ../libpurple/protocols/jabber/jabber.c:1033
 msgid "Register New XMPP Account"
 msgstr "Înregistrare cont nou XMPP"
 
-#: ../libpurple/protocols/jabber/jabber.c:1007
-#: ../libpurple/protocols/jabber/jabber.c:1016
+#: ../libpurple/protocols/jabber/jabber.c:1034
+#: ../libpurple/protocols/jabber/jabber.c:1043
 msgid "Register"
 msgstr "Înregistrare cont"
 
-#: ../libpurple/protocols/jabber/jabber.c:1012
-#, fuzzy, c-format
+#: ../libpurple/protocols/jabber/jabber.c:1039
+#, c-format
 msgid "Change Account Registration at %s"
-msgstr "Modificare detalii pentru %s"
-
-#: ../libpurple/protocols/jabber/jabber.c:1013
-#, fuzzy, c-format
+msgstr "Modificare înregistrare cont la %s"
+
+#: ../libpurple/protocols/jabber/jabber.c:1040
+#, c-format
 msgid "Register New Account at %s"
-msgstr "Înregistrare cont nou XMPP"
-
-#: ../libpurple/protocols/jabber/jabber.c:1016
-#, fuzzy
+msgstr "Înregistrare cont nou la %s"
+
+#: ../libpurple/protocols/jabber/jabber.c:1043
 msgid "Change Registration"
-msgstr "Schimbă statusul în:"
-
-#: ../libpurple/protocols/jabber/jabber.c:1120
-#: ../libpurple/protocols/jabber/jabber.c:1121
-#, fuzzy
+msgstr "Modificare înregistrare"
+
+#: ../libpurple/protocols/jabber/jabber.c:1151
+#: ../libpurple/protocols/jabber/jabber.c:1152
 msgid "Error unregistering account"
-msgstr "Eroare la schimbarea detaliilor contului"
-
-#: ../libpurple/protocols/jabber/jabber.c:1126
-#: ../libpurple/protocols/jabber/jabber.c:1127
-#, fuzzy
+msgstr "Eroare la ştergerea contului înregistrat"
+
+#: ../libpurple/protocols/jabber/jabber.c:1157
+#: ../libpurple/protocols/jabber/jabber.c:1158
 msgid "Account successfully unregistered"
-msgstr "Aţi creat cu succes un Qun"
-
-#: ../libpurple/protocols/jabber/jabber.c:1284
+msgstr "Contul a fost înregistrat cu succes"
+
+#: ../libpurple/protocols/jabber/jabber.c:1315
 msgid "Initializing Stream"
 msgstr "Iniţializare flux"
 
-#: ../libpurple/protocols/jabber/jabber.c:1289
-#, fuzzy
+#: ../libpurple/protocols/jabber/jabber.c:1320
 msgid "Initializing SSL/TLS"
-msgstr "Iniţializare flux"
-
-#: ../libpurple/protocols/jabber/jabber.c:1293
-#: ../libpurple/protocols/msn/session.c:351
+msgstr "Iniţializare SSL/TLS"
+
+#: ../libpurple/protocols/jabber/jabber.c:1324
+#: ../libpurple/protocols/msn/session.c:408
+#: ../libpurple/protocols/msnp9/session.c:361
 msgid "Authenticating"
 msgstr "Autentificare"
 
-#: ../libpurple/protocols/jabber/jabber.c:1302
+#: ../libpurple/protocols/jabber/jabber.c:1333
 msgid "Re-initializing Stream"
 msgstr "Reiniţializare flux"
 
-#: ../libpurple/protocols/jabber/jabber.c:1396
-#: ../libpurple/protocols/jabber/jabber.c:1865
-#: ../libpurple/protocols/jabber/jabber.c:1909
-#: ../libpurple/protocols/jabber/jabber.c:1945
+#: ../libpurple/protocols/jabber/jabber.c:1427
+#: ../libpurple/protocols/jabber/jabber.c:1879
+#: ../libpurple/protocols/jabber/jabber.c:1922
+#: ../libpurple/protocols/jabber/jabber.c:1960
 #: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:5602
+#: ../libpurple/protocols/oscar/oscar.c:5652
 msgid "Not Authorized"
 msgstr "Neautorizat(ă)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1442
+#: ../libpurple/protocols/jabber/jabber.c:1475
 msgid "Both"
 msgstr "Ambele"
 
-#: ../libpurple/protocols/jabber/jabber.c:1444
+#: ../libpurple/protocols/jabber/jabber.c:1477
 msgid "From (To pending)"
 msgstr "Expeditor (în aşteptare)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1446
+#: ../libpurple/protocols/jabber/jabber.c:1479
 msgid "From"
 msgstr "Expeditor"
 
-#: ../libpurple/protocols/jabber/jabber.c:1449
+#: ../libpurple/protocols/jabber/jabber.c:1482
 msgid "To"
 msgstr "Destinatar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1451
+#: ../libpurple/protocols/jabber/jabber.c:1484
 msgid "None (To pending)"
 msgstr "Niciunul (în aşteptare)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1453
+#: ../libpurple/protocols/jabber/jabber.c:1486
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "Fără"
 
-#: ../libpurple/protocols/jabber/jabber.c:1456
+#: ../libpurple/protocols/jabber/jabber.c:1489
 msgid "Subscription"
 msgstr "Subscriere"
 
-#: ../libpurple/protocols/jabber/jabber.c:1466
-#: ../libpurple/protocols/jabber/jabber.c:1469
-#: ../libpurple/protocols/jabber/jabber.c:1533
-#: ../libpurple/protocols/jabber/jabber.c:1556
-#: ../libpurple/protocols/jabber/jabber.c:1579
-#: ../libpurple/protocols/jabber/jabber.c:1602
-#: ../libpurple/protocols/jabber/jabber.c:1625
-#: ../libpurple/protocols/jabber/usermood.c:166
-#: ../libpurple/protocols/silc/buddy.c:1557
+#: ../libpurple/protocols/jabber/jabber.c:1499
+#: ../libpurple/protocols/jabber/jabber.c:1502
+#: ../libpurple/protocols/jabber/jabber.c:1571
+#: ../libpurple/protocols/jabber/jabber.c:1585
+#: ../libpurple/protocols/jabber/jabber.c:1599
+#: ../libpurple/protocols/jabber/jabber.c:1613
+#: ../libpurple/protocols/jabber/jabber.c:1627
+#: ../libpurple/protocols/jabber/usermood.c:184
+#: ../libpurple/protocols/silc/buddy.c:1560
 #: ../libpurple/protocols/silc/ops.c:1212
-#: ../libpurple/protocols/silc10/buddy.c:1557
+#: ../libpurple/protocols/silc10/buddy.c:1560
 #: ../libpurple/protocols/silc10/ops.c:1207
 msgid "Mood"
 msgstr "Dispoziţie"
 
-#: ../libpurple/protocols/jabber/jabber.c:1534
-#: ../libpurple/protocols/jabber/jabber.c:1557
-#: ../libpurple/protocols/jabber/jabber.c:1580
-#: ../libpurple/protocols/jabber/jabber.c:1603
-#: ../libpurple/protocols/jabber/jabber.c:1626
+#: ../libpurple/protocols/jabber/jabber.c:1507
+#: ../libpurple/protocols/msn/msn.c:647
 #, fuzzy
+msgid "Current media"
+msgstr "Media curentă"
+
+#: ../libpurple/protocols/jabber/jabber.c:1572
+#: ../libpurple/protocols/jabber/jabber.c:1586
+#: ../libpurple/protocols/jabber/jabber.c:1600
+#: ../libpurple/protocols/jabber/jabber.c:1614
+#: ../libpurple/protocols/jabber/jabber.c:1628
 msgid "Mood Text"
-msgstr "Grupă sanguină"
-
-#: ../libpurple/protocols/jabber/jabber.c:1535
-#: ../libpurple/protocols/jabber/jabber.c:1558
-#: ../libpurple/protocols/jabber/jabber.c:1581
-#: ../libpurple/protocols/jabber/jabber.c:1604
-#: ../libpurple/protocols/jabber/jabber.c:1627
-#, fuzzy
+msgstr "Text dispoziţie"
+
+#: ../libpurple/protocols/jabber/jabber.c:1574
+#: ../libpurple/protocols/jabber/jabber.c:1588
+#: ../libpurple/protocols/jabber/jabber.c:1602
+#: ../libpurple/protocols/jabber/jabber.c:1616
+#: ../libpurple/protocols/jabber/jabber.c:1630
+msgid "Allow Buzz"
+msgstr "Permite „buzz”"
+
+#: ../libpurple/protocols/jabber/jabber.c:1648
 msgid "Tune Artist"
-msgstr "Artişti"
-
-#: ../libpurple/protocols/jabber/jabber.c:1536
-#: ../libpurple/protocols/jabber/jabber.c:1559
-#: ../libpurple/protocols/jabber/jabber.c:1582
-#: ../libpurple/protocols/jabber/jabber.c:1605
-#: ../libpurple/protocols/jabber/jabber.c:1628
-#, fuzzy
+msgstr "Artist piesă curentă"
+
+#: ../libpurple/protocols/jabber/jabber.c:1649
 msgid "Tune Title"
-msgstr "Titlu"
-
-#: ../libpurple/protocols/jabber/jabber.c:1537
-#: ../libpurple/protocols/jabber/jabber.c:1560
-#: ../libpurple/protocols/jabber/jabber.c:1583
-#: ../libpurple/protocols/jabber/jabber.c:1606
-#: ../libpurple/protocols/jabber/jabber.c:1629
+msgstr "Nume piesă curentă"
+
+#: ../libpurple/protocols/jabber/jabber.c:1650
 msgid "Tune Album"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1538
-#: ../libpurple/protocols/jabber/jabber.c:1561
-#: ../libpurple/protocols/jabber/jabber.c:1584
-#: ../libpurple/protocols/jabber/jabber.c:1607
-#: ../libpurple/protocols/jabber/jabber.c:1630
+msgstr "Album piesă curentă"
+
+#: ../libpurple/protocols/jabber/jabber.c:1651
 msgid "Tune Genre"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1539
-#: ../libpurple/protocols/jabber/jabber.c:1562
-#: ../libpurple/protocols/jabber/jabber.c:1585
-#: ../libpurple/protocols/jabber/jabber.c:1608
-#: ../libpurple/protocols/jabber/jabber.c:1631
-#, fuzzy
+msgstr "Gen piesă curentă"
+
+#: ../libpurple/protocols/jabber/jabber.c:1652
 msgid "Tune Comment"
-msgstr "Comentariu contact"
-
-#: ../libpurple/protocols/jabber/jabber.c:1540
-#: ../libpurple/protocols/jabber/jabber.c:1563
-#: ../libpurple/protocols/jabber/jabber.c:1586
-#: ../libpurple/protocols/jabber/jabber.c:1609
-#: ../libpurple/protocols/jabber/jabber.c:1632
+msgstr "Comentariu piesă curentă"
+
+#: ../libpurple/protocols/jabber/jabber.c:1653
 msgid "Tune Track"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1541
-#: ../libpurple/protocols/jabber/jabber.c:1564
-#: ../libpurple/protocols/jabber/jabber.c:1587
-#: ../libpurple/protocols/jabber/jabber.c:1610
-#: ../libpurple/protocols/jabber/jabber.c:1633
+msgstr "Pistă piesă curentă"
+
+#: ../libpurple/protocols/jabber/jabber.c:1654
 msgid "Tune Time"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1542
-#: ../libpurple/protocols/jabber/jabber.c:1565
-#: ../libpurple/protocols/jabber/jabber.c:1588
-#: ../libpurple/protocols/jabber/jabber.c:1611
-#: ../libpurple/protocols/jabber/jabber.c:1634
+msgstr "Timp piesă curentă"
+
+#: ../libpurple/protocols/jabber/jabber.c:1655
 msgid "Tune Year"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1543
-#: ../libpurple/protocols/jabber/jabber.c:1566
-#: ../libpurple/protocols/jabber/jabber.c:1589
-#: ../libpurple/protocols/jabber/jabber.c:1612
-#: ../libpurple/protocols/jabber/jabber.c:1635
+msgstr "An piesă curentă"
+
+#: ../libpurple/protocols/jabber/jabber.c:1656
 msgid "Tune URL"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1545
-#: ../libpurple/protocols/jabber/jabber.c:1568
-#: ../libpurple/protocols/jabber/jabber.c:1591
-#: ../libpurple/protocols/jabber/jabber.c:1614
-#: ../libpurple/protocols/jabber/jabber.c:1637
-#, fuzzy
-msgid "Allow Buzz"
-msgstr "Permite"
-
-#: ../libpurple/protocols/jabber/jabber.c:1665
+msgstr "URL piesă curentă"
+
+#: ../libpurple/protocols/jabber/jabber.c:1672
 msgid "Password Changed"
 msgstr "Parola a fost schimbată"
 
-#: ../libpurple/protocols/jabber/jabber.c:1666
+#: ../libpurple/protocols/jabber/jabber.c:1673
 msgid "Your password has been changed."
 msgstr "Parola v-a fost schimbată."
 
-#: ../libpurple/protocols/jabber/jabber.c:1670
-#: ../libpurple/protocols/jabber/jabber.c:1671
+#: ../libpurple/protocols/jabber/jabber.c:1679
+#: ../libpurple/protocols/jabber/jabber.c:1680
 msgid "Error changing password"
 msgstr "Eroare la schimbarea parolei"
 
-#: ../libpurple/protocols/jabber/jabber.c:1728
+#: ../libpurple/protocols/jabber/jabber.c:1737
 msgid "Password (again)"
 msgstr "Confirmare parolă"
 
-#: ../libpurple/protocols/jabber/jabber.c:1734
-#: ../libpurple/protocols/jabber/jabber.c:1735
+#: ../libpurple/protocols/jabber/jabber.c:1743
+#: ../libpurple/protocols/jabber/jabber.c:1744
 msgid "Change XMPP Password"
 msgstr "Schimbare parolă XMPP"
 
-#: ../libpurple/protocols/jabber/jabber.c:1735
+#: ../libpurple/protocols/jabber/jabber.c:1744
 msgid "Please enter your new password"
 msgstr "Introduceţi noua parolă"
 
-#: ../libpurple/protocols/jabber/jabber.c:1749
-#: ../libpurple/protocols/oscar/oscar.c:6388
-#: ../libpurple/protocols/silc/silc.c:1093
-#: ../libpurple/protocols/silc10/silc.c:1004
+#: ../libpurple/protocols/jabber/jabber.c:1758
+#: ../libpurple/protocols/oscar/oscar.c:6438
+#: ../libpurple/protocols/silc/silc.c:1236
+#: ../libpurple/protocols/silc10/silc.c:1007
 msgid "Set User Info..."
 msgstr "Setare detalii..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1754
-#: ../libpurple/protocols/oscar/oscar.c:6399
-#: ../libpurple/protocols/silc/silc.c:1089
-#: ../libpurple/protocols/silc10/silc.c:1000
+#: ../libpurple/protocols/jabber/jabber.c:1763
+#: ../libpurple/protocols/oscar/oscar.c:6449
+#: ../libpurple/protocols/silc/silc.c:1232
+#: ../libpurple/protocols/silc10/silc.c:1003
 msgid "Change Password..."
 msgstr "Schimbare parolă..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1759
+#: ../libpurple/protocols/jabber/jabber.c:1768
 msgid "Search for Users..."
 msgstr "Căutare utilizatori..."
 
-#: ../libpurple/protocols/jabber/jabber.c:1845
+#: ../libpurple/protocols/jabber/jabber.c:1859
 msgid "Bad Request"
 msgstr "Cerere invalidă"
 
-#: ../libpurple/protocols/jabber/jabber.c:1847
+#: ../libpurple/protocols/jabber/jabber.c:1861
 msgid "Conflict"
 msgstr "Conflict"
 
-#: ../libpurple/protocols/jabber/jabber.c:1849
+#: ../libpurple/protocols/jabber/jabber.c:1863
 msgid "Feature Not Implemented"
 msgstr "Facilitate neimplementată"
 
-#: ../libpurple/protocols/jabber/jabber.c:1851
+#: ../libpurple/protocols/jabber/jabber.c:1865
 msgid "Forbidden"
 msgstr "Interzis"
 
-#: ../libpurple/protocols/jabber/jabber.c:1853
+#: ../libpurple/protocols/jabber/jabber.c:1867
 msgid "Gone"
 msgstr "Dus"
 
-#: ../libpurple/protocols/jabber/jabber.c:1855
-#: ../libpurple/protocols/jabber/jabber.c:1935
+#: ../libpurple/protocols/jabber/jabber.c:1869
+#: ../libpurple/protocols/jabber/jabber.c:1950
 msgid "Internal Server Error"
 msgstr "Eroare internă de server"
 
-#: ../libpurple/protocols/jabber/jabber.c:1857
+#: ../libpurple/protocols/jabber/jabber.c:1871
 msgid "Item Not Found"
 msgstr "Elementul nu a fost găsit"
 
-#: ../libpurple/protocols/jabber/jabber.c:1859
+#: ../libpurple/protocols/jabber/jabber.c:1873
 msgid "Malformed XMPP ID"
 msgstr "ID XMPP invalid"
 
-#: ../libpurple/protocols/jabber/jabber.c:1861
+#: ../libpurple/protocols/jabber/jabber.c:1875
 msgid "Not Acceptable"
 msgstr "Inacceptabil"
 
-#: ../libpurple/protocols/jabber/jabber.c:1863
-msgid "Not Allowed"
-msgstr "Nepermis"
-
-#: ../libpurple/protocols/jabber/jabber.c:1867
-msgid "Payment Required"
-msgstr "Această facilitate se plăteşte"
-
-#: ../libpurple/protocols/jabber/jabber.c:1869
-msgid "Recipient Unavailable"
-msgstr "Serviciu indisponibil"
-
-#: ../libpurple/protocols/jabber/jabber.c:1873
-msgid "Registration Required"
-msgstr "E nevoie de înregistrare"
-
-#: ../libpurple/protocols/jabber/jabber.c:1875
-msgid "Remote Server Not Found"
-msgstr "Serverul la distanţă nu a fost găsit"
-
 #: ../libpurple/protocols/jabber/jabber.c:1877
+msgid "Not Allowed"
+msgstr "Nepermis"
+
+#: ../libpurple/protocols/jabber/jabber.c:1881
+msgid "Payment Required"
+msgstr "Această facilitate se plăteşte"
+
+#: ../libpurple/protocols/jabber/jabber.c:1883
+msgid "Recipient Unavailable"
+msgstr "Serviciu indisponibil"
+
+#: ../libpurple/protocols/jabber/jabber.c:1887
+msgid "Registration Required"
+msgstr "E nevoie de înregistrare"
+
+#: ../libpurple/protocols/jabber/jabber.c:1889
+msgid "Remote Server Not Found"
+msgstr "Serverul la distanţă nu a fost găsit"
+
+#: ../libpurple/protocols/jabber/jabber.c:1891
 msgid "Remote Server Timeout"
 msgstr "Serverul la distanţă nu răspunde"
 
-#: ../libpurple/protocols/jabber/jabber.c:1879
+#: ../libpurple/protocols/jabber/jabber.c:1893
 msgid "Server Overloaded"
 msgstr "Server supraîncărcat"
 
-#: ../libpurple/protocols/jabber/jabber.c:1881
+#: ../libpurple/protocols/jabber/jabber.c:1895
 msgid "Service Unavailable"
 msgstr "Serviciu indisponibil"
 
-#: ../libpurple/protocols/jabber/jabber.c:1883
+#: ../libpurple/protocols/jabber/jabber.c:1897
 msgid "Subscription Required"
 msgstr "E nevoie de subscriere"
 
-#: ../libpurple/protocols/jabber/jabber.c:1885
+#: ../libpurple/protocols/jabber/jabber.c:1899
 msgid "Unexpected Request"
 msgstr "Cerere neaşteptată"
 
-#: ../libpurple/protocols/jabber/jabber.c:1892
+#: ../libpurple/protocols/jabber/jabber.c:1907
 msgid "Authorization Aborted"
 msgstr "Autorizare întreruptă"
 
-#: ../libpurple/protocols/jabber/jabber.c:1894
+#: ../libpurple/protocols/jabber/jabber.c:1909
 msgid "Incorrect encoding in authorization"
 msgstr "Codare incorectă la autorizare"
 
-#: ../libpurple/protocols/jabber/jabber.c:1897
+#: ../libpurple/protocols/jabber/jabber.c:1911
 msgid "Invalid authzid"
 msgstr "„Authzid” invalid"
 
-#: ../libpurple/protocols/jabber/jabber.c:1900
+#: ../libpurple/protocols/jabber/jabber.c:1913
 msgid "Invalid Authorization Mechanism"
 msgstr "Mecanism invalid de autorizare"
 
-#: ../libpurple/protocols/jabber/jabber.c:1903
+#: ../libpurple/protocols/jabber/jabber.c:1916
 msgid "Authorization mechanism too weak"
 msgstr "Mecanism de autorizare insuficient de sigur"
 
-#: ../libpurple/protocols/jabber/jabber.c:1911
+#: ../libpurple/protocols/jabber/jabber.c:1924
 msgid "Temporary Authentication Failure"
 msgstr "Eroare temporară de autentificare"
 
-#: ../libpurple/protocols/jabber/jabber.c:1914
+#: ../libpurple/protocols/jabber/jabber.c:1927
 msgid "Authentication Failure"
 msgstr "Eroare de autentificare"
 
-#: ../libpurple/protocols/jabber/jabber.c:1920
+#: ../libpurple/protocols/jabber/jabber.c:1935
 msgid "Bad Format"
 msgstr "Format greşit"
 
-#: ../libpurple/protocols/jabber/jabber.c:1922
+#: ../libpurple/protocols/jabber/jabber.c:1937
 msgid "Bad Namespace Prefix"
 msgstr "Prefixul pentru „namespace” este greşit"
 
-#: ../libpurple/protocols/jabber/jabber.c:1925
+#: ../libpurple/protocols/jabber/jabber.c:1940
 msgid "Resource Conflict"
 msgstr "Conflict de resurse"
 
-#: ../libpurple/protocols/jabber/jabber.c:1927
-#: ../libpurple/protocols/silc/silc.c:244
+#: ../libpurple/protocols/jabber/jabber.c:1942
+#: ../libpurple/protocols/silc/silc.c:350
 #: ../libpurple/protocols/silc10/ops.c:1720
 msgid "Connection Timeout"
 msgstr "Conexiunea a expirat"
 
-#: ../libpurple/protocols/jabber/jabber.c:1929
+#: ../libpurple/protocols/jabber/jabber.c:1944
 msgid "Host Gone"
 msgstr "Gazda a dispărut"
 
-#: ../libpurple/protocols/jabber/jabber.c:1931
+#: ../libpurple/protocols/jabber/jabber.c:1946
 msgid "Host Unknown"
 msgstr "Gazdă necunoscută"
 
-#: ../libpurple/protocols/jabber/jabber.c:1933
+#: ../libpurple/protocols/jabber/jabber.c:1948
 msgid "Improper Addressing"
 msgstr "Adresare neadecvată"
 
-#: ../libpurple/protocols/jabber/jabber.c:1937
+#: ../libpurple/protocols/jabber/jabber.c:1952
 msgid "Invalid ID"
 msgstr "Identitate invalidă"
 
-#: ../libpurple/protocols/jabber/jabber.c:1939
+#: ../libpurple/protocols/jabber/jabber.c:1954
 msgid "Invalid Namespace"
 msgstr "„Namespace” invalid"
 
-#: ../libpurple/protocols/jabber/jabber.c:1941
+#: ../libpurple/protocols/jabber/jabber.c:1956
 msgid "Invalid XML"
 msgstr "XML invalid"
 
-#: ../libpurple/protocols/jabber/jabber.c:1943
+#: ../libpurple/protocols/jabber/jabber.c:1958
 msgid "Non-matching Hosts"
 msgstr "Gazdele nu se potrivesc"
 
-#: ../libpurple/protocols/jabber/jabber.c:1947
+#: ../libpurple/protocols/jabber/jabber.c:1962
 msgid "Policy Violation"
 msgstr "Normele au fost încălcate"
 
-#: ../libpurple/protocols/jabber/jabber.c:1949
+#: ../libpurple/protocols/jabber/jabber.c:1964
 msgid "Remote Connection Failed"
 msgstr "Conexiunea la distanţă a eşuat"
 
-#: ../libpurple/protocols/jabber/jabber.c:1951
+#: ../libpurple/protocols/jabber/jabber.c:1966
 msgid "Resource Constraint"
 msgstr "Resurse limitate"
 
-#: ../libpurple/protocols/jabber/jabber.c:1953
+#: ../libpurple/protocols/jabber/jabber.c:1968
 msgid "Restricted XML"
 msgstr "XML restrictiv"
 
-#: ../libpurple/protocols/jabber/jabber.c:1955
+#: ../libpurple/protocols/jabber/jabber.c:1970
 msgid "See Other Host"
 msgstr "Verificaţi cealaltă gazdă"
 
-#: ../libpurple/protocols/jabber/jabber.c:1957
+#: ../libpurple/protocols/jabber/jabber.c:1972
 msgid "System Shutdown"
 msgstr "Închidere sistem"
 
-#: ../libpurple/protocols/jabber/jabber.c:1959
+#: ../libpurple/protocols/jabber/jabber.c:1974
 msgid "Undefined Condition"
 msgstr "Condiţie nedefinită"
 
-#: ../libpurple/protocols/jabber/jabber.c:1961
+#: ../libpurple/protocols/jabber/jabber.c:1976
 msgid "Unsupported Encoding"
 msgstr "Codare nesuportată"
 
-#: ../libpurple/protocols/jabber/jabber.c:1963
+#: ../libpurple/protocols/jabber/jabber.c:1978
 msgid "Unsupported Stanza Type"
 msgstr "Tip nesuportat de „stanza”"
 
-#: ../libpurple/protocols/jabber/jabber.c:1965
+#: ../libpurple/protocols/jabber/jabber.c:1980
 msgid "Unsupported Version"
 msgstr "Versiune nesuportată"
 
-#: ../libpurple/protocols/jabber/jabber.c:1967
+#: ../libpurple/protocols/jabber/jabber.c:1982
 msgid "XML Not Well Formed"
 msgstr "XML malformat"
 
-#: ../libpurple/protocols/jabber/jabber.c:1969
+#: ../libpurple/protocols/jabber/jabber.c:1984
 msgid "Stream Error"
 msgstr "Eroare de flux"
 
-#: ../libpurple/protocols/jabber/jabber.c:2052
+#: ../libpurple/protocols/jabber/jabber.c:2069
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Nu se poate interzice accesul utilizatorului %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2072
+#: ../libpurple/protocols/jabber/jabber.c:2089
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Afiliere necunoscută: „%s”"
 
-#: ../libpurple/protocols/jabber/jabber.c:2077
+#: ../libpurple/protocols/jabber/jabber.c:2094
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Utilizatorul %s nu poate fi afiliat ca „%s”"
 
-#: ../libpurple/protocols/jabber/jabber.c:2096
+#: ../libpurple/protocols/jabber/jabber.c:2113
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Rol necunoscut: „%s”"
 
-#: ../libpurple/protocols/jabber/jabber.c:2101
+#: ../libpurple/protocols/jabber/jabber.c:2118
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "Nu se poate seta rolul „%s” pentru utilizatorul: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2154
+#: ../libpurple/protocols/jabber/jabber.c:2171
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Nu se poate da afară utilizatorul %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2185
-#, fuzzy, c-format
+#: ../libpurple/protocols/jabber/jabber.c:2202
+#, c-format
 msgid "Unable to ping user %s"
-msgstr "Nu se poate interzice accesul utilizatorului %s"
-
-#: ../libpurple/protocols/jabber/jabber.c:2207
-#: ../libpurple/protocols/jabber/jabber.c:2217
+msgstr "Nu se poate da „ping” către utilizatorul %s"
+
+#: ../libpurple/protocols/jabber/jabber.c:2220
+#: ../libpurple/protocols/jabber/jabber.c:2231
 #, c-format
 msgid "Unable to buzz, because there is nothing known about user %s."
 msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:2213
+"Nu se poate da „buzz” pentru că nu se ştie nimic despre utilizatorul %s."
+
+#: ../libpurple/protocols/jabber/jabber.c:2226
 #, c-format
 msgid "Unable to buzz, because user %s might be offline."
 msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:2239
-#, fuzzy, c-format
+"Nu se poate da „buzz” pentru că utilizatorul %s ar putea fi deconectat."
+
+#: ../libpurple/protocols/jabber/jabber.c:2257
+#, c-format
 msgid "Unable to buzz, because the user %s does not support it."
 msgstr ""
-"Nu se poate trimite fişierul către %s, nu suportă transferul de fişiere"
-
-#: ../libpurple/protocols/jabber/jabber.c:2253
+"Nu se poate da „buzz” pentru că aplicaţia utilizatorului „%s” nu suportă "
+"acest lucru."
+
+#: ../libpurple/protocols/jabber/jabber.c:2279
+#: ../libpurple/protocols/yahoo/yahoo.c:4130
+msgid "Buzz"
+msgstr "Buzz!"
+
+#: ../libpurple/protocols/jabber/jabber.c:2280
+#: ../libpurple/protocols/jabber/message.c:308
+#: ../libpurple/protocols/yahoo/yahoo.c:4131
+#, c-format
+msgid "%s has buzzed you!"
+msgstr "%s v-a dat „buzz”!"
+
+#: ../libpurple/protocols/jabber/jabber.c:2281
+#: ../libpurple/protocols/yahoo/yahoo.c:4132
+#, c-format
+msgid "Buzzing %s..."
+msgstr "„Buzz” la %s..."
+
+#: ../libpurple/protocols/jabber/jabber.c:2313
 msgid "config:  Configure a chat room."
 msgstr "config:  Configuraţi o cameră de chat."
 
-#: ../libpurple/protocols/jabber/jabber.c:2257
+#: ../libpurple/protocols/jabber/jabber.c:2317
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Configuraţi o cameră de chat."
 
-#: ../libpurple/protocols/jabber/jabber.c:2266
+#: ../libpurple/protocols/jabber/jabber.c:2326
 msgid "part [room]:  Leave the room."
 msgstr "part [chat]:  Ieşiţi dintr-un chat."
 
-#: ../libpurple/protocols/jabber/jabber.c:2271
+#: ../libpurple/protocols/jabber/jabber.c:2331
 msgid "register:  Register with a chat room."
 msgstr "register:  Vă înregistraţi într-un chat."
 
-#: ../libpurple/protocols/jabber/jabber.c:2277
+#: ../libpurple/protocols/jabber/jabber.c:2337
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [subiect nou]: Verificaţi sau schimbaţi subiectul."
 
-#: ../libpurple/protocols/jabber/jabber.c:2283
+#: ../libpurple/protocols/jabber/jabber.c:2343
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr ""
 "ban &lt;nume ales&gt; [chat]:  Interziceţi unui utilizator accesul în chat."
 
-#: ../libpurple/protocols/jabber/jabber.c:2289
+#: ../libpurple/protocols/jabber/jabber.c:2349
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -6102,7 +6147,7 @@
 "affiliate &lt;nume ales&gt; &lt;deţinător|administrator|membru|renegat|"
 "niciuna&gt;:  Setaţi afilierea unui utilizator faţă de camera de chat."
 
-#: ../libpurple/protocols/jabber/jabber.c:2295
+#: ../libpurple/protocols/jabber/jabber.c:2355
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -6110,31 +6155,31 @@
 "role &lt;nume ales&gt; &lt;moderator|participant|vizitator|niciunul&gt;:  "
 "Setaţi rolul unui utilizator în camera de chat."
 
-#: ../libpurple/protocols/jabber/jabber.c:2301
+#: ../libpurple/protocols/jabber/jabber.c:2361
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;nume ales&gt; [chat]:  Invitaţi un utilizator într-un chat."
 
-#: ../libpurple/protocols/jabber/jabber.c:2307
+#: ../libpurple/protocols/jabber/jabber.c:2367
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;chat&gt; [server]:  Intraţi într-un chat al unui server."
 
-#: ../libpurple/protocols/jabber/jabber.c:2313
+#: ../libpurple/protocols/jabber/jabber.c:2373
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;alias&gt; [room]:  Daţi afară din chat un utilizator."
 
-#: ../libpurple/protocols/jabber/jabber.c:2318
+#: ../libpurple/protocols/jabber/jabber.c:2378
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 "msg &lt;nume ales&gt; &lt;mesaj&gt;:  Trimiteţi un mesaj privat unui alt "
 "utilizator."
 
-#: ../libpurple/protocols/jabber/jabber.c:2324
+#: ../libpurple/protocols/jabber/jabber.c:2384
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:2329
-#: ../libpurple/protocols/yahoo/yahoo.c:4145
+msgstr "ping &lt;jid&gt;:\tDaţi ping către utilizator/componentă/server."
+
+#: ../libpurple/protocols/jabber/jabber.c:2389
+#: ../libpurple/protocols/yahoo/yahoo.c:4156
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz:  Sâcâiţi un utilizator pentru a-i atrage atenţia"
 
@@ -6154,35 +6199,35 @@
 msgstr "Modul de protocol XMPP"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:202 ../pidgin/gtkaccount.c:506
+#: ../libpurple/protocols/jabber/libxmpp.c:205 ../pidgin/gtkaccount.c:509
 msgid "Domain"
 msgstr "Domeniu"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:210
+#: ../libpurple/protocols/jabber/libxmpp.c:213
 msgid "Require SSL/TLS"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/libxmpp.c:214
+msgstr "Necesită SSL/TLS"
+
+#: ../libpurple/protocols/jabber/libxmpp.c:217
 msgid "Force old (port 5223) SSL"
 msgstr "Impune utilizarea versiunii vechi de SSL (pe portul 5223)"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:219
+#: ../libpurple/protocols/jabber/libxmpp.c:222
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Permite autentificarea în clar prin conexiuni necriptate"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:224
-#: ../libpurple/protocols/myspace/myspace.c:3277
-#: ../libpurple/protocols/simple/simple.c:1902
+#: ../libpurple/protocols/jabber/libxmpp.c:227
+#: ../libpurple/protocols/myspace/myspace.c:3305
+#: ../libpurple/protocols/simple/simple.c:2089
 msgid "Connect port"
 msgstr "Port de conectare"
 
 #. TODO: default to automatically try different ports. Make the user be
 #. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
-#: ../libpurple/protocols/jabber/libxmpp.c:228
-#: ../libpurple/protocols/myspace/myspace.c:3274
-#: ../libpurple/protocols/silc/silc.c:1914
-#: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
+#: ../libpurple/protocols/jabber/libxmpp.c:231
+#: ../libpurple/protocols/myspace/myspace.c:3302
+#: ../libpurple/protocols/silc/silc.c:2057
+#: ../libpurple/protocols/silc10/silc.c:1860 ../pidgin/gtkaccount.c:840
 msgid "Connect server"
 msgstr "Server de conectare"
 
@@ -6191,55 +6236,49 @@
 msgid "%s has left the conversation."
 msgstr "%s a părăsit discuţia."
 
-#: ../libpurple/protocols/jabber/message.c:161
+#: ../libpurple/protocols/jabber/message.c:162
 #, c-format
 msgid "Message from %s"
 msgstr "Mesaj de la %s"
 
-#: ../libpurple/protocols/jabber/message.c:225
+#: ../libpurple/protocols/jabber/message.c:226
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s a schimbat topicul în: %s"
 
-#: ../libpurple/protocols/jabber/message.c:227
+#: ../libpurple/protocols/jabber/message.c:228
 #, c-format
 msgid "The topic is: %s"
 msgstr "Topicul este: %s"
 
-#: ../libpurple/protocols/jabber/message.c:275
+#: ../libpurple/protocols/jabber/message.c:276
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Trimiterea mesajului către %s a eşuat: %s"
 
-#: ../libpurple/protocols/jabber/message.c:278
+#: ../libpurple/protocols/jabber/message.c:279
 msgid "XMPP Message Error"
 msgstr "Eroare de mesaj XMPP"
 
-#: ../libpurple/protocols/jabber/message.c:307
-#: ../libpurple/protocols/yahoo/yahoo.c:4120
-#, fuzzy, c-format
-msgid "%s has buzzed you!"
-msgstr "%s v-a adăugat [%s]"
-
-#: ../libpurple/protocols/jabber/message.c:407
+#: ../libpurple/protocols/jabber/message.c:408
 #, c-format
 msgid " (Code %s)"
 msgstr " (Cod %s)"
 
-#: ../libpurple/protocols/jabber/parser.c:196
+#: ../libpurple/protocols/jabber/parser.c:198
 msgid "XML Parse error"
 msgstr "Eroare la analiza XML"
 
-#: ../libpurple/protocols/jabber/presence.c:427
+#: ../libpurple/protocols/jabber/presence.c:435
 msgid "Unknown Error in presence"
 msgstr "Eroare necunoscută în starea de prezenţă"
 
-#: ../libpurple/protocols/jabber/presence.c:508
-#: ../libpurple/protocols/jabber/presence.c:509
+#: ../libpurple/protocols/jabber/presence.c:516
+#: ../libpurple/protocols/jabber/presence.c:517
 msgid "Create New Room"
 msgstr "Creează o nouă cameră de chat"
 
-#: ../libpurple/protocols/jabber/presence.c:510
+#: ../libpurple/protocols/jabber/presence.c:518
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -6247,20 +6286,20 @@
 "Sunteţi pe cale să creaţi o nouă cameră de chat. Doriţi să o configuraţi sau "
 "acceptaţi setările implicite?"
 
-#: ../libpurple/protocols/jabber/presence.c:516
+#: ../libpurple/protocols/jabber/presence.c:524
 msgid "_Configure Room"
 msgstr "_Configurare cameră de chat"
 
-#: ../libpurple/protocols/jabber/presence.c:517
+#: ../libpurple/protocols/jabber/presence.c:525
 msgid "_Accept Defaults"
 msgstr "_Setări implicite"
 
-#: ../libpurple/protocols/jabber/presence.c:559
+#: ../libpurple/protocols/jabber/presence.c:567
 #, c-format
 msgid "Error in chat %s"
 msgstr "Eroare în camera de chat %s"
 
-#: ../libpurple/protocols/jabber/presence.c:563
+#: ../libpurple/protocols/jabber/presence.c:571
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Eroare la intrarea în camera de chat %s"
@@ -6302,64 +6341,64 @@
 msgid "Select a Resource"
 msgstr "Selectaţi o resursă"
 
-#: ../libpurple/protocols/jabber/usermood.c:179
-#: ../libpurple/protocols/jabber/usermood.c:180
-#, fuzzy
+#: ../libpurple/protocols/jabber/usermood.c:197
+#: ../libpurple/protocols/jabber/usermood.c:198
 msgid "Edit User Mood"
-msgstr "Moduri utilizator"
-
-#: ../libpurple/protocols/jabber/usermood.c:181
+msgstr "Editare dispoziţie utilizator"
+
+#: ../libpurple/protocols/jabber/usermood.c:199
 msgid "Please select your mood from the list."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/usermood.c:183
+msgstr "Selectaţi dispoziţia de moment din listă."
+
+#: ../libpurple/protocols/jabber/usermood.c:201
 #: ../libpurple/protocols/jabber/usernick.c:78
-#, fuzzy
 msgid "Set"
-msgstr "_Setează"
-
-#: ../libpurple/protocols/jabber/usermood.c:191
-#, fuzzy
+msgstr "Setare"
+
+#: ../libpurple/protocols/jabber/usermood.c:209
 msgid "Set Mood..."
-msgstr "Trimitere mesaj..."
+msgstr "Setare dispoziţie..."
 
 #: ../libpurple/protocols/jabber/usernick.c:76
-#, fuzzy
 msgid "Set User Nickname"
-msgstr "Setare limită utilizatori"
+msgstr "Setare pseudonim utilizator"
 
 #: ../libpurple/protocols/jabber/usernick.c:76
-#, fuzzy
 msgid "Please specify a new nickname for you."
-msgstr "Introduceţi noul nume pentru %s"
+msgstr "Setaţi-vă un nou pseudonim."
 
 #: ../libpurple/protocols/jabber/usernick.c:77
 msgid ""
 "This information is visible to all contacts on your contact list, so choose "
 "something appropriate."
 msgstr ""
-
-#: ../libpurple/protocols/jabber/usernick.c:99
-#, fuzzy
+"Această informaţie este vizibilă tuturor contactelor, aşa că e preferabil să "
+"alegeţi un pseudonim decent"
+
+#: ../libpurple/protocols/jabber/usernick.c:100
 msgid "Set Nickname..."
-msgstr "Pseudonim"
+msgstr "Setare pseudonim..."
 
 #: ../libpurple/protocols/jabber/xdata.c:378
-#, fuzzy
 msgid "Actions"
 msgstr "Acţiune"
 
 #: ../libpurple/protocols/jabber/xdata.c:380
-#, fuzzy
 msgid "Select an action"
-msgstr "Selectaţi un fişier"
-
-#: ../libpurple/protocols/msn/dialog.c:110
+msgstr "Selectaţi o acţiune"
+
+#: ../libpurple/protocols/msn/contact.c:712
+msgid "Unable to retrieve MSN Address Book"
+msgstr "Nu s-a putut descărca cartea de adrese MSN"
+
+#: ../libpurple/protocols/msn/dialog.c:118
+#: ../libpurple/protocols/msnp9/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "Probleme de sincronizare a liste de contacte în %s (%s)"
 
-#: ../libpurple/protocols/msn/dialog.c:116
+#: ../libpurple/protocols/msn/dialog.c:124
+#: ../libpurple/protocols/msnp9/dialog.c:116
 #, c-format
 msgid ""
 "%s on the local list is inside the group \"%s\" but not on the server list. "
@@ -6368,7 +6407,8 @@
 "%s din grupul „%s” e în lista contactelor, dar nu este în lista de pe "
 "server. Doriţi să adăugaţi acest contact?"
 
-#: ../libpurple/protocols/msn/dialog.c:124
+#: ../libpurple/protocols/msn/dialog.c:132
+#: ../libpurple/protocols/msnp9/dialog.c:124
 #, c-format
 msgid ""
 "%s is on the local list but not on the server list. Do you want this buddy "
@@ -6378,331 +6418,335 @@
 "adăugaţi acest contact?"
 
 #: ../libpurple/protocols/msn/error.c:36
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:36
 msgid "Unable to parse message"
 msgstr "Nu se poate prelucra mesajul"
 
 #: ../libpurple/protocols/msn/error.c:41
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:41
 msgid "Syntax Error (probably a client bug)"
 msgstr "Eroare de sintaxă (probabil o eroare de client)"
 
 #: ../libpurple/protocols/msn/error.c:46
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:46
 msgid "Invalid e-mail address"
 msgstr "Adresă de mail invalidă"
 
 #: ../libpurple/protocols/msn/error.c:49
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:49
 msgid "User does not exist"
 msgstr "Utilizator inexistent"
 
 #: ../libpurple/protocols/msn/error.c:53
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:53
 msgid "Fully qualified domain name missing"
 msgstr "Lipseşte numele complet al domeniului"
 
 #: ../libpurple/protocols/msn/error.c:56
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:56
 msgid "Already logged in"
 msgstr "Deja autentificat(ă)"
 
 #: ../libpurple/protocols/msn/error.c:59
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:59
 msgid "Invalid screen name"
 msgstr "Nume de identificare invalid"
 
 #: ../libpurple/protocols/msn/error.c:62
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:62
 msgid "Invalid friendly name"
 msgstr "Pseudonimul propriu este invalid"
 
 #: ../libpurple/protocols/msn/error.c:65
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:65
 msgid "List full"
 msgstr "Listă plină"
 
 #: ../libpurple/protocols/msn/error.c:68
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:68
 msgid "Already there"
 msgstr "Există deja"
 
 #: ../libpurple/protocols/msn/error.c:72
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:72
 msgid "Not on list"
 msgstr "Nu este în listă"
 
 #: ../libpurple/protocols/msn/error.c:75
+#: ../libpurple/protocols/msnp9/error.c:75
 #: ../libpurple/protocols/zephyr/zephyr.c:756
-#, c-format
 msgid "User is offline"
 msgstr "Utilizatorul este deconectat"
 
 #: ../libpurple/protocols/msn/error.c:78
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:78
 msgid "Already in the mode"
 msgstr "Sunteţi deja în respectiva stare"
 
 #: ../libpurple/protocols/msn/error.c:82
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:82
 msgid "Already in opposite list"
 msgstr "Există deja în cealaltă listă"
 
 #: ../libpurple/protocols/msn/error.c:86
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:86
 msgid "Too many groups"
 msgstr "Prea multe grupuri"
 
 #: ../libpurple/protocols/msn/error.c:89
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:89
 msgid "Invalid group"
 msgstr "Grup invalid"
 
 #: ../libpurple/protocols/msn/error.c:92
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:92
 msgid "User not in group"
 msgstr "Utilizatorul nu este în grup"
 
 #: ../libpurple/protocols/msn/error.c:95
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:95
 msgid "Group name too long"
 msgstr "Nume de grup prea lung"
 
 #: ../libpurple/protocols/msn/error.c:98
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:98
 msgid "Cannot remove group zero"
 msgstr "Nu se poate şterge grupul zero"
 
 #: ../libpurple/protocols/msn/error.c:103
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:103
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "S-a încercat adăugarea unui contact într-un grup inexistent"
 
 #: ../libpurple/protocols/msn/error.c:107
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:107
 msgid "Switchboard failed"
 msgstr "Comutare eşuată"
 
 #: ../libpurple/protocols/msn/error.c:111
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:111
 msgid "Notify transfer failed"
 msgstr "Notificarea transferului a eşuat"
 
 #: ../libpurple/protocols/msn/error.c:116
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:116
 msgid "Required fields missing"
 msgstr "Lipsesc unele câmpuri cerute"
 
 #: ../libpurple/protocols/msn/error.c:120
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:120
 msgid "Too many hits to a FND"
 msgstr "Prea multe solicitări către FND"
 
 #: ../libpurple/protocols/msn/error.c:124
+#: ../libpurple/protocols/msnp9/error.c:124
 #: ../libpurple/protocols/oscar/oscar.c:120
-#, c-format
 msgid "Not logged in"
 msgstr "Neautentificat(ă)"
 
 #: ../libpurple/protocols/msn/error.c:128
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:128
 msgid "Service temporarily unavailable"
 msgstr "Serviciu temporar indisponibil"
 
 #: ../libpurple/protocols/msn/error.c:131
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:131
 msgid "Database server error"
 msgstr "Eroare a serverului bazei de date"
 
 #: ../libpurple/protocols/msn/error.c:135
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:135
 msgid "Command disabled"
 msgstr "Comandă dezactivată"
 
 #: ../libpurple/protocols/msn/error.c:139
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:139
 msgid "File operation error"
 msgstr "Eroare la manipularea fişierului"
 
 #: ../libpurple/protocols/msn/error.c:143
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:143
 msgid "Memory allocation error"
 msgstr "Eroare la alocarea memoriei"
 
 #: ../libpurple/protocols/msn/error.c:147
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:147
 msgid "Wrong CHL value sent to server"
 msgstr "O valoare CHL greşită a fost trimisă către server"
 
 #: ../libpurple/protocols/msn/error.c:152
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:152
 msgid "Server busy"
 msgstr "Server ocupat"
 
 #: ../libpurple/protocols/msn/error.c:155
 #: ../libpurple/protocols/msn/error.c:170
 #: ../libpurple/protocols/msn/error.c:230
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:155
+#: ../libpurple/protocols/msnp9/error.c:170
+#: ../libpurple/protocols/msnp9/error.c:230
 msgid "Server unavailable"
 msgstr "Server indisponibil"
 
 #: ../libpurple/protocols/msn/error.c:158
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:158
 msgid "Peer notification server down"
 msgstr "Serverul de notificare a contactelor este indisponibil"
 
 #: ../libpurple/protocols/msn/error.c:162
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:162
 msgid "Database connect error"
 msgstr "Eroare la conectarea la baza de date"
 
 #: ../libpurple/protocols/msn/error.c:167
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:167
 msgid "Server is going down (abandon ship)"
 msgstr "Serverul va fi în curând indisponibil"
 
 #: ../libpurple/protocols/msn/error.c:174
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:174
 msgid "Error creating connection"
 msgstr "Eroare la stabilirea conexiunii"
 
 #: ../libpurple/protocols/msn/error.c:179
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:179
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "Parametrii CVR sunt necunoscuţi sau nu sunt permişi"
 
 #: ../libpurple/protocols/msn/error.c:183
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:183
 msgid "Unable to write"
 msgstr "Nu se poate scrie"
 
 #: ../libpurple/protocols/msn/error.c:186
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:186
 msgid "Session overload"
 msgstr "Sesiune supraîncărcată"
 
 #: ../libpurple/protocols/msn/error.c:190
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:190
 msgid "User is too active"
 msgstr "Utilizatorul este prea activ"
 
 #: ../libpurple/protocols/msn/error.c:193
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:193
 msgid "Too many sessions"
 msgstr "Prea multe sesiuni"
 
 #: ../libpurple/protocols/msn/error.c:196
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:196
 msgid "Passport not verified"
 msgstr "Cont „Passport” neverificat"
 
 #: ../libpurple/protocols/msn/error.c:199
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:199
 msgid "Bad friend file"
 msgstr "Fişier invalid"
 
 #: ../libpurple/protocols/msn/error.c:203
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:203
 msgid "Not expected"
 msgstr "Neaşteptat"
 
 #: ../libpurple/protocols/msn/error.c:209
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:209
 msgid "Friendly name changes too rapidly"
 msgstr "Pseudonimul a fost schimbat prea rapid"
 
 #: ../libpurple/protocols/msn/error.c:218
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:218
 msgid "Server too busy"
 msgstr "Server prea încărcat"
 
 #: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1380
-#: ../libpurple/protocols/silc/silc.c:233
+#: ../libpurple/protocols/msnp9/error.c:222
+#: ../libpurple/protocols/oscar/oscar.c:1377
+#: ../libpurple/protocols/silc/silc.c:338
 #: ../libpurple/protocols/silc10/ops.c:1709
-#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1380
-#, c-format
+#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1393
 msgid "Authentication failed"
 msgstr "Autentificare eşuată"
 
 #: ../libpurple/protocols/msn/error.c:225
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:225
 msgid "Not allowed when offline"
 msgstr "Permis doar la autentificare"
 
 #: ../libpurple/protocols/msn/error.c:233
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:233
 msgid "Not accepting new users"
 msgstr "Nu acceptă utilizatori noi"
 
 #: ../libpurple/protocols/msn/error.c:237
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:237
 msgid "Kids Passport without parental consent"
 msgstr "Cont „Kids Passport” fără aprobare de la părinţi"
 
 #: ../libpurple/protocols/msn/error.c:241
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:241
 msgid "Passport account not yet verified"
 msgstr "Cont „Passport” neverificat încă"
 
 #: ../libpurple/protocols/msn/error.c:244
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:244
 msgid "Bad ticket"
 msgstr "Bilet (ticket) greşit"
 
 #: ../libpurple/protocols/msn/error.c:249
+#: ../libpurple/protocols/msnp9/error.c:249
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "Cod de eroare necunoscut %d"
 
 #: ../libpurple/protocols/msn/error.c:263
+#: ../libpurple/protocols/msnp9/error.c:263
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "Eroare MSN: %s\n"
 
-#: ../libpurple/protocols/msn/msn.c:130
+#: ../libpurple/protocols/msn/msn.c:130 ../libpurple/protocols/msnp9/msn.c:130
 msgid "Nudge"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:131
-#, fuzzy, c-format
+msgstr "Buzz"
+
+#: ../libpurple/protocols/msn/msn.c:131 ../libpurple/protocols/msnp9/msn.c:131
+#, c-format
 msgid "%s has nudged you!"
-msgstr "%s v-a adăugat [%s]"
-
-#: ../libpurple/protocols/msn/msn.c:132
+msgstr "%s v-a dat „buzz”!"
+
+#: ../libpurple/protocols/msn/msn.c:132 ../libpurple/protocols/msnp9/msn.c:132
 #, c-format
 msgid "Nudging %s..."
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:174
+msgstr "„Buzz” la %s..."
+
+#: ../libpurple/protocols/msn/msn.c:174 ../libpurple/protocols/msnp9/msn.c:174
 msgid "Your new MSN friendly name is too long."
 msgstr "Noul pseudonim propriu MSN este prea lung."
 
-#: ../libpurple/protocols/msn/msn.c:282
+#: ../libpurple/protocols/msn/msn.c:286 ../libpurple/protocols/msnp9/msn.c:282
 msgid "Set your friendly name."
 msgstr "Setare pseudonim propriu."
 
-#: ../libpurple/protocols/msn/msn.c:283
+#: ../libpurple/protocols/msn/msn.c:287 ../libpurple/protocols/msnp9/msn.c:283
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Acesta este numele sub care veţi fi cunoscuţi de contactele MSN."
 
-#: ../libpurple/protocols/msn/msn.c:301
+#: ../libpurple/protocols/msn/msn.c:305 ../libpurple/protocols/msnp9/msn.c:301
 msgid "Set your home phone number."
 msgstr "Introduceţi numărul telefonului de acasă."
 
-#: ../libpurple/protocols/msn/msn.c:318
+#: ../libpurple/protocols/msn/msn.c:322 ../libpurple/protocols/msnp9/msn.c:318
 msgid "Set your work phone number."
 msgstr "Introduceţi numărul telefonului de la serviciu."
 
-#: ../libpurple/protocols/msn/msn.c:335
+#: ../libpurple/protocols/msn/msn.c:339 ../libpurple/protocols/msnp9/msn.c:335
 msgid "Set your mobile phone number."
 msgstr "Introduceţi numărul telefonului mobil."
 
-#: ../libpurple/protocols/msn/msn.c:350
+#: ../libpurple/protocols/msn/msn.c:354 ../libpurple/protocols/msnp9/msn.c:350
 msgid "Allow MSN Mobile pages?"
 msgstr "Permit pagini „MSN Mobile”?"
 
-#: ../libpurple/protocols/msn/msn.c:351
+#: ../libpurple/protocols/msn/msn.c:355 ../libpurple/protocols/msnp9/msn.c:351
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -6710,322 +6754,391 @@
 "Vreţi să permiteţi persoanelor din lista de contacte să trimită pagini „MSN "
 "Mobile” către telefonul dumneavoastră mobil sau alte dispozitive portabile?"
 
-#: ../libpurple/protocols/msn/msn.c:357
+#: ../libpurple/protocols/msn/msn.c:361 ../libpurple/protocols/msnp9/msn.c:357
 msgid "Allow"
 msgstr "Permite"
 
-#: ../libpurple/protocols/msn/msn.c:358
+#: ../libpurple/protocols/msn/msn.c:362 ../libpurple/protocols/msnp9/msn.c:358
 msgid "Disallow"
 msgstr "Refuză"
 
-#: ../libpurple/protocols/msn/msn.c:374
+#: ../libpurple/protocols/msn/msn.c:378 ../libpurple/protocols/msnp9/msn.c:374
 msgid "This Hotmail account may not be active."
 msgstr "Acest cont Hotmail s-ar putea să nu mai fie activ."
 
-#: ../libpurple/protocols/msn/msn.c:400
+#: ../libpurple/protocols/msn/msn.c:404 ../libpurple/protocols/msnp9/msn.c:400
 msgid "Send a mobile message."
 msgstr "Trimiteţi un mesaj mobil."
 
-#: ../libpurple/protocols/msn/msn.c:402
+#: ../libpurple/protocols/msn/msn.c:406 ../libpurple/protocols/msnp9/msn.c:402
 msgid "Page"
 msgstr "Pagină"
 
-#: ../libpurple/protocols/msn/msn.c:549
-msgid "Has you"
-msgstr "Vă are în listă"
-
-#: ../libpurple/protocols/msn/msn.c:579 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:3077
-#: ../libpurple/protocols/yahoo/yahoo.c:3761
+#: ../libpurple/protocols/msn/msn.c:688 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/msnp9/msn.c:583
+#: ../libpurple/protocols/msnp9/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:3088
+#: ../libpurple/protocols/yahoo/yahoo.c:3772
 msgid "Be Right Back"
 msgstr "Vin imediat"
 
-#: ../libpurple/protocols/msn/msn.c:583 ../libpurple/protocols/msn/state.c:31
-#: ../libpurple/protocols/novell/novell.c:2822
-#: ../libpurple/protocols/novell/novell.c:2952
-#: ../libpurple/protocols/silc/buddy.c:1480
+#: ../libpurple/protocols/msn/msn.c:694 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/msnp9/msn.c:587
+#: ../libpurple/protocols/msnp9/state.c:31
+#: ../libpurple/protocols/novell/novell.c:2839
+#: ../libpurple/protocols/novell/novell.c:2969
+#: ../libpurple/protocols/silc/buddy.c:1483
 #: ../libpurple/protocols/silc/silc.c:56
-#: ../libpurple/protocols/silc10/buddy.c:1480
+#: ../libpurple/protocols/silc10/buddy.c:1483
 #: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:3079
-#: ../libpurple/protocols/yahoo/yahoo.c:3764
+#: ../libpurple/protocols/yahoo/yahoo.c:3090
+#: ../libpurple/protocols/yahoo/yahoo.c:3775
 msgid "Busy"
 msgstr "Ocupat(ă)"
 
-#: ../libpurple/protocols/msn/msn.c:587
-#: ../libpurple/protocols/yahoo/yahoo.c:3087
-#: ../libpurple/protocols/yahoo/yahoo.c:3776
+#: ../libpurple/protocols/msn/msn.c:699 ../libpurple/protocols/msnp9/msn.c:591
+#: ../libpurple/protocols/yahoo/yahoo.c:3098
+#: ../libpurple/protocols/yahoo/yahoo.c:3787
 msgid "On the Phone"
 msgstr "La telefon"
 
-#: ../libpurple/protocols/msn/msn.c:591
-#: ../libpurple/protocols/yahoo/yahoo.c:3091
-#: ../libpurple/protocols/yahoo/yahoo.c:3782
+#: ../libpurple/protocols/msn/msn.c:704 ../libpurple/protocols/msnp9/msn.c:595
+#: ../libpurple/protocols/yahoo/yahoo.c:3102
+#: ../libpurple/protocols/yahoo/yahoo.c:3793
 msgid "Out to Lunch"
 msgstr "La masă"
 
-#: ../libpurple/protocols/msn/msn.c:619
+#: ../libpurple/protocols/msn/msn.c:723
+msgid "Artist"
+msgstr "Artist"
+
+#: ../libpurple/protocols/msn/msn.c:724
+msgid "Album"
+msgstr "Album"
+
+#: ../libpurple/protocols/msn/msn.c:742 ../libpurple/protocols/msnp9/msn.c:623
 msgid "Set Friendly Name..."
 msgstr "Setare pseudonim..."
 
-#: ../libpurple/protocols/msn/msn.c:624
+#: ../libpurple/protocols/msn/msn.c:747 ../libpurple/protocols/msnp9/msn.c:628
 msgid "Set Home Phone Number..."
 msgstr "Setare număr telefon acasă..."
 
-#: ../libpurple/protocols/msn/msn.c:628
+#: ../libpurple/protocols/msn/msn.c:751 ../libpurple/protocols/msnp9/msn.c:632
 msgid "Set Work Phone Number..."
 msgstr "Setare număr telefon serviciu..."
 
-#: ../libpurple/protocols/msn/msn.c:632
+#: ../libpurple/protocols/msn/msn.c:755 ../libpurple/protocols/msnp9/msn.c:636
 msgid "Set Mobile Phone Number..."
 msgstr "Setare număr telefon mobil..."
 
-#: ../libpurple/protocols/msn/msn.c:638
+#: ../libpurple/protocols/msn/msn.c:761 ../libpurple/protocols/msnp9/msn.c:642
 msgid "Enable/Disable Mobile Devices..."
 msgstr "(Dez)Activare dispozitive mobile..."
 
-#: ../libpurple/protocols/msn/msn.c:643
+#: ../libpurple/protocols/msn/msn.c:766 ../libpurple/protocols/msnp9/msn.c:647
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Permitere/Refuzare pagini mobile..."
 
-#: ../libpurple/protocols/msn/msn.c:654
+#: ../libpurple/protocols/msn/msn.c:777 ../libpurple/protocols/msnp9/msn.c:658
 msgid "Open Hotmail Inbox"
 msgstr "Deschidere mail Hotmail"
 
-#: ../libpurple/protocols/msn/msn.c:678
+#: ../libpurple/protocols/msn/msn.c:801 ../libpurple/protocols/msnp9/msn.c:682
 msgid "Send to Mobile"
 msgstr "Trimite către mobil"
 
-#: ../libpurple/protocols/msn/msn.c:688
-#: ../libpurple/protocols/novell/novell.c:3408
+#: ../libpurple/protocols/msn/msn.c:811 ../libpurple/protocols/msnp9/msn.c:692
+#: ../libpurple/protocols/novell/novell.c:3425
 msgid "Initiate _Chat"
 msgstr "Iniţiază o _discuţie"
 
-#: ../libpurple/protocols/msn/msn.c:726
+#: ../libpurple/protocols/msn/msn.c:849 ../libpurple/protocols/msnp9/msn.c:731
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 "Pentru MSN aveţi nevoie de suport SSL. Instalaţi bibliotecile SSL necesare. "
 
-#: ../libpurple/protocols/msn/msn.c:754
+#: ../libpurple/protocols/msn/msn.c:879 ../libpurple/protocols/msnp9/msn.c:761
 msgid "Failed to connect to server."
 msgstr "Conectarea la server a eşuat."
 
-#: ../libpurple/protocols/msn/msn.c:1510 ../libpurple/protocols/msn/msn.c:1858
+#: ../libpurple/protocols/msn/msn.c:1663 ../libpurple/protocols/msn/msn.c:2006
+#: ../libpurple/protocols/msnp9/msn.c:1516
+#: ../libpurple/protocols/msnp9/msn.c:1859
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "Eroare la descărcarea profilului"
 
-#: ../libpurple/protocols/msn/msn.c:1581 ../pidgin/plugins/convcolors.c:309
-#: ../pidgin/plugins/pidginrc.c:366
+#: ../libpurple/protocols/msn/msn.c:1729
+#: ../libpurple/protocols/msnp9/msn.c:1582 ../pidgin/plugins/convcolors.c:309
+#: ../pidgin/plugins/pidginrc.c:360
 msgid "General"
 msgstr "Generale"
 
-#: ../libpurple/protocols/msn/msn.c:1588
-#: ../libpurple/protocols/myspace/user.c:110
-#: ../libpurple/protocols/oscar/oscar.c:3755
+#: ../libpurple/protocols/msn/msn.c:1736
+#: ../libpurple/protocols/msnp9/msn.c:1589
+#: ../libpurple/protocols/myspace/user.c:115
+#: ../libpurple/protocols/oscar/oscar.c:3765
 #: ../libpurple/protocols/qq/buddy_info.c:45
-#: ../libpurple/protocols/qq/qq.c:221
+#: ../libpurple/protocols/qq/qq.c:222
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "Vârstă"
 
-#: ../libpurple/protocols/msn/msn.c:1590
+#: ../libpurple/protocols/msn/msn.c:1738
+#: ../libpurple/protocols/msnp9/msn.c:1591
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr "Ocupaţie"
 
-#: ../libpurple/protocols/msn/msn.c:1591
-#: ../libpurple/protocols/myspace/user.c:119
-#: ../libpurple/protocols/novell/novell.c:1478
+#: ../libpurple/protocols/msn/msn.c:1739
+#: ../libpurple/protocols/msnp9/msn.c:1592
+#: ../libpurple/protocols/myspace/user.c:123
+#: ../libpurple/protocols/novell/novell.c:1487
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
 #: ../libpurple/protocols/zephyr/zephyr.c:798
 #: ../libpurple/protocols/zephyr/zephyr.c:1215
 msgid "Location"
 msgstr "Locaţie"
 
-#: ../libpurple/protocols/msn/msn.c:1596 ../libpurple/protocols/msn/msn.c:1788
-#: ../libpurple/protocols/msn/msn.c:1794 ../libpurple/protocols/msn/msn.c:1801
+#: ../libpurple/protocols/msn/msn.c:1744 ../libpurple/protocols/msn/msn.c:1936
+#: ../libpurple/protocols/msn/msn.c:1942 ../libpurple/protocols/msn/msn.c:1949
+#: ../libpurple/protocols/msnp9/msn.c:1597
+#: ../libpurple/protocols/msnp9/msn.c:1789
+#: ../libpurple/protocols/msnp9/msn.c:1795
+#: ../libpurple/protocols/msnp9/msn.c:1802
 msgid "Hobbies and Interests"
 msgstr "Hobby-uri şi domenii de interes"
 
-#: ../libpurple/protocols/msn/msn.c:1602 ../libpurple/protocols/msn/msn.c:1722
-#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1735
-#: ../libpurple/protocols/msn/msn.c:1743 ../libpurple/protocols/msn/msn.c:1750
+#: ../libpurple/protocols/msn/msn.c:1750 ../libpurple/protocols/msn/msn.c:1870
+#: ../libpurple/protocols/msn/msn.c:1876 ../libpurple/protocols/msn/msn.c:1883
+#: ../libpurple/protocols/msn/msn.c:1891 ../libpurple/protocols/msn/msn.c:1898
+#: ../libpurple/protocols/msnp9/msn.c:1603
+#: ../libpurple/protocols/msnp9/msn.c:1723
+#: ../libpurple/protocols/msnp9/msn.c:1729
+#: ../libpurple/protocols/msnp9/msn.c:1736
+#: ../libpurple/protocols/msnp9/msn.c:1744
+#: ../libpurple/protocols/msnp9/msn.c:1751
 msgid "A Little About Me"
 msgstr "Câteva cuvinte despre mine"
 
-#: ../libpurple/protocols/msn/msn.c:1619
+#: ../libpurple/protocols/msn/msn.c:1767
+#: ../libpurple/protocols/msnp9/msn.c:1620
 msgid "Social"
 msgstr "Social"
 
-#: ../libpurple/protocols/msn/msn.c:1621
+#: ../libpurple/protocols/msn/msn.c:1769
+#: ../libpurple/protocols/msnp9/msn.c:1622
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "Status marital"
 
-#: ../libpurple/protocols/msn/msn.c:1622
+#: ../libpurple/protocols/msn/msn.c:1770
+#: ../libpurple/protocols/msnp9/msn.c:1623
 msgid "Interests"
 msgstr "Domenii de interes"
 
-#: ../libpurple/protocols/msn/msn.c:1623
+#: ../libpurple/protocols/msn/msn.c:1771
+#: ../libpurple/protocols/msnp9/msn.c:1624
 msgid "Pets"
 msgstr "Animale de casă"
 
-#: ../libpurple/protocols/msn/msn.c:1624
+#: ../libpurple/protocols/msn/msn.c:1772
+#: ../libpurple/protocols/msnp9/msn.c:1625
 msgid "Hometown"
 msgstr "Localitate natală"
 
-#: ../libpurple/protocols/msn/msn.c:1625
+#: ../libpurple/protocols/msn/msn.c:1773
+#: ../libpurple/protocols/msnp9/msn.c:1626
 msgid "Places Lived"
 msgstr "Foste domicilii"
 
-#: ../libpurple/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/msn/msn.c:1774
+#: ../libpurple/protocols/msnp9/msn.c:1627
 msgid "Fashion"
 msgstr "Modă"
 
-#: ../libpurple/protocols/msn/msn.c:1627
+#: ../libpurple/protocols/msn/msn.c:1775
+#: ../libpurple/protocols/msnp9/msn.c:1628
 msgid "Humor"
 msgstr "Umor"
 
-#: ../libpurple/protocols/msn/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1776
+#: ../libpurple/protocols/msnp9/msn.c:1629
 msgid "Music"
 msgstr "Muzică"
 
-#: ../libpurple/protocols/msn/msn.c:1629 ../libpurple/protocols/msn/msn.c:1810
-#: ../libpurple/protocols/msn/msn.c:1816
+#: ../libpurple/protocols/msn/msn.c:1777 ../libpurple/protocols/msn/msn.c:1958
+#: ../libpurple/protocols/msn/msn.c:1964
+#: ../libpurple/protocols/msnp9/msn.c:1630
+#: ../libpurple/protocols/msnp9/msn.c:1811
+#: ../libpurple/protocols/msnp9/msn.c:1817
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Favorite Quote"
 msgstr "Citat preferat"
 
-#: ../libpurple/protocols/msn/msn.c:1646
+#: ../libpurple/protocols/msn/msn.c:1794
+#: ../libpurple/protocols/msnp9/msn.c:1647
 msgid "Contact Info"
 msgstr "Detalii contact"
 
-#: ../libpurple/protocols/msn/msn.c:1647
+#: ../libpurple/protocols/msn/msn.c:1795
+#: ../libpurple/protocols/msnp9/msn.c:1648
 msgid "Personal"
 msgstr "Personale"
 
-#: ../libpurple/protocols/msn/msn.c:1650
+#: ../libpurple/protocols/msn/msn.c:1798
+#: ../libpurple/protocols/msnp9/msn.c:1651
 msgid "Significant Other"
 msgstr "Partener"
 
-#: ../libpurple/protocols/msn/msn.c:1651
+#: ../libpurple/protocols/msn/msn.c:1799
+#: ../libpurple/protocols/msnp9/msn.c:1652
 msgid "Home Phone"
 msgstr "Telefon acasă"
 
-#: ../libpurple/protocols/msn/msn.c:1652
+#: ../libpurple/protocols/msn/msn.c:1800
+#: ../libpurple/protocols/msnp9/msn.c:1653
 msgid "Home Phone 2"
 msgstr "Telefon acasă 2"
 
-#: ../libpurple/protocols/msn/msn.c:1653
-#: ../libpurple/protocols/oscar/oscar.c:3793
+#: ../libpurple/protocols/msn/msn.c:1801
+#: ../libpurple/protocols/msnp9/msn.c:1654
+#: ../libpurple/protocols/oscar/oscar.c:3803
 msgid "Home Address"
 msgstr "Adresă acasă"
 
-#: ../libpurple/protocols/msn/msn.c:1654
+#: ../libpurple/protocols/msn/msn.c:1802
+#: ../libpurple/protocols/msnp9/msn.c:1655
 msgid "Personal Mobile"
 msgstr "Mobil privat"
 
-#: ../libpurple/protocols/msn/msn.c:1655
+#: ../libpurple/protocols/msn/msn.c:1803
+#: ../libpurple/protocols/msnp9/msn.c:1656
 msgid "Home Fax"
 msgstr "Fax acasă"
 
-#: ../libpurple/protocols/msn/msn.c:1656
+#: ../libpurple/protocols/msn/msn.c:1804
+#: ../libpurple/protocols/msnp9/msn.c:1657
 msgid "Personal E-Mail"
 msgstr "Mail privat"
 
-#: ../libpurple/protocols/msn/msn.c:1657
+#: ../libpurple/protocols/msn/msn.c:1805
+#: ../libpurple/protocols/msnp9/msn.c:1658
 msgid "Personal IM"
 msgstr "IM privat"
 
-#: ../libpurple/protocols/msn/msn.c:1659
+#: ../libpurple/protocols/msn/msn.c:1807
+#: ../libpurple/protocols/msnp9/msn.c:1660
 msgid "Anniversary"
 msgstr "Aniversare"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1675
+#: ../libpurple/protocols/msn/msn.c:1823
+#: ../libpurple/protocols/msnp9/msn.c:1676
 msgid "Work"
 msgstr "Serviciu"
 
-#: ../libpurple/protocols/msn/msn.c:1677
+#: ../libpurple/protocols/msn/msn.c:1825
+#: ../libpurple/protocols/msnp9/msn.c:1678
 #: ../libpurple/protocols/silc/ops.c:1010
 #: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Titlu"
 
-#: ../libpurple/protocols/msn/msn.c:1678
-#: ../libpurple/protocols/oscar/oscar.c:3814
+#: ../libpurple/protocols/msn/msn.c:1826
+#: ../libpurple/protocols/msnp9/msn.c:1679
+#: ../libpurple/protocols/oscar/oscar.c:3824
 msgid "Company"
 msgstr "Companie"
 
-#: ../libpurple/protocols/msn/msn.c:1679
-#: ../libpurple/protocols/novell/novell.c:1480
+#: ../libpurple/protocols/msn/msn.c:1827
+#: ../libpurple/protocols/msnp9/msn.c:1680
+#: ../libpurple/protocols/novell/novell.c:1489
 msgid "Department"
 msgstr "Departament"
 
-#: ../libpurple/protocols/msn/msn.c:1680
+#: ../libpurple/protocols/msn/msn.c:1828
+#: ../libpurple/protocols/msnp9/msn.c:1681
 msgid "Profession"
 msgstr "Profesie"
 
-#: ../libpurple/protocols/msn/msn.c:1681
+#: ../libpurple/protocols/msn/msn.c:1829
+#: ../libpurple/protocols/msnp9/msn.c:1682
 msgid "Work Phone"
 msgstr "Telefon serviciu"
 
-#: ../libpurple/protocols/msn/msn.c:1682
+#: ../libpurple/protocols/msn/msn.c:1830
+#: ../libpurple/protocols/msnp9/msn.c:1683
 msgid "Work Phone 2"
 msgstr "Telefon serviciu 2"
 
-#: ../libpurple/protocols/msn/msn.c:1683
-#: ../libpurple/protocols/oscar/oscar.c:3806
+#: ../libpurple/protocols/msn/msn.c:1831
+#: ../libpurple/protocols/msnp9/msn.c:1684
+#: ../libpurple/protocols/oscar/oscar.c:3816
 msgid "Work Address"
 msgstr "Adresă serviciu"
 
-#: ../libpurple/protocols/msn/msn.c:1684
+#: ../libpurple/protocols/msn/msn.c:1832
+#: ../libpurple/protocols/msnp9/msn.c:1685
 msgid "Work Mobile"
 msgstr "Mobil serviciu"
 
-#: ../libpurple/protocols/msn/msn.c:1685
+#: ../libpurple/protocols/msn/msn.c:1833
+#: ../libpurple/protocols/msnp9/msn.c:1686
 msgid "Work Pager"
 msgstr "Pager serviciu"
 
-#: ../libpurple/protocols/msn/msn.c:1686
+#: ../libpurple/protocols/msn/msn.c:1834
+#: ../libpurple/protocols/msnp9/msn.c:1687
 msgid "Work Fax"
 msgstr "Fax serviciu"
 
-#: ../libpurple/protocols/msn/msn.c:1687
+#: ../libpurple/protocols/msn/msn.c:1835
+#: ../libpurple/protocols/msnp9/msn.c:1688
 msgid "Work E-Mail"
 msgstr "Mail serviciu"
 
-#: ../libpurple/protocols/msn/msn.c:1688
+#: ../libpurple/protocols/msn/msn.c:1836
+#: ../libpurple/protocols/msnp9/msn.c:1689
 msgid "Work IM"
 msgstr "IM serviciu"
 
-#: ../libpurple/protocols/msn/msn.c:1689
+#: ../libpurple/protocols/msn/msn.c:1837
+#: ../libpurple/protocols/msnp9/msn.c:1690
 msgid "Start Date"
 msgstr "Începând cu:"
 
-#: ../libpurple/protocols/msn/msn.c:1759 ../libpurple/protocols/msn/msn.c:1765
-#: ../libpurple/protocols/msn/msn.c:1772 ../libpurple/protocols/msn/msn.c:1779
+#: ../libpurple/protocols/msn/msn.c:1907 ../libpurple/protocols/msn/msn.c:1913
+#: ../libpurple/protocols/msn/msn.c:1920 ../libpurple/protocols/msn/msn.c:1927
+#: ../libpurple/protocols/msnp9/msn.c:1760
+#: ../libpurple/protocols/msnp9/msn.c:1766
+#: ../libpurple/protocols/msnp9/msn.c:1773
+#: ../libpurple/protocols/msnp9/msn.c:1780
 msgid "Favorite Things"
 msgstr "Lucruri favorite"
 
-#: ../libpurple/protocols/msn/msn.c:1824
+#: ../libpurple/protocols/msn/msn.c:1972
+#: ../libpurple/protocols/msnp9/msn.c:1825
 msgid "Last Updated"
 msgstr "Ultima actualizare"
 
-#: ../libpurple/protocols/msn/msn.c:1835
+#: ../libpurple/protocols/msn/msn.c:1983
+#: ../libpurple/protocols/msnp9/msn.c:1836
 #: ../libpurple/protocols/qq/buddy_info.c:60
 #: ../libpurple/protocols/silc/ops.c:1026
 #: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "Pagină personală"
 
-#: ../libpurple/protocols/msn/msn.c:1859
+#: ../libpurple/protocols/msn/msn.c:2007
+#: ../libpurple/protocols/msnp9/msn.c:1860
 msgid "The user has not created a public profile."
 msgstr "Utilizatorul nu şi-a creat un profil public."
 
-#: ../libpurple/protocols/msn/msn.c:1860
+#: ../libpurple/protocols/msn/msn.c:2008
+#: ../libpurple/protocols/msnp9/msn.c:1861
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
@@ -7035,7 +7148,8 @@
 "înseamnă că utilizatorul fie nu există, fie există, dar nu şi-a creat un "
 "profil public."
 
-#: ../libpurple/protocols/msn/msn.c:1864
+#: ../libpurple/protocols/msn/msn.c:2012
+#: ../libpurple/protocols/msnp9/msn.c:1865
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
@@ -7043,7 +7157,8 @@
 "Nu s-a găsit nici o informaţie în profilul utilizatorului. Probabil că "
 "utilizatorul nu există."
 
-#: ../libpurple/protocols/msn/msn.c:1872
+#: ../libpurple/protocols/msn/msn.c:2020
+#: ../libpurple/protocols/msnp9/msn.c:1873
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "Adresă profil"
@@ -7058,101 +7173,130 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2158 ../libpurple/protocols/msn/msn.c:2160
-msgid "MSN Protocol Plugin"
-msgstr "Modul de protocol MSN"
-
-#: ../libpurple/protocols/msn/msn.c:2194
+#: ../libpurple/protocols/msn/msn.c:2307 ../libpurple/protocols/msn/msn.c:2309
+msgid "Windows Live Messenger Protocol Plugin"
+msgstr "Modul de protocol Windows Live Messenger"
+
+#: ../libpurple/protocols/msn/msn.c:2344
+#: ../libpurple/protocols/msnp9/msn.c:2195
 msgid "Use HTTP Method"
 msgstr "Utilizează metoda HTTP"
 
-#: ../libpurple/protocols/msn/msn.c:2199
-#, fuzzy
+#: ../libpurple/protocols/msn/msn.c:2349
+#: ../libpurple/protocols/msnp9/msn.c:2200
 msgid "HTTP Method Server"
-msgstr "Server de test IPC"
-
-#: ../libpurple/protocols/msn/msn.c:2204
+msgstr "Server pentru metoda HTTP"
+
+#: ../libpurple/protocols/msn/msn.c:2354
+#: ../libpurple/protocols/msnp9/msn.c:2205
 msgid "Show custom smileys"
 msgstr "Arată iconiţe simbolice personalizate"
 
-#: ../libpurple/protocols/msn/msn.c:2212
+#: ../libpurple/protocols/msn/msn.c:2362
+#: ../libpurple/protocols/msnp9/msn.c:2213
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge:  Sâcâiţi un utilizator pentru a-i atrage atenţia"
 
-#: ../libpurple/protocols/msn/nexus.c:146
-#: ../libpurple/protocols/msn/servconn.c:135
-#: ../libpurple/protocols/qq/qq_proxy.c:242
-#: ../libpurple/protocols/qq/qq_proxy.c:321
-#: ../libpurple/protocols/qq/qq_proxy.c:366
-#: ../libpurple/protocols/qq/qq_proxy.c:399
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:63
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:163
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:187
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:200
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:229
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:243
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:268
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:302
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:332
-#: ../libpurple/protocols/yahoo/yahoochat.c:1416
-#: ../libpurple/protocols/yahoo/yahoochat.c:1442
-msgid "Unable to connect"
-msgstr "Conectare eşuată"
-
-#: ../libpurple/protocols/msn/notification.c:178
+#: ../libpurple/protocols/msn/nexus.c:70
+msgid "Windows Live ID authentication:Unable to connect"
+msgstr "Autentificare Windows Live ID: Conectare eşuată"
+
+#. we must have failed!
+#: ../libpurple/protocols/msn/nexus.c:126
+msgid ""
+"Windows Live ID authentication: cannot find authenticate token in server "
+"response"
+msgstr ""
+"Autentificare Windows Live ID: nu s-a găsit un „token” de autentificare în "
+"răspunsul de la server"
+
+#: ../libpurple/protocols/msn/nexus.c:172
+msgid "Windows Live ID authentication Failed"
+msgstr "Autentificarea Windows Live ID a eşuat!"
+
+#: ../libpurple/protocols/msn/notification.c:185
+#: ../libpurple/protocols/msnp9/notification.c:178
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s nu este un nume valid de grup."
 
-#: ../libpurple/protocols/msn/notification.c:184
-#: ../libpurple/protocols/msn/notification.c:532
-#: ../libpurple/protocols/msn/session.c:330
+#: ../libpurple/protocols/msn/notification.c:191
+#: ../libpurple/protocols/msn/notification.c:931
+#: ../libpurple/protocols/msn/session.c:387
+#: ../libpurple/protocols/msnp9/notification.c:184
+#: ../libpurple/protocols/msnp9/notification.c:532
+#: ../libpurple/protocols/msnp9/session.c:340
 msgid "Unknown error."
 msgstr "Eroare necunoscută."
 
-#: ../libpurple/protocols/msn/notification.c:187
+#: ../libpurple/protocols/msn/notification.c:194
+#: ../libpurple/protocols/msnp9/notification.c:187
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s în %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:498
+#: ../libpurple/protocols/msn/notification.c:509
+#, c-format
+msgid "%s just sent you a Nudge!"
+msgstr "%s vă sâcâie cu un „nudge”!"
+
+#: ../libpurple/protocols/msn/notification.c:836
+#, c-format
+msgid "Unknown error (%d)"
+msgstr "Eroare necunoscută (%d)"
+
+#: ../libpurple/protocols/msn/notification.c:837
+#: ../libpurple/protocols/sametime/sametime.c:4471
+msgid "Unable to add user"
+msgstr "Nu se poate adăuga utilizatorul"
+
+#: ../libpurple/protocols/msn/notification.c:897
+#: ../libpurple/protocols/msnp9/notification.c:498
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "Nu se poate adăuga utilizatorul în %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:502
+#: ../libpurple/protocols/msn/notification.c:901
+#: ../libpurple/protocols/msnp9/notification.c:502
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "Nu se poate bloca utilizatorul în %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:506
+#: ../libpurple/protocols/msn/notification.c:905
+#: ../libpurple/protocols/msnp9/notification.c:506
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "Nu se poate permite utilizatorul în %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:514
+#: ../libpurple/protocols/msn/notification.c:913
+#: ../libpurple/protocols/msnp9/notification.c:514
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr "%s nu a putut fi adăugat pentru că lista de contacte vă e plină."
 
-#: ../libpurple/protocols/msn/notification.c:523
+#: ../libpurple/protocols/msn/notification.c:922
+#: ../libpurple/protocols/msnp9/notification.c:523
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s nu este un nume de cont „passport” valid."
 
-#: ../libpurple/protocols/msn/notification.c:528
+#: ../libpurple/protocols/msn/notification.c:927
+#: ../libpurple/protocols/msnp9/notification.c:528
 msgid "Service Temporarily Unavailable."
 msgstr "Serviciu temporar indisponibil."
 
-#: ../libpurple/protocols/msn/notification.c:851
+#: ../libpurple/protocols/msn/notification.c:1263
+#: ../libpurple/protocols/msnp9/notification.c:851
 msgid "Unable to rename group"
 msgstr "Grupul nu poate fi redenumit"
 
-#: ../libpurple/protocols/msn/notification.c:906
+#: ../libpurple/protocols/msn/notification.c:1318
+#: ../libpurple/protocols/msnp9/notification.c:906
 msgid "Unable to delete group"
 msgstr "Grupul nu poate fi şters"
 
-#: ../libpurple/protocols/msn/notification.c:1325
+#: ../libpurple/protocols/msn/notification.c:1931
+#: ../libpurple/protocols/msnp9/notification.c:1325
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -7185,15 +7329,39 @@
 "\n"
 "Veţi putea să vă autentificaţi din nou după încheierea operaţiunii."
 
+#: ../libpurple/protocols/msn/servconn.c:135
+#: ../libpurple/protocols/msnp9/nexus.c:146
+#: ../libpurple/protocols/msnp9/servconn.c:133
+#: ../libpurple/protocols/qq/qq_proxy.c:242
+#: ../libpurple/protocols/qq/qq_proxy.c:324
+#: ../libpurple/protocols/qq/qq_proxy.c:369
+#: ../libpurple/protocols/qq/qq_proxy.c:402
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:64
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:167
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:191
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:204
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:233
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:247
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:272
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:307
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:338
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
+msgid "Unable to connect"
+msgstr "Conectare eşuată"
+
 #: ../libpurple/protocols/msn/servconn.c:137
+#: ../libpurple/protocols/msnp9/servconn.c:135
 msgid "Writing error"
 msgstr "Eroare la scriere"
 
 #: ../libpurple/protocols/msn/servconn.c:139
+#: ../libpurple/protocols/msnp9/servconn.c:137
 msgid "Reading error"
 msgstr "Eroare la citire"
 
 #: ../libpurple/protocols/msn/servconn.c:146
+#: ../libpurple/protocols/msnp9/servconn.c:144
 #, c-format
 msgid ""
 "Connection error from %s server:\n"
@@ -7202,94 +7370,116 @@
 "Eroare de conectare de la serverul %s:\n"
 "%s"
 
-#: ../libpurple/protocols/msn/session.c:299
+#: ../libpurple/protocols/msn/session.c:349
+#: ../libpurple/protocols/msnp9/session.c:302
 msgid "Our protocol is not supported by the server."
 msgstr "Protocolul utilizat nu este suportat de către server."
 
-#: ../libpurple/protocols/msn/session.c:303
+#: ../libpurple/protocols/msn/session.c:354
+#: ../libpurple/protocols/msnp9/session.c:307
 msgid "Error parsing HTTP."
 msgstr "Eroare la prelucrarea datelor HTTP."
 
-#: ../libpurple/protocols/msn/session.c:307
-#: ../libpurple/protocols/oscar/flap_connection.c:384
-#: ../libpurple/protocols/yahoo/yahoo.c:205
+#: ../libpurple/protocols/msn/session.c:358
+#: ../libpurple/protocols/msnp9/session.c:311
+#: ../libpurple/protocols/oscar/flap_connection.c:387
+#: ../libpurple/protocols/yahoo/yahoo.c:207
 msgid "You have signed on from another location."
 msgstr "V-aţi autentificat de la o altă locaţie."
 
-#: ../libpurple/protocols/msn/session.c:310
+#: ../libpurple/protocols/msn/session.c:364
+#: ../libpurple/protocols/msnp9/session.c:317
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "Serverele MSN sunt temporar indisponibile. Reîncercaţi mai târziu."
 
-#: ../libpurple/protocols/msn/session.c:315
+#: ../libpurple/protocols/msn/session.c:370
+#: ../libpurple/protocols/msnp9/session.c:323
 msgid "The MSN servers are going down temporarily."
 msgstr "Serverele MSN vor fi oprite momentan."
 
-#: ../libpurple/protocols/msn/session.c:320
+#: ../libpurple/protocols/msn/session.c:375
+#: ../libpurple/protocols/msnp9/session.c:328
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Autentificare eşuată: %s"
 
-#: ../libpurple/protocols/msn/session.c:325
+#: ../libpurple/protocols/msn/session.c:381
+#: ../libpurple/protocols/msnp9/session.c:334
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 "Lista contactelor MSN este momentan indisponibilă. Încercaţi mai târziu."
 
-#: ../libpurple/protocols/msn/session.c:346
-#: ../libpurple/protocols/msn/session.c:348
+#: ../libpurple/protocols/msn/session.c:403
+#: ../libpurple/protocols/msn/session.c:405
+#: ../libpurple/protocols/msnp9/session.c:356
+#: ../libpurple/protocols/msnp9/session.c:358
 msgid "Handshaking"
 msgstr "Sincronizare"
 
-#: ../libpurple/protocols/msn/session.c:349
+#: ../libpurple/protocols/msn/session.c:406
+#: ../libpurple/protocols/msnp9/session.c:359
 msgid "Starting authentication"
 msgstr "Iniţiere autentificare"
 
-#: ../libpurple/protocols/msn/session.c:350
+#: ../libpurple/protocols/msn/session.c:407
+#: ../libpurple/protocols/msnp9/session.c:360
 msgid "Getting cookie"
 msgstr "Obţinere cookie"
 
-#: ../libpurple/protocols/msn/session.c:352
+#: ../libpurple/protocols/msn/session.c:409
+#: ../libpurple/protocols/msnp9/session.c:362
 msgid "Sending cookie"
 msgstr "Trimitere cookie"
 
-#: ../libpurple/protocols/msn/session.c:353
+#: ../libpurple/protocols/msn/session.c:410
+#: ../libpurple/protocols/msnp9/session.c:363
 msgid "Retrieving buddy list"
 msgstr "Se descarcă lista de contacte"
 
 #: ../libpurple/protocols/msn/state.c:34
+#: ../libpurple/protocols/msnp9/state.c:34
 msgid "Away From Computer"
 msgstr "Absent(ă) din faţa calculatorului"
 
 #: ../libpurple/protocols/msn/state.c:35
+#: ../libpurple/protocols/msnp9/state.c:35
 msgid "On The Phone"
 msgstr "La telefon"
 
 #: ../libpurple/protocols/msn/state.c:36
+#: ../libpurple/protocols/msnp9/state.c:36
 msgid "Out To Lunch"
 msgstr "La masă"
 
-#: ../libpurple/protocols/msn/switchboard.c:400
+#: ../libpurple/protocols/msn/switchboard.c:398
+#: ../libpurple/protocols/msnp9/switchboard.c:400
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "E posibil ca mesajul să nu fi fost trimis din cauza unui time-out:"
 
-#: ../libpurple/protocols/msn/switchboard.c:408
+#: ../libpurple/protocols/msn/switchboard.c:406
+#: ../libpurple/protocols/msnp9/switchboard.c:408
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr ""
 "Mesajul nu a putut fi trimis, nu se permite acest lucru în invizibilitate:"
 
-#: ../libpurple/protocols/msn/switchboard.c:412
+#: ../libpurple/protocols/msn/switchboard.c:410
+#: ../libpurple/protocols/msnp9/switchboard.c:412
 msgid "Message could not be sent because the user is offline:"
 msgstr "Mesajul nu a putut fi trimis pentru că utilizatorul este deconectat:"
 
-#: ../libpurple/protocols/msn/switchboard.c:416
+#: ../libpurple/protocols/msn/switchboard.c:414
+#: ../libpurple/protocols/msnp9/switchboard.c:416
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "Mesajul nu a putut fi trimis din cauza unei erori de conectare:"
 
-#: ../libpurple/protocols/msn/switchboard.c:420
+#: ../libpurple/protocols/msn/switchboard.c:418
+#: ../libpurple/protocols/msnp9/switchboard.c:420
 msgid "Message could not be sent because we are sending too quickly:"
 msgstr "Mesajul nu a putut fi trimis pentru că se trimit prea multe date:"
 
-#: ../libpurple/protocols/msn/switchboard.c:424
+#: ../libpurple/protocols/msn/switchboard.c:422
+#: ../libpurple/protocols/msnp9/switchboard.c:424
 msgid ""
 "Message could not be sent because we were unable to establish a session with "
 "the server. This is likely a server problem, try again in a few minutes:"
@@ -7298,43 +7488,70 @@
 "comunicare cu serverul. Aceasta este probabil o problemă de server, "
 "reîncercaţi în câteva minute:"
 
-#: ../libpurple/protocols/msn/switchboard.c:431
+#: ../libpurple/protocols/msn/switchboard.c:429
+#: ../libpurple/protocols/msnp9/switchboard.c:431
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr "Mesajul nu a putut fi trimis din cauza unei erori de comutare:"
 
-#: ../libpurple/protocols/msn/switchboard.c:439
+#: ../libpurple/protocols/msn/switchboard.c:437
+#: ../libpurple/protocols/msnp9/switchboard.c:439
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 "E posibil ca mesajul să nu fi fost trimis din cauza unei erori necunoscute:"
 
-#: ../libpurple/protocols/msn/userlist.c:252
+#: ../libpurple/protocols/msn/userlist.c:243
+#: ../libpurple/protocols/msnp9/userlist.c:252
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "%s v-a adăugat în lista sa de contacte."
 
-#: ../libpurple/protocols/msn/userlist.c:321
+#: ../libpurple/protocols/msn/userlist.c:312
+#: ../libpurple/protocols/msnp9/userlist.c:321
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s v-a şters din lista sa de contacte."
 
-#: ../libpurple/protocols/msn/userlist.c:643
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#: ../libpurple/protocols/msn/userlist.c:693
+#: ../libpurple/protocols/msnp9/userlist.c:643
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "„%s” nu poate fi adăugat."
 
-#: ../libpurple/protocols/msn/userlist.c:645
+#: ../libpurple/protocols/msn/userlist.c:696
+#: ../libpurple/protocols/msnp9/userlist.c:645
 msgid "The screen name specified is invalid."
 msgstr "Numele de identificare specificat este invalid."
 
+#: ../libpurple/protocols/msnp9/msn.c:549
+msgid "Has you"
+msgstr "Vă are în listă"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/protocols/msnp9/msn.c:2159
+#: ../libpurple/protocols/msnp9/msn.c:2161
+msgid "MSN Protocol Plugin"
+msgstr "Modul de protocol MSN"
+
 #: ../libpurple/protocols/myspace/myspace.c:111
-#, fuzzy
 msgid "Missing Cipher"
-msgstr "Cifru"
+msgstr "Cifru lipsă"
 
 #: ../libpurple/protocols/myspace/myspace.c:112
 msgid "The RC4 cipher could not be found"
-msgstr ""
+msgstr "Nu s-a găsit cifrul RC4"
 
 #: ../libpurple/protocols/myspace/myspace.c:113
 msgid ""
@@ -7351,214 +7568,213 @@
 
 #. Notify an error message also, because this is important!
 #: ../libpurple/protocols/myspace/myspace.c:292
-#: ../libpurple/protocols/myspace/myspace.c:1801
+#: ../libpurple/protocols/myspace/myspace.c:1820
 msgid "MySpaceIM Error"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:349
+#: ../libpurple/protocols/myspace/myspace.c:352
 #, fuzzy
 msgid "Reading challenge"
 msgstr "Eroare la citire"
 
-#: ../libpurple/protocols/myspace/myspace.c:355
+#: ../libpurple/protocols/myspace/myspace.c:360
 #, fuzzy
 msgid "Unexpected challenge length from server"
 msgstr "Cerere invalidă de la server"
 
-#: ../libpurple/protocols/myspace/myspace.c:359
+#: ../libpurple/protocols/myspace/myspace.c:364
 #, fuzzy
 msgid "Logging in"
 msgstr "Înregistrare"
 
-#: ../libpurple/protocols/myspace/myspace.c:1286
+#: ../libpurple/protocols/myspace/myspace.c:1296
 #, c-format
 msgid "Connection to server lost (no data received within %d seconds)"
 msgstr ""
 
 #. Can't write _()'d strings in array initializers. Workaround.
-#: ../libpurple/protocols/myspace/myspace.c:1328
+#: ../libpurple/protocols/myspace/myspace.c:1339
 #, fuzzy
 msgid "New mail messages"
 msgstr "Trimite un mesaj"
 
-#: ../libpurple/protocols/myspace/myspace.c:1329
+#: ../libpurple/protocols/myspace/myspace.c:1340
 msgid "New blog comments"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1330
+#: ../libpurple/protocols/myspace/myspace.c:1341
 msgid "New profile comments"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1331
+#: ../libpurple/protocols/myspace/myspace.c:1342
 msgid "New friend requests!"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1332
+#: ../libpurple/protocols/myspace/myspace.c:1343
 msgid "New picture comments"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1360
+#: ../libpurple/protocols/myspace/myspace.c:1371
 msgid "MySpace"
 msgstr ""
 
 #. The session is now set up, ready to be connected. This emits the
 #. * signedOn signal, so clients can now do anything with msimprpl, and
 #. * we're ready for it (session key, userid, username all setup).
-#: ../libpurple/protocols/myspace/myspace.c:1543
-#: ../libpurple/protocols/sametime/sametime.c:1544
+#: ../libpurple/protocols/myspace/myspace.c:1554
+#: ../libpurple/protocols/sametime/sametime.c:1546
 msgid "Connected"
 msgstr "Conectat(ă)"
 
-#: ../libpurple/protocols/myspace/myspace.c:1554
-#: ../libpurple/protocols/myspace/myspace.c:1556
+#: ../libpurple/protocols/myspace/myspace.c:1565
+#: ../libpurple/protocols/myspace/myspace.c:1568
 #, fuzzy
 msgid "No username set"
 msgstr "Fără nume"
 
-#: ../libpurple/protocols/myspace/myspace.c:1555
+#: ../libpurple/protocols/myspace/myspace.c:1566
 msgid ""
 "Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
 "username and choose a username and try to login again."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1782
+#: ../libpurple/protocols/myspace/myspace.c:1794
 #, fuzzy, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Procesul a returnat codul de eroare %d"
 
-#: ../libpurple/protocols/myspace/myspace.c:1972
-#: ../libpurple/protocols/myspace/myspace.c:2006
+#: ../libpurple/protocols/myspace/myspace.c:1990
+#: ../libpurple/protocols/myspace/myspace.c:2024
 #, fuzzy
 msgid "Failed to add buddy"
 msgstr "Intrarea în chat alături de acest contact a eşuat"
 
-#: ../libpurple/protocols/myspace/myspace.c:1972
+#: ../libpurple/protocols/myspace/myspace.c:1990
 #, fuzzy
 msgid "'addbuddy' command failed."
 msgstr "Încarcă lista de contacte din fişierul..."
 
-#: ../libpurple/protocols/myspace/myspace.c:2006
-#: ../libpurple/protocols/myspace/myspace.c:2247
+#: ../libpurple/protocols/myspace/myspace.c:2024
+#: ../libpurple/protocols/myspace/myspace.c:2261
 #, fuzzy
 msgid "persist command failed"
 msgstr "Comutare eşuată"
 
-#: ../libpurple/protocols/myspace/myspace.c:2115
+#: ../libpurple/protocols/myspace/myspace.c:2129
 #, c-format
 msgid "No such user: %s"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2116
+#: ../libpurple/protocols/myspace/myspace.c:2130
 #, fuzzy
 msgid "User lookup"
 msgstr "Camere de chat utilizatori"
 
-#: ../libpurple/protocols/myspace/myspace.c:2228
-#: ../libpurple/protocols/myspace/myspace.c:2247
-#: ../libpurple/protocols/myspace/myspace.c:2269
+#: ../libpurple/protocols/myspace/myspace.c:2242
+#: ../libpurple/protocols/myspace/myspace.c:2261
+#: ../libpurple/protocols/myspace/myspace.c:2283
 #, fuzzy
 msgid "Failed to remove buddy"
 msgstr "Intrarea în chat alături de acest contact a eşuat"
 
-#: ../libpurple/protocols/myspace/myspace.c:2228
+#: ../libpurple/protocols/myspace/myspace.c:2242
 msgid "'delbuddy' command failed"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2269
+#: ../libpurple/protocols/myspace/myspace.c:2283
 #, fuzzy
 msgid "blocklist command failed"
 msgstr "Comutare eşuată"
 
-#: ../libpurple/protocols/myspace/myspace.c:2315
+#: ../libpurple/protocols/myspace/myspace.c:2331
 #, fuzzy
 msgid "Invalid input condition"
 msgstr "Finalizare conexiune"
 
-#. TODO: g_realloc like msn, yahoo, irc, jabber?
-#: ../libpurple/protocols/myspace/myspace.c:2333
-#: ../libpurple/protocols/myspace/myspace.c:2364
+#: ../libpurple/protocols/myspace/myspace.c:2351
+#: ../libpurple/protocols/myspace/myspace.c:2388
 #, fuzzy
 msgid "Read buffer full"
 msgstr "Coadă plină"
 
-#: ../libpurple/protocols/myspace/myspace.c:2402
+#: ../libpurple/protocols/myspace/myspace.c:2430
 #, fuzzy
 msgid "Unparseable message"
 msgstr "Nu se poate prelucra mesajul"
 
-#: ../libpurple/protocols/myspace/myspace.c:2471
+#: ../libpurple/protocols/myspace/myspace.c:2499
 #, fuzzy, c-format
 msgid "Couldn't connect to host: %s (%d)"
 msgstr "Conectarea la server a eşuat"
 
-#: ../libpurple/protocols/myspace/myspace.c:2642
+#: ../libpurple/protocols/myspace/myspace.c:2670
 #, fuzzy
 msgid "IM Friends"
 msgstr "Ferestrele de _discuţii"
 
-#: ../libpurple/protocols/myspace/myspace.c:2741
+#: ../libpurple/protocols/myspace/myspace.c:2769
 #, c-format
 msgid ""
 "%d buddies were added or updated from the server (including buddies already "
 "on the server-side list)"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2742
+#: ../libpurple/protocols/myspace/myspace.c:2770
 #, fuzzy
 msgid "Add contacts from server"
 msgstr "Răspuns invalid de la server."
 
-#: ../libpurple/protocols/myspace/myspace.c:2794
-#: ../libpurple/protocols/myspace/myspace.c:2859
+#: ../libpurple/protocols/myspace/myspace.c:2822
+#: ../libpurple/protocols/myspace/myspace.c:2887
 msgid "Add friends from MySpace.com"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2795
+#: ../libpurple/protocols/myspace/myspace.c:2823
 #, fuzzy
 msgid "Importing friends failed"
 msgstr "activarea modulului a eşuat"
 
 #. TODO: find out how
-#: ../libpurple/protocols/myspace/myspace.c:2851
+#: ../libpurple/protocols/myspace/myspace.c:2879
 #, fuzzy
 msgid "Find people..."
 msgstr "Căutare contacte..."
 
-#: ../libpurple/protocols/myspace/myspace.c:2854
+#: ../libpurple/protocols/myspace/myspace.c:2882
 #, fuzzy
 msgid "Change IM name..."
 msgstr "Schimbare parolă..."
 
-#: ../libpurple/protocols/myspace/myspace.c:3156
+#: ../libpurple/protocols/myspace/myspace.c:3184
 msgid "myim URL handler"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3157
+#: ../libpurple/protocols/myspace/myspace.c:3185
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3158
+#: ../libpurple/protocols/myspace/myspace.c:3186
 msgid "Enable the proper MySpaceIM account and try again."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3281
+#: ../libpurple/protocols/myspace/myspace.c:3309
 msgid "Show display name in status text"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3284
+#: ../libpurple/protocols/myspace/myspace.c:3312
 msgid "Show headline in status text"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3289
+#: ../libpurple/protocols/myspace/myspace.c:3317
 #, fuzzy
 msgid "Send emoticons"
 msgstr "Opţiuni sunet"
 
-#: ../libpurple/protocols/myspace/myspace.c:3294
+#: ../libpurple/protocols/myspace/myspace.c:3322
 msgid "Screen resolution (dots per inch)"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3297
+#: ../libpurple/protocols/myspace/myspace.c:3325
 #, fuzzy
 msgid "Base font size (points)"
 msgstr "Font mai mare"
@@ -7569,177 +7785,200 @@
 msgid "User"
 msgstr "Utilizator"
 
-#. TODO: link to username, if available
-#: ../libpurple/protocols/myspace/user.c:102
-#: ../libpurple/protocols/oscar/oscar.c:2964
+#: ../libpurple/protocols/myspace/user.c:105
+#: ../libpurple/protocols/oscar/oscar.c:2974
 msgid "Profile"
 msgstr "Profil"
 
-#: ../libpurple/protocols/myspace/user.c:124
+#: ../libpurple/protocols/myspace/user.c:128
 #, fuzzy
 msgid "Headline"
 msgstr "A_dministrare:"
 
-#: ../libpurple/protocols/myspace/user.c:129
+#: ../libpurple/protocols/myspace/user.c:133
 #, fuzzy
 msgid "Song"
 msgstr "Sunete"
 
-#: ../libpurple/protocols/myspace/user.c:134
+#: ../libpurple/protocols/myspace/user.c:141
 msgid "Total Friends"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/user.c:145
-#: ../libpurple/protocols/myspace/user.c:148
-#: ../libpurple/protocols/myspace/user.c:151
+#: ../libpurple/protocols/myspace/user.c:159
 #, fuzzy
 msgid "Client Version"
 msgstr "Încheie discuţia"
 
 #. TODO: icons for each zap
-#: ../libpurple/protocols/myspace/zap.c:44
-#: ../libpurple/protocols/myspace/zap.c:177
+#. Lots of comments for translators:
+#. Zap means "to strike suddenly and forcefully as if with a
+#. * projectile or weapon."  This term often has an electrical
+#. * connotation, for example, "he was zapped by electricity when
+#. * he put a fork in the toaster."
+#: ../libpurple/protocols/myspace/zap.c:51
+#: ../libpurple/protocols/myspace/zap.c:214
 msgid "Zap"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:44
-#, fuzzy, c-format
-msgid "%s has zapped you!"
-msgstr "%s v-a adăugat [%s]"
-
-#: ../libpurple/protocols/myspace/zap.c:44
-#, c-format
-msgid "Zapping %s..."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:45
-msgid "Whack"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:45
-#, fuzzy, c-format
-msgid "%s has whacked you!"
-msgstr "%s v-a adăugat [%s]"
-
-#: ../libpurple/protocols/myspace/zap.c:45
-#, c-format
-msgid "Whacking %s..."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:46
-#, fuzzy
-msgid "Torch"
-msgstr "Topic"
-
-#: ../libpurple/protocols/myspace/zap.c:46
-#, fuzzy, c-format
-msgid "%s has torched you!"
-msgstr "Utilizatorul v-a blocat"
-
-#: ../libpurple/protocols/myspace/zap.c:46
-#, c-format
-msgid "Torching %s..."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:47
-msgid "Smooch"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:47
-#, fuzzy, c-format
-msgid "%s has smooched you!"
-msgstr "%s s-a autentificat."
-
-#: ../libpurple/protocols/myspace/zap.c:47
-#, c-format
-msgid "Smooching %s..."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:48
-msgid "Hug"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:48
-#, fuzzy, c-format
-msgid "%s has hugged you!"
-msgstr "%s s-a autentificat."
-
-#: ../libpurple/protocols/myspace/zap.c:48
-#, c-format
-msgid "Hugging %s..."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:49
-#, fuzzy
-msgid "Slap"
-msgstr "Adormit(ă)"
-
-#: ../libpurple/protocols/myspace/zap.c:49
-#, fuzzy, c-format
-msgid "%s has slapped you!"
-msgstr "%s v-a adăugat [%s]"
-
-#: ../libpurple/protocols/myspace/zap.c:49
-#, c-format
-msgid "Slapping %s..."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:50
-#, fuzzy
-msgid "Goose"
-msgstr "Dus"
-
-#: ../libpurple/protocols/myspace/zap.c:50
-#, fuzzy, c-format
-msgid "%s has goosed you!"
-msgstr "%s a intrat în absenţă."
-
-#: ../libpurple/protocols/myspace/zap.c:50
-#, fuzzy, c-format
-msgid "Goosing %s..."
-msgstr "Caut %s"
-
-#: ../libpurple/protocols/myspace/zap.c:51
-msgid "High-five"
-msgstr ""
-
 #: ../libpurple/protocols/myspace/zap.c:51
 #, fuzzy, c-format
+msgid "%s has zapped you!"
+msgstr "%s v-a adăugat [%s]"
+
+#: ../libpurple/protocols/myspace/zap.c:51
+#, c-format
+msgid "Zapping %s..."
+msgstr ""
+
+#. Whack means "to hit or strike someone with a sharp blow"
+#: ../libpurple/protocols/myspace/zap.c:54
+msgid "Whack"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:54
+#, fuzzy, c-format
+msgid "%s has whacked you!"
+msgstr "%s v-a adăugat [%s]"
+
+#: ../libpurple/protocols/myspace/zap.c:54
+#, c-format
+msgid "Whacking %s..."
+msgstr ""
+
+#. Torch means "to set on fire."  Don't worry, this doesn't
+#. * make a whole lot of sense in English, either.  Feel free
+#. * to translate it literally.
+#: ../libpurple/protocols/myspace/zap.c:59
+#, fuzzy
+msgid "Torch"
+msgstr "Topic"
+
+#: ../libpurple/protocols/myspace/zap.c:59
+#, fuzzy, c-format
+msgid "%s has torched you!"
+msgstr "Utilizatorul v-a blocat"
+
+#: ../libpurple/protocols/myspace/zap.c:59
+#, c-format
+msgid "Torching %s..."
+msgstr ""
+
+#. Smooch means "to kiss someone, often enthusiastically"
+#: ../libpurple/protocols/myspace/zap.c:62
+msgid "Smooch"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:62
+#, fuzzy, c-format
+msgid "%s has smooched you!"
+msgstr "%s s-a autentificat."
+
+#: ../libpurple/protocols/myspace/zap.c:62
+#, c-format
+msgid "Smooching %s..."
+msgstr ""
+
+#. A hug is a display of affection; wrapping your arms around someone
+#: ../libpurple/protocols/myspace/zap.c:65
+msgid "Hug"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:65
+#, fuzzy, c-format
+msgid "%s has hugged you!"
+msgstr "%s s-a autentificat."
+
+#: ../libpurple/protocols/myspace/zap.c:65
+#, c-format
+msgid "Hugging %s..."
+msgstr ""
+
+#. Slap means "to hit someone with an open/flat hand"
+#: ../libpurple/protocols/myspace/zap.c:68
+#, fuzzy
+msgid "Slap"
+msgstr "Adormit(ă)"
+
+#: ../libpurple/protocols/myspace/zap.c:68
+#, fuzzy, c-format
+msgid "%s has slapped you!"
+msgstr "%s v-a adăugat [%s]"
+
+#: ../libpurple/protocols/myspace/zap.c:68
+#, c-format
+msgid "Slapping %s..."
+msgstr ""
+
+#. Goose means "to pinch someone on their butt"
+#: ../libpurple/protocols/myspace/zap.c:71
+#, fuzzy
+msgid "Goose"
+msgstr "Dus"
+
+#: ../libpurple/protocols/myspace/zap.c:71
+#, fuzzy, c-format
+msgid "%s has goosed you!"
+msgstr "%s a intrat în absenţă."
+
+#: ../libpurple/protocols/myspace/zap.c:71
+#, fuzzy, c-format
+msgid "Goosing %s..."
+msgstr "Caut %s"
+
+#. A high-five is when two people's hands slap each other
+#. * in the air above their heads.  It is done to celebrate
+#. * something, often a victory, or to congratulate someone.
+#: ../libpurple/protocols/myspace/zap.c:76
+msgid "High-five"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:76
+#, fuzzy, c-format
 msgid "%s has high-fived you!"
 msgstr "%s s-a autentificat."
 
-#: ../libpurple/protocols/myspace/zap.c:51
+#: ../libpurple/protocols/myspace/zap.c:76
 #, c-format
 msgid "High-fiving %s..."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:52
+#. We're not entirely sure what the MySpace people mean by
+#. * this... but we think it's the equivalent of "prank."  Or, for
+#. * someone to perform a mischievous trick or practical joke.
+#: ../libpurple/protocols/myspace/zap.c:81
 msgid "Punk"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:52
+#: ../libpurple/protocols/myspace/zap.c:81
 #, fuzzy, c-format
 msgid "%s has punk'd you!"
 msgstr "%s s-a autentificat."
 
-#: ../libpurple/protocols/myspace/zap.c:52
+#: ../libpurple/protocols/myspace/zap.c:81
 #, c-format
 msgid "Punking %s..."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:53
+#. Raspberry is a slang term for the vibrating sound made
+#. * when you stick your tongue out of your mouth with your
+#. * lips closed and blow.  It is typically done when
+#. * gloating or bragging.  Nowadays it's a pretty silly
+#. * gesture, so it does not carry a harsh negative
+#. * connotation.  It is generally used in a playful tone
+#. * with friends.
+#: ../libpurple/protocols/myspace/zap.c:90
 msgid "Raspberry"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:53
-#, fuzzy, c-format
+msgstr "Limbă scoasă"
+
+#: ../libpurple/protocols/myspace/zap.c:90
+#, c-format
 msgid "%s has raspberried you!"
-msgstr "%s s-a autentificat."
-
-#: ../libpurple/protocols/myspace/zap.c:53
+msgstr "%s v-a arătat limba scoasă!"
+
+#: ../libpurple/protocols/myspace/zap.c:90
 #, c-format
 msgid "Raspberrying %s..."
-msgstr ""
+msgstr "Limbă scoasă la %s..."
 
 #: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
@@ -7875,42 +8114,42 @@
 msgid "Login failed (%s)."
 msgstr "Autentificare eşuată (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:247
+#: ../libpurple/protocols/novell/novell.c:255
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr ""
 "Mesajul nu poate fi trimis. Nu se pot obţine detalii pentru acest utilizator "
 "(%s)."
 
-#: ../libpurple/protocols/novell/novell.c:396
+#: ../libpurple/protocols/novell/novell.c:404
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "„%s” nu poate fi adăugat în lista de contacte (%s)."
 
 #. TODO: Improve this! message to who or for what conference?
-#: ../libpurple/protocols/novell/novell.c:422
+#: ../libpurple/protocols/novell/novell.c:430
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "Nu se poate trimite mesajul (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:493
-#: ../libpurple/protocols/novell/novell.c:985
+#: ../libpurple/protocols/novell/novell.c:501
+#: ../libpurple/protocols/novell/novell.c:993
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "Utilizatorul nu poate fi invitat (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:532
+#: ../libpurple/protocols/novell/novell.c:540
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr ""
 "Nu se poate trimite mesajul către %s. Nu se poate crea conferinţa (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:537
+#: ../libpurple/protocols/novell/novell.c:545
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "Nu se poate trimite mesajul. Nu se poate crea conferinţa (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:584
+#: ../libpurple/protocols/novell/novell.c:592
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
@@ -7919,7 +8158,7 @@
 "Utilizatorul %s nu poate fi mutat în directorul %s în lista de pe server. "
 "Eroare la crearea directorului (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:632
+#: ../libpurple/protocols/novell/novell.c:640
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
@@ -7928,62 +8167,62 @@
 "„%s” nu poate fi adăugat(ă) în lista de contacte. Eroare la crearea "
 "directorului în lista de pe server (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:705
+#: ../libpurple/protocols/novell/novell.c:713
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "Nu se pot obţine detalii despre utilizatorul %s (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:751
-#: ../libpurple/protocols/novell/novell.c:897
+#: ../libpurple/protocols/novell/novell.c:759
+#: ../libpurple/protocols/novell/novell.c:905
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "Utilizatorul nu poate fi adăugat în lista privată (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:798
+#: ../libpurple/protocols/novell/novell.c:806
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "„%s” nu poate fi adăugat(ă) în lista celor blocaţi (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:851
+#: ../libpurple/protocols/novell/novell.c:859
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "„%s” nu poate fi adăugat în lista celor permişi (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:919
+#: ../libpurple/protocols/novell/novell.c:927
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "„%s” nu poate fi şters din lista privată (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:942
-#: ../libpurple/protocols/novell/novell.c:1647
+#: ../libpurple/protocols/novell/novell.c:950
+#: ../libpurple/protocols/novell/novell.c:1656
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "Nu se pot schimba setările private pe server (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:1012
+#: ../libpurple/protocols/novell/novell.c:1020
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "Nu se poate crea o conferinţă (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:1121
-#: ../libpurple/protocols/novell/novell.c:1692
+#: ../libpurple/protocols/novell/novell.c:1131
+#: ../libpurple/protocols/novell/novell.c:1702
 msgid "Error communicating with server. Closing connection."
 msgstr "Eroare de comunicare cu serverul. Conexiunea va fi închisă."
 
-#: ../libpurple/protocols/novell/novell.c:1476
+#: ../libpurple/protocols/novell/novell.c:1485
 msgid "Telephone Number"
 msgstr "Telefon"
 
-#: ../libpurple/protocols/novell/novell.c:1482
+#: ../libpurple/protocols/novell/novell.c:1491
 msgid "Personal Title"
 msgstr "Titlu"
 
-#: ../libpurple/protocols/novell/novell.c:1486
+#: ../libpurple/protocols/novell/novell.c:1495
 msgid "Mailstop"
 msgstr "Mailstop"
 
-#: ../libpurple/protocols/novell/novell.c:1502
-#: ../libpurple/protocols/sametime/sametime.c:4122
+#: ../libpurple/protocols/novell/novell.c:1511
+#: ../libpurple/protocols/sametime/sametime.c:4168
 msgid "User ID"
 msgstr "ID utilizator"
 
@@ -7993,41 +8232,37 @@
 #. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: ../libpurple/protocols/novell/novell.c:1515
+#: ../libpurple/protocols/novell/novell.c:1524
 msgid "Full name"
 msgstr "Nume complet"
 
-#: ../libpurple/protocols/novell/novell.c:1637
+#: ../libpurple/protocols/novell/novell.c:1646
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "Conferinţă GroupWise %d"
 
-#: ../libpurple/protocols/novell/novell.c:1668
-msgid "Unable to make SSL connection to server."
-msgstr "Nu se poate iniţia o conexiune SSL către server."
-
-#: ../libpurple/protocols/novell/novell.c:1720
+#: ../libpurple/protocols/novell/novell.c:1729
 msgid "Authenticating..."
 msgstr "Autentificare..."
 
-#: ../libpurple/protocols/novell/novell.c:1732
+#: ../libpurple/protocols/novell/novell.c:1743
 msgid "Unable to connect to server."
 msgstr "Conectarea la server a eşuat."
 
-#: ../libpurple/protocols/novell/novell.c:1735
+#: ../libpurple/protocols/novell/novell.c:1746
 msgid "Waiting for response..."
 msgstr "Se aşteaptă un răspuns..."
 
-#: ../libpurple/protocols/novell/novell.c:1870
+#: ../libpurple/protocols/novell/novell.c:1881
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s a fost invitat în această discuţie."
 
-#: ../libpurple/protocols/novell/novell.c:1898
+#: ../libpurple/protocols/novell/novell.c:1909
 msgid "Invitation to Conversation"
 msgstr "Invitaţie într-o discuţie"
 
-#: ../libpurple/protocols/novell/novell.c:1899
+#: ../libpurple/protocols/novell/novell.c:1910
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -8038,27 +8273,22 @@
 "\n"
 "Către: %s"
 
-#: ../libpurple/protocols/novell/novell.c:1901
+#: ../libpurple/protocols/novell/novell.c:1912
 msgid "Would you like to join the conversation?"
 msgstr "Doriţi să vă alăturaţi discuţiei?"
 
-#. we don't want to reconnect in this case
-#: ../libpurple/protocols/novell/novell.c:2012
+#: ../libpurple/protocols/novell/novell.c:2027
 msgid "You have been logged out because you logged in at another workstation."
 msgstr ""
 "Aţi fost deconectat(ă) pentru că v-aţi autentificat de pe o altă staţie."
 
-#: ../libpurple/protocols/novell/novell.c:2069
+#: ../libpurple/protocols/novell/novell.c:2084
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s pare să fie deconectat(ă) şi nu a primit mesajul ce i l-aţi trimis."
 
-#. TODO: Would be nice to prompt if not set!
-#. *  purple_request_fields(gc, _("Server Address"),...);
-#.
-#. ...but for now just error out with a nice message.
-#: ../libpurple/protocols/novell/novell.c:2167
+#: ../libpurple/protocols/novell/novell.c:2184
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -8066,12 +8296,11 @@
 "Conectarea la server a eşuat. Introduceţi adresa serverului la care doriţi "
 "să vă conectaţi."
 
-#: ../libpurple/protocols/novell/novell.c:2195
+#: ../libpurple/protocols/novell/novell.c:2213
 msgid "Error. SSL support is not installed."
 msgstr "Eroare: suportul SSL nu este instalat."
 
-#: ../libpurple/protocols/novell/novell.c:2504
-#, c-format
+#: ../libpurple/protocols/novell/novell.c:2521
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Această conferinţă a fost închisă. Nu mai pot fi trimise mesaje."
 
@@ -8085,33 +8314,33 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3518
-#: ../libpurple/protocols/novell/novell.c:3520
+#: ../libpurple/protocols/novell/novell.c:3535
+#: ../libpurple/protocols/novell/novell.c:3537
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Modul de protocol Novell GroupWise Messenger"
 
-#: ../libpurple/protocols/novell/novell.c:3545
+#: ../libpurple/protocols/novell/novell.c:3562
 msgid "Server address"
 msgstr "Adresă server"
 
-#: ../libpurple/protocols/novell/novell.c:3549
+#: ../libpurple/protocols/novell/novell.c:3566
 msgid "Server port"
 msgstr "Port server"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:387
-#: ../libpurple/protocols/yahoo/yahoo.c:2469
-#: ../libpurple/protocols/yahoo/yahoo.c:2636
-#: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:581
-#: ../libpurple/proxy.c:1116 ../libpurple/proxy.c:1225
-#: ../libpurple/proxy.c:1325 ../libpurple/proxy.c:1453
+#: ../libpurple/protocols/oscar/flap_connection.c:391
+#: ../libpurple/protocols/yahoo/yahoo.c:2473
+#: ../libpurple/protocols/yahoo/yahoo.c:2641
+#: ../libpurple/protocols/yahoo/ycht.c:482 ../libpurple/proxy.c:584
+#: ../libpurple/proxy.c:1129 ../libpurple/proxy.c:1238
+#: ../libpurple/proxy.c:1338 ../libpurple/proxy.c:1466
 msgid "Server closed the connection."
 msgstr "Serverul a închis conexiunea."
 
-#: ../libpurple/protocols/oscar/flap_connection.c:389
-#: ../libpurple/protocols/yahoo/yahoo.c:2463
-#: ../libpurple/protocols/yahoo/yahoo.c:2630 ../libpurple/proxy.c:593
-#: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1237
-#: ../libpurple/proxy.c:1337 ../libpurple/proxy.c:1465
+#: ../libpurple/protocols/oscar/flap_connection.c:393
+#: ../libpurple/protocols/yahoo/yahoo.c:2466
+#: ../libpurple/protocols/yahoo/yahoo.c:2634 ../libpurple/proxy.c:596
+#: ../libpurple/proxy.c:1141 ../libpurple/proxy.c:1250
+#: ../libpurple/proxy.c:1350 ../libpurple/proxy.c:1478
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -8120,10 +8349,10 @@
 "S-a pierdut conexiunea cu serverul:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:392
-#: ../libpurple/proxy.c:1145 ../libpurple/proxy.c:1250
-#: ../libpurple/proxy.c:1349 ../libpurple/proxy.c:1421
-#: ../libpurple/proxy.c:1478
+#: ../libpurple/protocols/oscar/flap_connection.c:396
+#: ../libpurple/proxy.c:1158 ../libpurple/proxy.c:1263
+#: ../libpurple/proxy.c:1362 ../libpurple/proxy.c:1434
+#: ../libpurple/proxy.c:1491
 msgid "Received invalid data on connection with server."
 msgstr "S-au primit date invalide de la server."
 
@@ -8158,36 +8387,44 @@
 msgstr "Modul de protocol ICQ"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4410
+#: ../libpurple/protocols/yahoo/yahoo.c:4421
 #: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "Codare"
 
-#: ../libpurple/protocols/oscar/odc.c:40
+#: ../libpurple/protocols/oscar/odc.c:42
 msgid "The remote user has closed the connection."
 msgstr "Utilizatorul la distanţă a închis conexiunea."
 
-#: ../libpurple/protocols/oscar/odc.c:42
+#: ../libpurple/protocols/oscar/odc.c:44
 msgid "The remote user has declined your request."
 msgstr "Utilizatorul la distanţă v-a refuzat cererea."
 
-#: ../libpurple/protocols/oscar/odc.c:44
+#: ../libpurple/protocols/oscar/odc.c:46
 #, c-format
 msgid "Lost connection with the remote user:<br>%s"
 msgstr "S-a pierdut conexiunea cu utilizatorul la distanţă:<br>%s"
 
-#: ../libpurple/protocols/oscar/odc.c:47
+#: ../libpurple/protocols/oscar/odc.c:49
 msgid "Received invalid data on connection with remote user."
 msgstr "S-au primit date invalide la conectarea la utilizatorul la distanţă."
 
-#: ../libpurple/protocols/oscar/odc.c:49
+#: ../libpurple/protocols/oscar/odc.c:51
 msgid "Could not establish a connection with the remote user."
 msgstr "Nu s-a putut deschide o conexiune cu utilizatorul la distanţă."
 
-#: ../libpurple/protocols/oscar/odc.c:560
+#: ../libpurple/protocols/oscar/odc.c:562
 msgid "Direct IM established"
 msgstr "Discuţia directă a fost iniţializată"
 
+#: ../libpurple/protocols/oscar/odc.c:600
+#, c-format
+msgid ""
+"%s tried to send you a %s file, but we only allow files up to %s over Direct "
+"IM.  Try using file transfer instead.\n"
+msgstr ""
+"%s a încercat să vă trimită un fişier de %s, dar se permite doar trimiterea de fişiere mai mici de %s în discuţiile directe. Încercaţi transferul de fişiere.\n"
+
 #: ../libpurple/protocols/oscar/oft.c:656
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
@@ -8311,8 +8548,8 @@
 "potriveşte cu cea aleasă de %s sau %s utilizează un client problematic)."
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2387
-#: ../pidgin/gtkutils.c:2417
+#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2392
+#: ../pidgin/gtkutils.c:2422
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:332
 msgid "Buddy Icon"
 msgstr "Avatar"
@@ -8326,15 +8563,15 @@
 msgstr "Discuţie directă AIM"
 
 #: ../libpurple/protocols/oscar/oscar.c:648
-#: ../libpurple/protocols/silc/silc.c:768
-#: ../libpurple/protocols/silc/util.c:553
+#: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc/util.c:559
 #: ../libpurple/protocols/silc10/silc.c:679
 #: ../libpurple/protocols/silc10/util.c:549
 msgid "Chat"
 msgstr "Chat"
 
 #: ../libpurple/protocols/oscar/oscar.c:651
-#: ../libpurple/protocols/oscar/oscar.c:6010
+#: ../libpurple/protocols/oscar/oscar.c:6060
 msgid "Get File"
 msgstr "Ia fişierul"
 
@@ -8407,49 +8644,43 @@
 msgstr "Cameră"
 
 #: ../libpurple/protocols/oscar/oscar.c:725
-#: ../libpurple/protocols/oscar/oscar.c:5780
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:5830
 msgid "Free For Chat"
 msgstr "Disponibil(ă)"
 
 #: ../libpurple/protocols/oscar/oscar.c:729
-#: ../libpurple/protocols/oscar/oscar.c:5815
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:5865
 msgid "Not Available"
 msgstr "Indisponibil(ă)"
 
 #: ../libpurple/protocols/oscar/oscar.c:731
-#: ../libpurple/protocols/oscar/oscar.c:5801
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:5851
 msgid "Occupied"
 msgstr "Ocupat(ă)"
 
 #: ../libpurple/protocols/oscar/oscar.c:735
-#, c-format
 msgid "Web Aware"
 msgstr "Prezent(ă) online"
 
-#: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:183
-#: ../libpurple/protocols/qq/qq.c:288
-#: ../libpurple/protocols/yahoo/yahoo.c:3095 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1060
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:184
+#: ../libpurple/protocols/qq/qq.c:289
+#: ../libpurple/protocols/yahoo/yahoo.c:3106 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:557 ../pidgin/gtkstatusbox.c:1060
 msgid "Invisible"
 msgstr "Invizibil(ă)"
 
 #: ../libpurple/protocols/oscar/oscar.c:739
-#, c-format
 msgid "Online"
 msgstr "Conectat(ă)"
 
 #: ../libpurple/protocols/oscar/oscar.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3707
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1126
+#: ../libpurple/protocols/oscar/oscar.c:3717
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1156
 msgid "IP Address"
 msgstr "Adresă IP"
 
 #: ../libpurple/protocols/oscar/oscar.c:845
-#: ../libpurple/protocols/oscar/oscar.c:2891
+#: ../libpurple/protocols/oscar/oscar.c:2901
 msgid "Warning Level"
 msgstr "Nivel de avertizare"
 
@@ -8488,7 +8719,7 @@
 msgid "Finalizing connection"
 msgstr "Finalizare conexiune"
 
-#: ../libpurple/protocols/oscar/oscar.c:1260
+#: ../libpurple/protocols/oscar/oscar.c:1262
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -8500,18 +8731,20 @@
 "să înceapă cu o literă şi să conţină doar litere, numere şi spaţii sau să "
 "conţină doar numere."
 
-#: ../libpurple/protocols/oscar/oscar.c:1345
-#: ../libpurple/protocols/yahoo/yahoo.c:2105
+#. Unregistered screen name
+#: ../libpurple/protocols/oscar/oscar.c:1347
+#: ../libpurple/protocols/yahoo/yahoo.c:2108
 msgid "Invalid screen name."
 msgstr "Nume de identificare invalid."
 
-#: ../libpurple/protocols/oscar/oscar.c:1352
-#: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1045
-#: ../libpurple/protocols/yahoo/yahoo.c:2126
+#: ../libpurple/protocols/oscar/oscar.c:1353
+#: ../libpurple/protocols/qq/login_logout.c:485
+#: ../libpurple/protocols/simple/simple.c:1112
+#: ../libpurple/protocols/yahoo/yahoo.c:2130
 msgid "Incorrect password."
 msgstr "Parolă incorectă."
 
+#. Suspended account
 #: ../libpurple/protocols/oscar/oscar.c:1357
 msgid "Your account is currently suspended."
 msgstr "Contul dumneavoastră este momentan suspendat."
@@ -8521,8 +8754,10 @@
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Serviciul de mesagerie instant AOL este temporar indisponibil."
 
-#: ../libpurple/protocols/oscar/oscar.c:1366
-#: ../libpurple/protocols/oscar/oscar.c:1377
+#. screen name connecting too frequently
+#. IP address connecting too frequently
+#: ../libpurple/protocols/oscar/oscar.c:1365
+#: ../libpurple/protocols/oscar/oscar.c:1374
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -8530,44 +8765,53 @@
 "V-aţi conectat şi deconectat prea des. Aşteptaţi zece minute şi încercaţi "
 "din nou. Dacă continuaţi să încercaţi, va trebui să aşteptaţi mai mult."
 
-#: ../libpurple/protocols/oscar/oscar.c:1371
+#. client too old
+#: ../libpurple/protocols/oscar/oscar.c:1369
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "Versiunea clientului folosit este prea veche. Actualizaţi-l la %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1410
+#: ../libpurple/protocols/oscar/oscar.c:1407
 msgid "Could Not Connect"
 msgstr "Conectare eşuată"
 
-#: ../libpurple/protocols/oscar/oscar.c:1414
+#: ../libpurple/protocols/oscar/oscar.c:1411
 msgid "Received authorization"
 msgstr "Autorizarea a fost primită"
 
-#: ../libpurple/protocols/oscar/oscar.c:1436
+#: ../libpurple/protocols/oscar/oscar.c:1434
 msgid "The SecurID key entered is invalid."
 msgstr "Cheia SecurID introdusă este invalidă."
 
-#: ../libpurple/protocols/oscar/oscar.c:1449
+#: ../libpurple/protocols/oscar/oscar.c:1447
 msgid "Enter SecurID"
 msgstr "Introducere SecurID"
 
-#: ../libpurple/protocols/oscar/oscar.c:1450
+#: ../libpurple/protocols/oscar/oscar.c:1448
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Introduceţi numărul de şase cifre afişat digital."
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#. *
+#. * @since 2.3.0
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1452
-#: ../libpurple/protocols/oscar/oscar.c:2232
-#: ../libpurple/protocols/oscar/oscar.c:2281
-#: ../libpurple/protocols/oscar/oscar.c:5885
-#: ../libpurple/protocols/oscar/oscar.c:6166 ../libpurple/request.h:1388
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#. *
+#. * @deprecated Please use purple_request_ok_cancel_with_hint instead.
+#.
+#: ../libpurple/protocols/oscar/oscar.c:1450
+#: ../libpurple/protocols/oscar/oscar.c:2242
+#: ../libpurple/protocols/oscar/oscar.c:2291
+#: ../libpurple/protocols/oscar/oscar.c:5935
+#: ../libpurple/protocols/oscar/oscar.c:6216 ../libpurple/request.h:1828
+#: ../libpurple/request.h:1841
 msgid "_OK"
 msgstr "_OK"
 
-#: ../libpurple/protocols/oscar/oscar.c:1491
-#: ../libpurple/protocols/oscar/oscar.c:1534
+#: ../libpurple/protocols/oscar/oscar.c:1489
+#: ../libpurple/protocols/oscar/oscar.c:1532
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -8576,57 +8820,57 @@
 "S-ar putea să fiţi rapid deconectat(ă). Poate doriţi să încercaţi TOC până "
 "ce se rezolvă această problemă. Vizitaţi %s pentru actualizări."
 
-#: ../libpurple/protocols/oscar/oscar.c:1494
-#: ../libpurple/protocols/oscar/oscar.c:1537
+#: ../libpurple/protocols/oscar/oscar.c:1492
+#: ../libpurple/protocols/oscar/oscar.c:1535
 msgid "Unable to get a valid AIM login hash."
 msgstr "Nu s-a putut obţine un hash valid pentru autentificarea AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:1622
+#: ../libpurple/protocols/oscar/oscar.c:1620
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr ""
 "S-ar putea să fiţi în scurt timp deconectat(ă). Vizitaţi %s pentru "
 "actualizări."
 
-#: ../libpurple/protocols/oscar/oscar.c:1625
+#: ../libpurple/protocols/oscar/oscar.c:1623
 msgid "Unable to get a valid login hash."
 msgstr "Nu s-a putut obţine un hash valid pentru autentificare."
 
-#: ../libpurple/protocols/oscar/oscar.c:1655
+#: ../libpurple/protocols/oscar/oscar.c:1653
 msgid "Password sent"
 msgstr "Parola a fost trimisă"
 
-#: ../libpurple/protocols/oscar/oscar.c:1711
+#: ../libpurple/protocols/oscar/oscar.c:1709
 msgid "Unable to initialize connection"
 msgstr "Nu se poate iniţializa o nouă conexiune"
 
-#: ../libpurple/protocols/oscar/oscar.c:2202
+#: ../libpurple/protocols/oscar/oscar.c:2200
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr ""
 "Am nevoie de autorizarea ta pentru a te putea adăuga apoi în lista mea de "
 "contacte."
 
-#: ../libpurple/protocols/oscar/oscar.c:2230
+#: ../libpurple/protocols/oscar/oscar.c:2240
 msgid "Authorization Request Message:"
 msgstr "Mesaj cerere de autorizare:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2231
+#: ../libpurple/protocols/oscar/oscar.c:2241
 msgid "Please authorize me!"
 msgstr "Am nevoie de autorizare..."
 
-#: ../libpurple/protocols/oscar/oscar.c:2272
-#: ../libpurple/protocols/oscar/oscar.c:2280
-#: ../libpurple/protocols/oscar/oscar.c:2407
-#: ../libpurple/protocols/oscar/oscar.c:5263
-#: ../libpurple/protocols/yahoo/yahoo.c:1030
+#: ../libpurple/protocols/oscar/oscar.c:2282
+#: ../libpurple/protocols/oscar/oscar.c:2290
+#: ../libpurple/protocols/oscar/oscar.c:2417
+#: ../libpurple/protocols/oscar/oscar.c:5311
+#: ../libpurple/protocols/yahoo/yahoo.c:1032
 msgid "No reason given."
 msgstr "Fără motiv."
 
-#: ../libpurple/protocols/oscar/oscar.c:2279
+#: ../libpurple/protocols/oscar/oscar.c:2289
 msgid "Authorization Denied Message:"
 msgstr "Mesajul de autorizare refuzată:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2407
+#: ../libpurple/protocols/oscar/oscar.c:2417
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -8637,18 +8881,18 @@
 "motivând astfel:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2408
+#: ../libpurple/protocols/oscar/oscar.c:2418
 msgid "ICQ authorization denied."
 msgstr "Autorizarea ICQ a fost refuzată."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2415
+#: ../libpurple/protocols/oscar/oscar.c:2425
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 "Utilizatorul %u v-a acordat dreptul de a-l adăuga la lista de contacte."
 
-#: ../libpurple/protocols/oscar/oscar.c:2423
+#: ../libpurple/protocols/oscar/oscar.c:2433
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8661,7 +8905,7 @@
 "Expeditor: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2431
+#: ../libpurple/protocols/oscar/oscar.c:2441
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8674,7 +8918,7 @@
 "Expeditor: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2439
+#: ../libpurple/protocols/oscar/oscar.c:2449
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -8687,24 +8931,24 @@
 "Mesajul este:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2460
+#: ../libpurple/protocols/oscar/oscar.c:2470
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "Utilizatorul ICQ %u v-a trimis un contact: %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2466
+#: ../libpurple/protocols/oscar/oscar.c:2476
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Doriţi să adăugaţi acest contact în lista de contacte?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2471 ../pidgin/gtkroomlist.c:309
+#: ../libpurple/protocols/oscar/oscar.c:2481 ../pidgin/gtkroomlist.c:318
 msgid "_Add"
 msgstr "_Adaugă"
 
-#: ../libpurple/protocols/oscar/oscar.c:2472
+#: ../libpurple/protocols/oscar/oscar.c:2482
 msgid "_Decline"
 msgstr "_Refuz"
 
-#: ../libpurple/protocols/oscar/oscar.c:2596
+#: ../libpurple/protocols/oscar/oscar.c:2606
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
@@ -8712,7 +8956,7 @@
 msgstr[1] "Aţi pierdut %hu mesaje de la %s deoarece erau invalide."
 msgstr[2] "Aţi pierdut %hu de mesaje de la %s deoarece erau invalide."
 
-#: ../libpurple/protocols/oscar/oscar.c:2605
+#: ../libpurple/protocols/oscar/oscar.c:2615
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
@@ -8720,7 +8964,7 @@
 msgstr[1] "Aţi pierdut %hu mesaje de la %s pentru că erau prea mari."
 msgstr[2] "Aţi pierdut %hu de mesaje de la %s pentru că erau prea mari."
 
-#: ../libpurple/protocols/oscar/oscar.c:2614
+#: ../libpurple/protocols/oscar/oscar.c:2624
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -8731,7 +8975,7 @@
 msgstr[2] ""
 "Aţi pierdut %hu de mesaje de la %s pentru că au depăşit limita fixată."
 
-#: ../libpurple/protocols/oscar/oscar.c:2623
+#: ../libpurple/protocols/oscar/oscar.c:2633
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
@@ -8742,7 +8986,7 @@
 msgstr[2] ""
 "Aţi pierdut %hu de mesaje de la %s pentru că expeditorul era prea periculos."
 
-#: ../libpurple/protocols/oscar/oscar.c:2632
+#: ../libpurple/protocols/oscar/oscar.c:2642
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
@@ -8751,7 +8995,7 @@
 msgstr[2] ""
 "Aţi pierdut %hu de mesaje de la %s pentru că aţi fost prea periculos."
 
-#: ../libpurple/protocols/oscar/oscar.c:2641
+#: ../libpurple/protocols/oscar/oscar.c:2651
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
@@ -8760,47 +9004,47 @@
 msgstr[2] "Aţi pierdut %hu de mesaje de la %s din motive necunoscute."
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2796
+#: ../libpurple/protocols/oscar/oscar.c:2806
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Mesajul nu poate fi trimis: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2796
-#: ../libpurple/protocols/oscar/oscar.c:2801
-#: ../libpurple/protocols/oscar/oscar.c:2865
+#: ../libpurple/protocols/oscar/oscar.c:2806
+#: ../libpurple/protocols/oscar/oscar.c:2811
+#: ../libpurple/protocols/oscar/oscar.c:2875
 msgid "Unknown reason."
 msgstr "Motiv necunoscut."
 
-#: ../libpurple/protocols/oscar/oscar.c:2799
-#: ../libpurple/protocols/sametime/sametime.c:2409
+#: ../libpurple/protocols/oscar/oscar.c:2809
+#: ../libpurple/protocols/sametime/sametime.c:2451
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Nu se poate trimite mesajul către %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2865
+#: ../libpurple/protocols/oscar/oscar.c:2875
 #, c-format
 msgid "User information not available: %s"
 msgstr "Detaliile utilizatorului nu sunt disponibile: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2896
+#: ../libpurple/protocols/oscar/oscar.c:2906
 msgid "Online Since"
 msgstr "Conectat(ă) din"
 
-#: ../libpurple/protocols/oscar/oscar.c:2901
+#: ../libpurple/protocols/oscar/oscar.c:2911
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr "Membru din"
 
-#: ../libpurple/protocols/oscar/oscar.c:2936
+#: ../libpurple/protocols/oscar/oscar.c:2946
 msgid "Available Message"
 msgstr "Mesaj ce arată disponibilitatea"
 
-#: ../libpurple/protocols/oscar/oscar.c:3044
+#: ../libpurple/protocols/oscar/oscar.c:3054
 msgid "Your AIM connection may be lost."
 msgstr "S-ar putea să fi pierdut conexiunea AIM."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3232
+#: ../libpurple/protocols/oscar/oscar.c:3242
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -8808,7 +9052,7 @@
 "[Nu se poate afişa mesajul acestui utilizator deoarece conţine caractere "
 "invalide]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3396
+#: ../libpurple/protocols/oscar/oscar.c:3406
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -8816,53 +9060,53 @@
 "Ultima acţiune cerută nu a fost îndeplinită pentru că aţi depăşit limitarea "
 "fixată. Aşteptaţi 10 secunde şi încercaţi din nou."
 
-#: ../libpurple/protocols/oscar/oscar.c:3479
+#: ../libpurple/protocols/oscar/oscar.c:3489
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Aţi fost deconectat(ă) din camera de chat %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3729
-#: ../libpurple/protocols/silc/util.c:585
+#: ../libpurple/protocols/oscar/oscar.c:3739
+#: ../libpurple/protocols/silc/util.c:591
 #: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "Telefon mobil"
 
-#: ../libpurple/protocols/oscar/oscar.c:3759
+#: ../libpurple/protocols/oscar/oscar.c:3769
 msgid "Personal Web Page"
 msgstr "Pagină personală"
 
-#: ../libpurple/protocols/oscar/oscar.c:3783
+#: ../libpurple/protocols/oscar/oscar.c:3793
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Alte informaţii"
 
-#: ../libpurple/protocols/oscar/oscar.c:3791
-#: ../libpurple/protocols/oscar/oscar.c:3804
+#: ../libpurple/protocols/oscar/oscar.c:3801
+#: ../libpurple/protocols/oscar/oscar.c:3814
 msgid "Zip Code"
 msgstr "Cod poştal"
 
-#: ../libpurple/protocols/oscar/oscar.c:3815
+#: ../libpurple/protocols/oscar/oscar.c:3825
 msgid "Division"
 msgstr "Departament"
 
-#: ../libpurple/protocols/oscar/oscar.c:3816
+#: ../libpurple/protocols/oscar/oscar.c:3826
 msgid "Position"
 msgstr "Poziţie"
 
-#: ../libpurple/protocols/oscar/oscar.c:3818
+#: ../libpurple/protocols/oscar/oscar.c:3828
 msgid "Web Page"
 msgstr "Adresă Internet"
 
-#: ../libpurple/protocols/oscar/oscar.c:3821
+#: ../libpurple/protocols/oscar/oscar.c:3831
 msgid "Work Information"
 msgstr "Informaţii serviciu"
 
-#: ../libpurple/protocols/oscar/oscar.c:3877
+#: ../libpurple/protocols/oscar/oscar.c:3887
 msgid "Pop-Up Message"
 msgstr "Mesaj popup"
 
-#: ../libpurple/protocols/oscar/oscar.c:3917
+#: ../libpurple/protocols/oscar/oscar.c:3927
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
@@ -8870,30 +9114,29 @@
 msgstr[1] "Următoarele nume de identificare sunt asociate cu %s:"
 msgstr[2] "Următoarele nume de identificare sunt asociate cu %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:3922
+#: ../libpurple/protocols/oscar/oscar.c:3932
 msgid "Screen name"
 msgstr "Nume de identificare"
 
-#: ../libpurple/protocols/oscar/oscar.c:3948
+#: ../libpurple/protocols/oscar/oscar.c:3958
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "Nu s-a găsit nici un rezultat pentru adresa de mail %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3969
+#: ../libpurple/protocols/oscar/oscar.c:3979
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Ar trebui să primiţi un mail care să vă ceară confirmarea %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3971
+#: ../libpurple/protocols/oscar/oscar.c:3981
 msgid "Account Confirmation Requested"
 msgstr "Vi s-a cerut confirmarea contului"
 
-#: ../libpurple/protocols/oscar/oscar.c:4002
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:4012
 msgid "Error Changing Account Info"
 msgstr "Eroare la schimbarea detaliilor contului"
 
-#: ../libpurple/protocols/oscar/oscar.c:4005
+#: ../libpurple/protocols/oscar/oscar.c:4015
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8902,14 +9145,14 @@
 "Eroare 0x%04x: Nu se poate formata numele de identificare pentru că numele "
 "cerut este diferit de cel original."
 
-#: ../libpurple/protocols/oscar/oscar.c:4008
+#: ../libpurple/protocols/oscar/oscar.c:4018
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr ""
 "Eroare 0x%04x: Nu se poate formata numele de identificare pentru că este "
 "invalid."
 
-#: ../libpurple/protocols/oscar/oscar.c:4011
+#: ../libpurple/protocols/oscar/oscar.c:4021
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8918,7 +9161,7 @@
 "Eroare 0x%04x: Nu se poate formata numele de identificare pentru că numele "
 "cerut este prea lung."
 
-#: ../libpurple/protocols/oscar/oscar.c:4014
+#: ../libpurple/protocols/oscar/oscar.c:4024
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -8927,7 +9170,7 @@
 "Eroare 0x%04x: Nu se poate schimba adresa de mail pentru că există deja o "
 "cerere în aşteptare pentru acest nume de identificare."
 
-#: ../libpurple/protocols/oscar/oscar.c:4017
+#: ../libpurple/protocols/oscar/oscar.c:4027
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -8936,7 +9179,7 @@
 "Eroare 0x%04x: Nu se poate schimba adresa de mail pentru că adresa introdusă "
 "are prea multe nume de identificare asociate."
 
-#: ../libpurple/protocols/oscar/oscar.c:4020
+#: ../libpurple/protocols/oscar/oscar.c:4030
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -8945,32 +9188,32 @@
 "Eroare 0x%04x: Nu se poate schimba adresa de mail pentru că adresa introdusă "
 "este invalidă."
 
-#: ../libpurple/protocols/oscar/oscar.c:4023
+#: ../libpurple/protocols/oscar/oscar.c:4033
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Eroare 0x%04x: Eroare necunoscută."
 
-#: ../libpurple/protocols/oscar/oscar.c:4033
+#: ../libpurple/protocols/oscar/oscar.c:4043
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "Adresa de mail pentru %s este %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4035
+#: ../libpurple/protocols/oscar/oscar.c:4045
 msgid "Account Info"
 msgstr "Detalii cont"
 
-#: ../libpurple/protocols/oscar/oscar.c:4218
+#: ../libpurple/protocols/oscar/oscar.c:4228
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
-"Avatarul nu v-a fost trimis. Trebuie să vă conectaţi direct pentru a fi "
-"posibilă trimiterea avatarului."
-
-#: ../libpurple/protocols/oscar/oscar.c:4489
+"Nu s-a trimis imaginea IM. Trebuie să vă conectaţi direct pentru a fi "
+"posibilă trimiterea de imagini IM."
+
+#: ../libpurple/protocols/oscar/oscar.c:4499
 msgid "Unable to set AIM profile."
 msgstr "Nu se poate seta profilul AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:4490
+#: ../libpurple/protocols/oscar/oscar.c:4500
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
@@ -8980,7 +9223,7 @@
 "Profilul vă va rămâne la fel. Încercaţi să-l setaţi din nou când veţi fi "
 "conectat(ă) 100%."
 
-#: ../libpurple/protocols/oscar/oscar.c:4504
+#: ../libpurple/protocols/oscar/oscar.c:4514
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -8998,11 +9241,11 @@
 "Aţi depăşit lungimea maximă de %d de octeţi a profilului. A fost trunchiat "
 "automat."
 
-#: ../libpurple/protocols/oscar/oscar.c:4509
+#: ../libpurple/protocols/oscar/oscar.c:4519
 msgid "Profile too long."
 msgstr "Profil prea lung."
 
-#: ../libpurple/protocols/oscar/oscar.c:4554
+#: ../libpurple/protocols/oscar/oscar.c:4564
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -9020,11 +9263,11 @@
 "Mesajul în absenţă depăşeşte lungimea maximă de %d de octeţi. S-a trunchiat "
 "mesajul şi aţi fost trecut(ă) în absenţă."
 
-#: ../libpurple/protocols/oscar/oscar.c:4559
+#: ../libpurple/protocols/oscar/oscar.c:4569
 msgid "Away message too long."
 msgstr "Mesaj în absenţă prea lung."
 
-#: ../libpurple/protocols/oscar/oscar.c:4628
+#: ../libpurple/protocols/oscar/oscar.c:4642
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -9035,33 +9278,33 @@
 "invalid. Un nume valid trebuie să fie o adresă de mail sau să înceapă cu o "
 "literă şi să conţină doar litere, numere şi spaţii sau doar numere."
 
-#: ../libpurple/protocols/oscar/oscar.c:4630
-#: ../libpurple/protocols/oscar/oscar.c:5060
-#: ../libpurple/protocols/oscar/oscar.c:5075
+#: ../libpurple/protocols/oscar/oscar.c:4644
+#: ../libpurple/protocols/oscar/oscar.c:5097
+#: ../libpurple/protocols/oscar/oscar.c:5112
 msgid "Unable To Add"
 msgstr "Adăugare eşuată"
 
-#: ../libpurple/protocols/oscar/oscar.c:4739
+#: ../libpurple/protocols/oscar/oscar.c:4763
 msgid "Unable To Retrieve Buddy List"
 msgstr "Nu se poate descărca lista de contacte"
 
-#: ../libpurple/protocols/oscar/oscar.c:4740
+#: ../libpurple/protocols/oscar/oscar.c:4764
 msgid ""
 "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."
+"list is not lost, and will probably become available in a few minutes."
 msgstr ""
 "Nu s-a putut descărca deocamdată lista de contacte de pe serverele AIM. "
-"Lista nu este pierdută, dar va fi probabil disponibilă abia în câteva ore."
-
-#: ../libpurple/protocols/oscar/oscar.c:4922
-#: ../libpurple/protocols/oscar/oscar.c:4924
-#: ../libpurple/protocols/oscar/oscar.c:5140
-#: ../libpurple/protocols/oscar/oscar.c:5141
-#: ../libpurple/protocols/oscar/oscar.c:5146
+"Lista nu este pierdută, dar va fi probabil disponibilă abia în câteva minute."
+
+#: ../libpurple/protocols/oscar/oscar.c:4947
+#: ../libpurple/protocols/oscar/oscar.c:4949
+#: ../libpurple/protocols/oscar/oscar.c:5177
+#: ../libpurple/protocols/oscar/oscar.c:5178
+#: ../libpurple/protocols/oscar/oscar.c:5183
 msgid "Orphans"
 msgstr "Orfani"
 
-#: ../libpurple/protocols/oscar/oscar.c:5058
+#: ../libpurple/protocols/oscar/oscar.c:5095
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -9070,17 +9313,17 @@
 "Nu s-a putut adăuga contactul %s deoarece aveţi prea multe contacte în lista "
 "de contacte. Ştergeţi unul şi încercaţi din nou."
 
-#: ../libpurple/protocols/oscar/oscar.c:5058
-#: ../libpurple/protocols/oscar/oscar.c:5073
+#: ../libpurple/protocols/oscar/oscar.c:5095
+#: ../libpurple/protocols/oscar/oscar.c:5110
 msgid "(no name)"
 msgstr "(fără nume)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5072
+#: ../libpurple/protocols/oscar/oscar.c:5109
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason."
 msgstr "Din motive necunoscute nu s-a putut adăuga contactul %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:5178
+#: ../libpurple/protocols/oscar/oscar.c:5226
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -9089,23 +9332,23 @@
 "Utilizatorul %s v-a autorizat să-l adăugaţi în lista de contacte. Doriţi să-"
 "l adăugaţi?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5186
+#: ../libpurple/protocols/oscar/oscar.c:5234
 msgid "Authorization Given"
 msgstr "Autorizare acordată"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5259
+#: ../libpurple/protocols/oscar/oscar.c:5307
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 "Utilizatorul %s v-a acordat permisiunea de a-l adăuga în lista de contacte."
 
-#: ../libpurple/protocols/oscar/oscar.c:5260
+#: ../libpurple/protocols/oscar/oscar.c:5308
 msgid "Authorization Granted"
 msgstr "Autorizare acordată"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5263
+#: ../libpurple/protocols/oscar/oscar.c:5311
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -9116,52 +9359,51 @@
 "următorul motiv:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5264
+#: ../libpurple/protocols/oscar/oscar.c:5312
 msgid "Authorization Denied"
 msgstr "Autorizare refuzată"
 
-#: ../libpurple/protocols/oscar/oscar.c:5300
+#: ../libpurple/protocols/oscar/oscar.c:5348
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "Cheie numerică (e_xchange):"
 
-#: ../libpurple/protocols/oscar/oscar.c:5340
+#: ../libpurple/protocols/oscar/oscar.c:5388
 msgid "Invalid chat name specified."
 msgstr "Aţi specificat un nume invalid de cameră de chat."
 
-#: ../libpurple/protocols/oscar/oscar.c:5409
+#: ../libpurple/protocols/oscar/oscar.c:5457
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
-msgstr ""
-"Avatarul nu v-a fost trimis. Nu vă puteţi trimite avatarul în chat-urile AIM."
-
-#: ../libpurple/protocols/oscar/oscar.c:5569
-#: ../libpurple/protocols/oscar/oscar.c:5574
+msgstr "Imaginea IM nu a fost trimisă. Nu puteţi trimite imagini IM în chat-urile AIM."
+
+#: ../libpurple/protocols/oscar/oscar.c:5619
+#: ../libpurple/protocols/oscar/oscar.c:5624
 msgid "Away Message"
 msgstr "Mesaj în absenţă"
 
-#: ../libpurple/protocols/oscar/oscar.c:5574
+#: ../libpurple/protocols/oscar/oscar.c:5624
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(se descarcă)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5774
+#: ../libpurple/protocols/oscar/oscar.c:5824
 msgid "iTunes Music Store Link"
 msgstr "Link către magazinul iTunes"
 
-#: ../libpurple/protocols/oscar/oscar.c:5882
+#: ../libpurple/protocols/oscar/oscar.c:5932
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Comentariu contact pentru %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5883
+#: ../libpurple/protocols/oscar/oscar.c:5933
 msgid "Buddy Comment:"
 msgstr "Comentariu contact:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5930
+#: ../libpurple/protocols/oscar/oscar.c:5980
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Aţi ales să deschideţi o discuţie directă cu %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:5934
+#: ../libpurple/protocols/oscar/oscar.c:5984
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -9169,66 +9411,66 @@
 "Pentru că adresa IP vă va fi vizibilă, vă rugăm să evaluaţi riscurile la "
 "care vă expuneţi. Doriţi să continuaţi?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5940
-#: ../libpurple/protocols/oscar/peer.c:1045
+#: ../libpurple/protocols/oscar/oscar.c:5990
+#: ../libpurple/protocols/oscar/peer.c:1047
 msgid "C_onnect"
 msgstr "C_onectare"
 
-#: ../libpurple/protocols/oscar/oscar.c:5975
+#: ../libpurple/protocols/oscar/oscar.c:6025
 msgid "Get AIM Info"
 msgstr "Detalii AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:5981
+#: ../libpurple/protocols/oscar/oscar.c:6031
 msgid "Edit Buddy Comment"
 msgstr "Editare comentariu"
 
-#: ../libpurple/protocols/oscar/oscar.c:5989
+#: ../libpurple/protocols/oscar/oscar.c:6039
 msgid "Get Status Msg"
 msgstr "Arată mesajul de status"
 
-#: ../libpurple/protocols/oscar/oscar.c:6002
+#: ../libpurple/protocols/oscar/oscar.c:6052
 msgid "Direct IM"
 msgstr "Discuţie directă"
 
-#: ../libpurple/protocols/oscar/oscar.c:6024
+#: ../libpurple/protocols/oscar/oscar.c:6074
 msgid "Re-request Authorization"
 msgstr "Solicit din nou autorizare"
 
-#: ../libpurple/protocols/oscar/oscar.c:6083
+#: ../libpurple/protocols/oscar/oscar.c:6133
 msgid "Require authorization"
 msgstr "Solicit autorizare"
 
-#: ../libpurple/protocols/oscar/oscar.c:6086
+#: ../libpurple/protocols/oscar/oscar.c:6136
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Prezenţă online (activarea vă expune la spam!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6091
+#: ../libpurple/protocols/oscar/oscar.c:6141
 msgid "ICQ Privacy Options"
 msgstr "Opţiuni de securitate ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:6110
+#: ../libpurple/protocols/oscar/oscar.c:6160
 msgid "The new formatting is invalid."
 msgstr "Formatul nou este invalid."
 
-#: ../libpurple/protocols/oscar/oscar.c:6111
+#: ../libpurple/protocols/oscar/oscar.c:6161
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "Formatarea numelor de identificare nu poate schimba decât spaţiile albe şi "
 "capitalizarea."
 
-#: ../libpurple/protocols/oscar/oscar.c:6164
+#: ../libpurple/protocols/oscar/oscar.c:6214
 msgid "Change Address To:"
 msgstr "Schimbă adresa în:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6210
+#: ../libpurple/protocols/oscar/oscar.c:6260
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>nu aşteptaţi nici o autorizare</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6213
+#: ../libpurple/protocols/oscar/oscar.c:6263
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Lista contactelor de la care aşteptaţi autorizarea"
 
-#: ../libpurple/protocols/oscar/oscar.c:6214
+#: ../libpurple/protocols/oscar/oscar.c:6264
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -9236,73 +9478,73 @@
 "Puteţi solicita din nou autorizarea de la aceste contacte selectând „Solicit "
 "din nou autorizare” după un click dreapta pe nume în lista contactelor."
 
-#: ../libpurple/protocols/oscar/oscar.c:6231
+#: ../libpurple/protocols/oscar/oscar.c:6281
 msgid "Find Buddy by E-Mail"
 msgstr "Căutare contact după adresa de mail"
 
-#: ../libpurple/protocols/oscar/oscar.c:6232
+#: ../libpurple/protocols/oscar/oscar.c:6282
 msgid "Search for a buddy by e-mail address"
 msgstr "Căutare contact după adresa de mail"
 
-#: ../libpurple/protocols/oscar/oscar.c:6233
+#: ../libpurple/protocols/oscar/oscar.c:6283
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Introduceţi adresa de mail a contactului căutat:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6236
+#: ../libpurple/protocols/oscar/oscar.c:6286
 msgid "_Search"
 msgstr "C_aută"
 
-#: ../libpurple/protocols/oscar/oscar.c:6394
+#: ../libpurple/protocols/oscar/oscar.c:6444
 msgid "Set User Info (URL)..."
 msgstr "Setare detalii (online)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6405
+#: ../libpurple/protocols/oscar/oscar.c:6455
 msgid "Change Password (URL)"
 msgstr "Schimbare parolă (online)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6409
+#: ../libpurple/protocols/oscar/oscar.c:6459
 msgid "Configure IM Forwarding (URL)"
 msgstr "Configurare înaintare mesaje (online)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6419
+#: ../libpurple/protocols/oscar/oscar.c:6469
 msgid "Set Privacy Options..."
 msgstr "Opţiuni de securitate..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6426
+#: ../libpurple/protocols/oscar/oscar.c:6476
 msgid "Confirm Account"
 msgstr "Confirmare cont"
 
-#: ../libpurple/protocols/oscar/oscar.c:6430
+#: ../libpurple/protocols/oscar/oscar.c:6480
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Afişare adresă de mail înregistrată curent"
 
-#: ../libpurple/protocols/oscar/oscar.c:6434
+#: ../libpurple/protocols/oscar/oscar.c:6484
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Schimbare adresă de mail înregistrată curent..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6441
+#: ../libpurple/protocols/oscar/oscar.c:6491
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Afişare contacte ce aşteaptă autorizarea"
 
-#: ../libpurple/protocols/oscar/oscar.c:6447
+#: ../libpurple/protocols/oscar/oscar.c:6497
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Căutare contact după adresa de mail..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6452
+#: ../libpurple/protocols/oscar/oscar.c:6502
 msgid "Search for Buddy by Information"
 msgstr "Căutare contact după detalii"
 
-#: ../libpurple/protocols/oscar/oscar.c:6520
+#: ../libpurple/protocols/oscar/oscar.c:6570
 msgid "Use recent buddies group"
 msgstr "Utilizează un grup pentru contactele recente"
 
-#: ../libpurple/protocols/oscar/oscar.c:6523
+#: ../libpurple/protocols/oscar/oscar.c:6573
 msgid "Show how long you have been idle"
 msgstr "Arată perioada de inactivitate"
 
-#: ../libpurple/protocols/oscar/oscar.c:6678
+#: ../libpurple/protocols/oscar/oscar.c:6728
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -9310,35 +9552,34 @@
 "Utilizează serverul proxy ICQ pentru transferul de\n"
 "fişiere (mai încet, dar nu se dezvăluie adresa IP)"
 
-#: ../libpurple/protocols/oscar/peer.c:697
+#: ../libpurple/protocols/oscar/peer.c:699
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "Cerere către %s pentru a ne conecta la %s:%hu pentru discuţie directă."
 
-#: ../libpurple/protocols/oscar/peer.c:782
+#: ../libpurple/protocols/oscar/peer.c:784
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "Încercare de conectare la %s:%hu."
 
-#: ../libpurple/protocols/oscar/peer.c:856
-#, c-format
+#: ../libpurple/protocols/oscar/peer.c:858
 msgid "Attempting to connect via proxy server."
 msgstr "Încercare de conectare prin serverul proxy."
 
-#: ../libpurple/protocols/oscar/peer.c:1033
+#: ../libpurple/protocols/oscar/peer.c:1035
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s tocmai a cerut o conexiune directă cu %s"
 
-#: ../libpurple/protocols/oscar/peer.c:1037
+#: ../libpurple/protocols/oscar/peer.c:1039
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
 "considered a privacy risk."
 msgstr ""
 "Aceasta presupune o conexiune directă între cele două calculatoare şi este "
-"necesară pentru imaginile asociate conturilor. Pentru că adresa IP vă va fi "
-"expusă, luaţi în considerare riscurile la care vă expuneţi."
+"necesară pentru imaginile IM. Pentru că adresa IP vă va fi expusă, luaţi în "
+"considerare riscurile la care vă expuneţi."
 
 #: ../libpurple/protocols/qq/buddy_info.c:39
 msgid "Primary Information"
@@ -9492,20 +9733,20 @@
 msgid "Other"
 msgstr "Altceva"
 
-#: ../libpurple/protocols/qq/buddy_info.c:481
-#: ../libpurple/protocols/qq/buddy_info.c:482
+#: ../libpurple/protocols/qq/buddy_info.c:522
+#: ../libpurple/protocols/qq/buddy_info.c:523
 msgid "Modify my information"
 msgstr "Editare detalii proprii"
 
-#: ../libpurple/protocols/qq/buddy_info.c:483
+#: ../libpurple/protocols/qq/buddy_info.c:524
 msgid "Update my information"
 msgstr "Actualizare detalii proprii"
 
-#: ../libpurple/protocols/qq/buddy_info.c:507
+#: ../libpurple/protocols/qq/buddy_info.c:548
 msgid "Your information has been updated"
 msgstr "Detaliile v-au fost actualizate"
 
-#: ../libpurple/protocols/qq/buddy_info.c:560
+#: ../libpurple/protocols/qq/buddy_info.c:601
 #, c-format
 msgid ""
 "Setting custom faces is not currently supported. Please choose an image from "
@@ -9514,8 +9755,8 @@
 "Alegerea unui avatar personalizat nu este suportată deocamdată. Alegeţi o "
 "imagine de la %s."
 
-#: ../libpurple/protocols/qq/buddy_info.c:577
-#: ../libpurple/protocols/qq/buddy_info.c:590
+#: ../libpurple/protocols/qq/buddy_info.c:618
+#: ../libpurple/protocols/qq/buddy_info.c:631
 msgid "Invalid QQ Face"
 msgstr "Avatar QQ invalid"
 
@@ -9540,7 +9781,6 @@
 msgstr "Scuze, nu eşti genul meu..."
 
 #: ../libpurple/protocols/qq/buddy_opt.c:277
-#, fuzzy
 msgid "Add buddy with auth request failed"
 msgstr "Adaugă contactul cu cereri eşuate de autorizare"
 
@@ -9551,7 +9791,6 @@
 
 #. TODO: Does the user really need to be notified about this?
 #: ../libpurple/protocols/qq/buddy_opt.c:338
-#, fuzzy
 msgid "You have successfully removed yourself from your friend's buddy list"
 msgstr "V-aţi şters cu succes din lista contactului"
 
@@ -9581,9 +9820,9 @@
 msgstr "Trimite"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:418
-#, fuzzy, c-format
+#, c-format
 msgid "You have added %d to buddy list"
-msgstr "L-aţi adăugat pe %d în lista de contacte"
+msgstr "Aţi adăugat contactul %d în lista de contacte"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:515
 msgid "QQid Error"
@@ -9618,7 +9857,6 @@
 msgstr "QQ Qun"
 
 #: ../libpurple/protocols/qq/group.c:120
-#, fuzzy
 msgid "Please enter external group ID"
 msgstr "Introduceţi ID-ul grupului extern"
 
@@ -9627,7 +9865,7 @@
 msgstr "Puteţi căuta doar grupuri QQ permanente\n"
 
 #: ../libpurple/protocols/qq/group_im.c:126
-#, fuzzy, c-format
+#, c-format
 msgid "User %d requested to join group %d"
 msgstr "Utilizatorul %d a cerut înscrierea în grupul %d"
 
@@ -9659,31 +9897,30 @@
 msgstr "Aprobă"
 
 #: ../libpurple/protocols/qq/group_im.c:180
-#, fuzzy, c-format
+#, c-format
 msgid "Your request to join group %d has been rejected by admin %d"
 msgstr "Cererea de a vă alătura grupului %d v-a fost respinsă de adminul %d"
 
 #: ../libpurple/protocols/qq/group_im.c:221
-#, fuzzy, c-format
+#, c-format
 msgid "Your request to join group %d has been approved by admin %d"
 msgstr "Cererea de a vă alătura grupului %d v-a fost aprobată de adminul %d"
 
 #: ../libpurple/protocols/qq/group_im.c:257
-#, fuzzy, c-format
+#, c-format
 msgid "You [%d] have left group \"%d\""
 msgstr "[%d] a părăsit grupul „%d”"
 
 #: ../libpurple/protocols/qq/group_im.c:291
-#, fuzzy, c-format
+#, c-format
 msgid "You [%d] have been added to group \"%d\""
-msgstr "[%d] a fost adăugat de grupul „%d”"
+msgstr "Aţi fost adăugat cu identitatea %d în grupul „%d”"
 
 #: ../libpurple/protocols/qq/group_im.c:292
 msgid "This group has been added to your buddy list"
 msgstr "Acest grup a fost adăugat la lista dumneavoastră de contacte"
 
 #: ../libpurple/protocols/qq/group_internal.c:41
-#, fuzzy
 msgid "I am not a member"
 msgstr "Nu sunt un membru"
 
@@ -9708,7 +9945,6 @@
 msgstr "Acest grup nu permite înscrierea altor contacte"
 
 #: ../libpurple/protocols/qq/group_join.c:233
-#, fuzzy
 msgid "You have successfully left the group"
 msgstr "Aţi părăsit cu succes grupul"
 
@@ -9717,19 +9953,16 @@
 msgstr "Autorizare grup QQ"
 
 #: ../libpurple/protocols/qq/group_join.c:258
-#, fuzzy
 msgid "Your authorization request has been accepted by the QQ server"
-msgstr "Operaţia de autorizare a fost acceptată de serverul QQ"
+msgstr "Operaţiunea de autorizare a fost acceptată de serverul QQ"
 
 #: ../libpurple/protocols/qq/group_join.c:329
-#, fuzzy
 msgid "You entered a group ID outside the acceptable range"
 msgstr "Aţi introdus un ID de grup prea mic sau prea mare"
 
 #: ../libpurple/protocols/qq/group_join.c:360
-#, fuzzy
 msgid "Are you sure you want to leave this Qun?"
-msgstr "Sigur doriţi să ştergeţi %s?"
+msgstr "Sigur doriţi să părăsiţi acest Qun?"
 
 #: ../libpurple/protocols/qq/group_join.c:362
 msgid ""
@@ -9751,24 +9984,20 @@
 #. we want to see window
 #: ../libpurple/protocols/qq/group_opt.c:124
 #: ../libpurple/protocols/qq/sys_msg.c:87
-#, fuzzy
 msgid "Do you want to approve the request?"
 msgstr "Doriţi să aprobaţi cererea?"
 
 #: ../libpurple/protocols/qq/group_opt.c:137
-#, fuzzy
 msgid "Enter your reason:"
 msgstr "Precizaţi motivul:"
 
 #: ../libpurple/protocols/qq/group_opt.c:235
-#, fuzzy
 msgid "You have successfully modified Qun member"
 msgstr "Aţi modificat cu succes membrul Qun"
 
 #: ../libpurple/protocols/qq/group_opt.c:305
-#, fuzzy
 msgid "You have successfully modified Qun information"
-msgstr "Aţi modificat cu succes informaţia Qun"
+msgstr "Aţi modificat cu succes detaliile Qun"
 
 #: ../libpurple/protocols/qq/group_opt.c:392
 msgid "You have successfully created a Qun"
@@ -9790,114 +10019,108 @@
 msgid "Failed to send IM."
 msgstr "Nu s-a putut trimite mesajul."
 
-#: ../libpurple/protocols/qq/keep_alive.c:87
-#, fuzzy
+#: ../libpurple/protocols/qq/keep_alive.c:88
 msgid "Keep alive error"
-msgstr "Eroare la citire"
+msgstr "Eroare „keep alive”"
 
 #: ../libpurple/protocols/qq/login_logout.c:408
-#, fuzzy
 msgid "Error requesting login token"
-msgstr "Eroare la stabilirea conexiunii"
-
-#: ../libpurple/protocols/qq/login_logout.c:486
+msgstr "Eroare la cererea unui „token” de autentificare"
+
+#: ../libpurple/protocols/qq/login_logout.c:489
 msgid "Unable to login, check debug log"
 msgstr "Autentificare eşuată, verificaţi înregistrările de depanare"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
+#: ../libpurple/protocols/qq/qq.c:140 ../libpurple/protocols/toc/toc.c:173
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:109
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:189
-#: ../libpurple/protocols/yahoo/ycht.c:549
+#: ../libpurple/protocols/yahoo/ycht.c:550
 msgid "Unable to connect."
 msgstr "Nu se poate deschide o conexiune."
 
-#: ../libpurple/protocols/qq/qq.c:186
+#: ../libpurple/protocols/qq/qq.c:187
 #, c-format
 msgid "Unknown-%d"
 msgstr "%d-necunoscut(ă)"
 
-#: ../libpurple/protocols/qq/qq.c:211
-#, fuzzy
+#: ../libpurple/protocols/qq/qq.c:212
 msgid "TCP Address"
-msgstr "Adresă IP"
-
-#: ../libpurple/protocols/qq/qq.c:213
-#, fuzzy
+msgstr "Adresă TCP"
+
+#: ../libpurple/protocols/qq/qq.c:214
 msgid "UDP Address"
-msgstr "Adresă IP"
-
-#: ../libpurple/protocols/qq/qq.c:242
+msgstr "Adresă UDP"
+
+#: ../libpurple/protocols/qq/qq.c:243
 msgid "Level"
 msgstr "Nivel"
 
-#: ../libpurple/protocols/qq/qq.c:373
+#: ../libpurple/protocols/qq/qq.c:374
 msgid "Invalid name"
 msgstr "Nume invalid"
 
-#: ../libpurple/protocols/qq/qq.c:439
+#: ../libpurple/protocols/qq/qq.c:440
 #, c-format
 msgid "<b>Current Online</b>: %d<br>\n"
 msgstr "<b>Conectaţi:</b> %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:440
+#: ../libpurple/protocols/qq/qq.c:441
 #, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr "<b>Ultima actualizare:</b> %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:444
+#: ../libpurple/protocols/qq/qq.c:445
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>Mod de conectare</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:445
+#: ../libpurple/protocols/qq/qq.c:446
 #, c-format
 msgid "<b>Server IP</b>: %s: %d<br>\n"
 msgstr "<b>IP server</b>: %s: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:446
+#: ../libpurple/protocols/qq/qq.c:447
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
 msgstr "<b>IP-ul meu public</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:451
+#: ../libpurple/protocols/qq/qq.c:452
 #, c-format
 msgid "<b>Login Time</b>: %s<br>\n"
 msgstr "<b>Autentificat la</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:452
+#: ../libpurple/protocols/qq/qq.c:453
 #, c-format
 msgid "<b>Last Login IP</b>: %s<br>\n"
 msgstr "<b>IP-ul ultimei autentificări</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:453
+#: ../libpurple/protocols/qq/qq.c:454
 #, c-format
 msgid "<b>Last Login Time</b>: %s\n"
 msgstr "<b>Ultima autentificare</b>: %s\n"
 
-#: ../libpurple/protocols/qq/qq.c:457
+#: ../libpurple/protocols/qq/qq.c:458
 msgid "Login Information"
 msgstr "Informaţii de autentificare"
 
-#: ../libpurple/protocols/qq/qq.c:533
-#, fuzzy
+#: ../libpurple/protocols/qq/qq.c:534
 msgid "Set My Information"
-msgstr "Informaţii server"
-
-#: ../libpurple/protocols/qq/qq.c:536 ../libpurple/protocols/toc/toc.c:1680
+msgstr "Setare detalii proprii"
+
+#: ../libpurple/protocols/qq/qq.c:537 ../libpurple/protocols/toc/toc.c:1680
 msgid "Change Password"
 msgstr "Schimbare parolă"
 
-#: ../libpurple/protocols/qq/qq.c:539
+#: ../libpurple/protocols/qq/qq.c:540
 msgid "Show Login Information"
 msgstr "Arată informaţiile de autentificare"
 
-#: ../libpurple/protocols/qq/qq.c:560
-#, fuzzy
+#: ../libpurple/protocols/qq/qq.c:561
 msgid "Leave this QQ Qun"
 msgstr "Ieşire din acest QQ Qun"
 
-#: ../libpurple/protocols/qq/qq.c:584
+#: ../libpurple/protocols/qq/qq.c:585
 msgid "Block this buddy"
 msgstr "Blochează acest contact"
 
@@ -9911,20 +10134,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/qq/qq.c:725 ../libpurple/protocols/qq/qq.c:727
+#: ../libpurple/protocols/qq/qq.c:726 ../libpurple/protocols/qq/qq.c:728
 msgid "QQ Protocol\tPlugin"
 msgstr "Modul pentru protocolul QQ"
 
-#: ../libpurple/protocols/qq/qq.c:752
-#, fuzzy
+#: ../libpurple/protocols/qq/qq.c:753
 msgid "Connect using TCP"
-msgstr "Autentificare"
-
-#: ../libpurple/protocols/qq/recv_core.c:309
+msgstr "Conectare folosind TCP"
+
+#: ../libpurple/protocols/qq/recv_core.c:310
 msgid "Socket error"
 msgstr "Eroare de socket"
 
-#: ../libpurple/protocols/qq/recv_core.c:319
+#: ../libpurple/protocols/qq/recv_core.c:321
 msgid "Unable to read from socket"
 msgstr "Nu se poate citi din socket"
 
@@ -9943,17 +10165,15 @@
 msgid "%d canceled the transfer of %s"
 msgstr "%d a anulat transferul fişierului %s"
 
-#: ../libpurple/protocols/qq/sendqueue.c:123
+#: ../libpurple/protocols/qq/sendqueue.c:124
 msgid "Connection lost"
 msgstr "Conexiune pierdută"
 
-#. cancel login progress
-#: ../libpurple/protocols/qq/sendqueue.c:131
+#: ../libpurple/protocols/qq/sendqueue.c:133
 msgid "Login failed, no reply"
 msgstr "Autentificare eşuată, nici un răspuns"
 
 #: ../libpurple/protocols/qq/sys_msg.c:110
-#, fuzzy
 msgid "Do you want to add this buddy?"
 msgstr "Doriţi să adăugaţi acest contact?"
 
@@ -9969,9 +10189,9 @@
 msgstr "Doriţi să îl adăugaţi?"
 
 #: ../libpurple/protocols/qq/sys_msg.c:176
-#, fuzzy, c-format
+#, c-format
 msgid "%s has added you [%s] to his or her buddy list"
-msgstr "%s v-a adăugat în lista sa de contacte."
+msgstr "%s v-a adăugat în lista sa de contacte cu identitatea %s"
 
 #: ../libpurple/protocols/qq/sys_msg.c:192
 #, c-format
@@ -9979,15 +10199,15 @@
 msgstr "%s v-a respins cererea"
 
 #: ../libpurple/protocols/qq/sys_msg.c:212
-#, fuzzy, c-format
+#, c-format
 msgid "User %s approved your request"
 msgstr "%s v-a aprobat cererea"
 
 #. TODO: this should go through purple_account_request_authorization()
 #: ../libpurple/protocols/qq/sys_msg.c:238
-#, fuzzy, c-format
+#, c-format
 msgid "%s wants to add you [%s] as a friend"
-msgstr "%s doreşte să vă adauge [%s] în listă"
+msgstr "%s doreşte să vă adauge în listă cu identitatea %s"
 
 #: ../libpurple/protocols/qq/sys_msg.c:239
 #, c-format
@@ -9999,138 +10219,138 @@
 msgid "%s is not in your buddy list"
 msgstr "%s nu este în lista dumneavoastră de contacte"
 
-#: ../libpurple/protocols/sametime/sametime.c:417
+#: ../libpurple/protocols/sametime/sametime.c:419
 msgid "Connection closed (writing)"
 msgstr "Conexiune terminată (la scriere)"
 
-#: ../libpurple/protocols/sametime/sametime.c:1290
+#: ../libpurple/protocols/sametime/sametime.c:1292
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Titlu Grup:</b> %s<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:1291
+#: ../libpurple/protocols/sametime/sametime.c:1293
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr "<b>ID Grup Notes:</b> %s<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:1293
+#: ../libpurple/protocols/sametime/sametime.c:1295
 #, c-format
 msgid "Info for Group %s"
 msgstr "Detalii pentru grupul %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1295
+#: ../libpurple/protocols/sametime/sametime.c:1297
 msgid "Notes Address Book Information"
 msgstr "Detalii agendă Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:1327
+#: ../libpurple/protocols/sametime/sametime.c:1329
 msgid "Invite Group to Conference..."
 msgstr "Invită un grup într-o conferinţă..."
 
-#: ../libpurple/protocols/sametime/sametime.c:1337
+#: ../libpurple/protocols/sametime/sametime.c:1339
 msgid "Get Notes Address Book Info"
 msgstr "Obţine detalii despre agenda Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:1504
+#: ../libpurple/protocols/sametime/sametime.c:1506
 msgid "Sending Handshake"
 msgstr "Se iniţiază negocierea"
 
-#: ../libpurple/protocols/sametime/sametime.c:1509
+#: ../libpurple/protocols/sametime/sametime.c:1511
 msgid "Waiting for Handshake Acknowledgement"
 msgstr "Se aşteaptă confirmarea negocierii"
 
-#: ../libpurple/protocols/sametime/sametime.c:1514
+#: ../libpurple/protocols/sametime/sametime.c:1516
 msgid "Handshake Acknowledged, Sending Login"
 msgstr "Negociere confirmată, se trimit informaţiile de autentificare"
 
-#: ../libpurple/protocols/sametime/sametime.c:1519
+#: ../libpurple/protocols/sametime/sametime.c:1521
 msgid "Waiting for Login Acknowledgement"
 msgstr "Se aşteaptă confirmarea autentificării"
 
-#: ../libpurple/protocols/sametime/sametime.c:1524
+#: ../libpurple/protocols/sametime/sametime.c:1526
 msgid "Login Redirected"
 msgstr "Autentificare redirectată"
 
-#: ../libpurple/protocols/sametime/sametime.c:1530
+#: ../libpurple/protocols/sametime/sametime.c:1532
 msgid "Forcing Login"
 msgstr "Se forţează autentificarea"
 
-#: ../libpurple/protocols/sametime/sametime.c:1534
+#: ../libpurple/protocols/sametime/sametime.c:1536
 msgid "Login Acknowledged"
 msgstr "Autentificare confirmată"
 
-#: ../libpurple/protocols/sametime/sametime.c:1539
+#: ../libpurple/protocols/sametime/sametime.c:1541
 msgid "Starting Services"
 msgstr "Se pornesc serviciile"
 
-#: ../libpurple/protocols/sametime/sametime.c:1645
+#: ../libpurple/protocols/sametime/sametime.c:1678
 #, c-format
 msgid ""
 "A Sametime administrator has issued the following announcement on server %s"
 msgstr "Un administrator Sametime a făcut următorul anunţ pe serverul %s:"
 
-#: ../libpurple/protocols/sametime/sametime.c:1650
+#: ../libpurple/protocols/sametime/sametime.c:1683
 msgid "Sametime Administrator Announcement"
 msgstr "Anunţ din partea administratorului Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:1702
+#: ../libpurple/protocols/sametime/sametime.c:1734
 msgid "Connection reset"
 msgstr "Conexiune resetată"
 
-#: ../libpurple/protocols/sametime/sametime.c:1709
+#: ../libpurple/protocols/sametime/sametime.c:1746
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr "Eroare la citirea din socket: %s"
 
 #. this is a regular connect, error out
-#: ../libpurple/protocols/sametime/sametime.c:1732
-#: ../libpurple/protocols/sametime/sametime.c:3726
+#: ../libpurple/protocols/sametime/sametime.c:1771
+#: ../libpurple/protocols/sametime/sametime.c:3772
 msgid "Unable to connect to host"
 msgstr "Conectarea la server a eşuat"
 
-#: ../libpurple/protocols/sametime/sametime.c:1770
+#: ../libpurple/protocols/sametime/sametime.c:1812
 #, c-format
 msgid "Announcement from %s"
 msgstr "Anunţ de la %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1944
+#: ../libpurple/protocols/sametime/sametime.c:1986
 msgid "Conference Closed"
 msgstr "Conferinţă închisă"
 
-#: ../libpurple/protocols/sametime/sametime.c:2403
+#: ../libpurple/protocols/sametime/sametime.c:2445
 msgid "Unable to send message: "
 msgstr "Nu se poate trimite mesajul: "
 
-#: ../libpurple/protocols/sametime/sametime.c:2959
+#: ../libpurple/protocols/sametime/sametime.c:3001
 msgid "Place Closed"
 msgstr "Loc închis"
 
-#: ../libpurple/protocols/sametime/sametime.c:3229
+#: ../libpurple/protocols/sametime/sametime.c:3271
 msgid "Microphone"
 msgstr "Microfon"
 
-#: ../libpurple/protocols/sametime/sametime.c:3230
+#: ../libpurple/protocols/sametime/sametime.c:3272
 msgid "Speakers"
 msgstr "Difuzoare"
 
-#: ../libpurple/protocols/sametime/sametime.c:3231
+#: ../libpurple/protocols/sametime/sametime.c:3273
 msgid "Video Camera"
 msgstr "Cameră video"
 
-#: ../libpurple/protocols/sametime/sametime.c:3269
-#: ../libpurple/protocols/sametime/sametime.c:4145
+#: ../libpurple/protocols/sametime/sametime.c:3311
+#: ../libpurple/protocols/sametime/sametime.c:4191
 msgid "Supports"
 msgstr "Suportă:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3274
-#: ../libpurple/protocols/sametime/sametime.c:4119
+#: ../libpurple/protocols/sametime/sametime.c:3316
+#: ../libpurple/protocols/sametime/sametime.c:4165
 msgid "External User"
 msgstr "Utilizator extern"
 
-#: ../libpurple/protocols/sametime/sametime.c:3380
+#: ../libpurple/protocols/sametime/sametime.c:3422
 msgid "Create conference with user"
 msgstr "Iniţializaţi o conferinţă cu acest utilizator"
 
-#: ../libpurple/protocols/sametime/sametime.c:3381
+#: ../libpurple/protocols/sametime/sametime.c:3423
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
@@ -10139,27 +10359,27 @@
 "Introduceţi un topic pentru noua conferinţă şi un mesaj pentru invitarea "
 "utilizatorului %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:3385
+#: ../libpurple/protocols/sametime/sametime.c:3427
 msgid "New Conference"
 msgstr "Conferinţă nouă"
 
-#: ../libpurple/protocols/sametime/sametime.c:3387
+#: ../libpurple/protocols/sametime/sametime.c:3429
 msgid "Create"
 msgstr "Creează"
 
-#: ../libpurple/protocols/sametime/sametime.c:3452
+#: ../libpurple/protocols/sametime/sametime.c:3494
 msgid "Available Conferences"
 msgstr "Conferinţe disponibile"
 
-#: ../libpurple/protocols/sametime/sametime.c:3458
+#: ../libpurple/protocols/sametime/sametime.c:3500
 msgid "Create New Conference..."
 msgstr "Creează o nouă conferinţă..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3465
+#: ../libpurple/protocols/sametime/sametime.c:3507
 msgid "Invite user to a conference"
 msgstr "Invită utilizatorul într-o conferinţă"
 
-#: ../libpurple/protocols/sametime/sametime.c:3466
+#: ../libpurple/protocols/sametime/sametime.c:3508
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -10170,27 +10390,27 @@
 "utilizatorului %s. Selectaţi „Creează o nouă conferinţă” dacă doriţi să "
 "creaţi o nouă conferinţă în care să invitaţi acest utilizator."
 
-#: ../libpurple/protocols/sametime/sametime.c:3471
+#: ../libpurple/protocols/sametime/sametime.c:3513
 msgid "Invite to Conference"
 msgstr "Invită într-o conferinţă"
 
-#: ../libpurple/protocols/sametime/sametime.c:3562
+#: ../libpurple/protocols/sametime/sametime.c:3604
 msgid "Invite to Conference..."
 msgstr "Invită într-o conferinţă..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3567
+#: ../libpurple/protocols/sametime/sametime.c:3609
 msgid "Send TEST Announcement"
 msgstr "Trimite un anunţ TEST"
 
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4354
+#: ../libpurple/protocols/sametime/sametime.c:3628 ../pidgin/gtkconv.c:4437
 msgid "Topic:"
 msgstr "Topic:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3614
+#: ../libpurple/protocols/sametime/sametime.c:3656
 msgid "No Sametime Community Server specified"
 msgstr "Nu s-a specificat un server de comunitate Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:3636
+#: ../libpurple/protocols/sametime/sametime.c:3681
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
@@ -10199,42 +10419,42 @@
 "Nici un nume de server sau adresă IP nu au fost configurate pentru contul "
 "Meanwhile %s. Introduceţi una mai jos pentru a continua autentificarea."
 
-#: ../libpurple/protocols/sametime/sametime.c:3641
+#: ../libpurple/protocols/sametime/sametime.c:3686
 msgid "Meanwhile Connection Setup"
 msgstr "Opţiuni conexiune Meanwhile"
 
-#: ../libpurple/protocols/sametime/sametime.c:3642
+#: ../libpurple/protocols/sametime/sametime.c:3687
 msgid "No Sametime Community Server Specified"
 msgstr "Nu s-a specificat un server de comunitate Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4041
+#: ../libpurple/protocols/sametime/sametime.c:3689
 msgid "Connect"
 msgstr "Conectare"
 
-#: ../libpurple/protocols/sametime/sametime.c:4135
+#: ../libpurple/protocols/sametime/sametime.c:4181
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Necunoscut (0x%04x)<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:4137
+#: ../libpurple/protocols/sametime/sametime.c:4183
 msgid "Last Known Client"
 msgstr "Ultim client cunoscut"
 
-#: ../libpurple/protocols/sametime/sametime.c:4301
-#: ../libpurple/protocols/sametime/sametime.c:5506
+#: ../libpurple/protocols/sametime/sametime.c:4347
+#: ../libpurple/protocols/sametime/sametime.c:5552
 msgid "User Name"
 msgstr "Nume utilizator"
 
-#: ../libpurple/protocols/sametime/sametime.c:4304
-#: ../libpurple/protocols/sametime/sametime.c:5509
+#: ../libpurple/protocols/sametime/sametime.c:4350
+#: ../libpurple/protocols/sametime/sametime.c:5555
 msgid "Sametime ID"
 msgstr "ID Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:4328
+#: ../libpurple/protocols/sametime/sametime.c:4374
 msgid "An ambiguous user ID was entered"
 msgstr "S-a introdus un ID ambiguu de utilizator"
 
-#: ../libpurple/protocols/sametime/sametime.c:4329
+#: ../libpurple/protocols/sametime/sametime.c:4375
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -10243,15 +10463,15 @@
 "Identificatorul „%s” s-ar putea referi la oricare din utilizatorii următori. "
 "Selectaţi utilizatorul corect pentru a-l adăuga în lista de contacte."
 
-#: ../libpurple/protocols/sametime/sametime.c:4334
+#: ../libpurple/protocols/sametime/sametime.c:4380
 msgid "Select User"
 msgstr "Selectaţi utilizatorul"
 
-#: ../libpurple/protocols/sametime/sametime.c:4418
+#: ../libpurple/protocols/sametime/sametime.c:4464
 msgid "Unable to add user: user not found"
 msgstr "Nu se poate adăuga utilizatorul: nu a fost găsit"
 
-#: ../libpurple/protocols/sametime/sametime.c:4420
+#: ../libpurple/protocols/sametime/sametime.c:4466
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
@@ -10260,11 +10480,7 @@
 "Identificatorul „%s” nu corespunde nici unui utilizator din comunitatea "
 "Sametime. Această intrare v-a fost ştearsă din lista de contacte."
 
-#: ../libpurple/protocols/sametime/sametime.c:4425
-msgid "Unable to add user"
-msgstr "Nu se poate adăuga utilizatorul"
-
-#: ../libpurple/protocols/sametime/sametime.c:5011
+#: ../libpurple/protocols/sametime/sametime.c:5057
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -10273,63 +10489,63 @@
 "Eroare la citirea fişierului %s: \n"
 "%s\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5146
+#: ../libpurple/protocols/sametime/sametime.c:5192
 msgid "Remotely Stored Buddy List"
 msgstr "Listă de contacte stocată pe server"
 
-#: ../libpurple/protocols/sametime/sametime.c:5151
+#: ../libpurple/protocols/sametime/sametime.c:5197
 msgid "Buddy List Storage Mode"
 msgstr "Stocare listă de contacte"
 
-#: ../libpurple/protocols/sametime/sametime.c:5154
+#: ../libpurple/protocols/sametime/sametime.c:5200
 msgid "Local Buddy List Only"
 msgstr "Doar listă de contacte locală"
 
-#: ../libpurple/protocols/sametime/sametime.c:5156
+#: ../libpurple/protocols/sametime/sametime.c:5202
 msgid "Merge List from Server"
 msgstr "Combină cu lista de contacte de pe server"
 
-#: ../libpurple/protocols/sametime/sametime.c:5158
+#: ../libpurple/protocols/sametime/sametime.c:5204
 msgid "Merge and Save List to Server"
 msgstr "Combină şi stochează lista pe server"
 
-#: ../libpurple/protocols/sametime/sametime.c:5160
+#: ../libpurple/protocols/sametime/sametime.c:5206
 msgid "Synchronize List with Server"
 msgstr "Sincronizez lista cu serverul"
 
-#: ../libpurple/protocols/sametime/sametime.c:5215
+#: ../libpurple/protocols/sametime/sametime.c:5261
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Import lista Sametime pentru contul %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5255
+#: ../libpurple/protocols/sametime/sametime.c:5301
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Export lista Sametime pentru contul %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5309
+#: ../libpurple/protocols/sametime/sametime.c:5355
 msgid "Unable to add group: group exists"
 msgstr "Nu se poate adăuga grupul: grupul există."
 
-#: ../libpurple/protocols/sametime/sametime.c:5310
+#: ../libpurple/protocols/sametime/sametime.c:5356
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "Un grup numit „%s” există deja în lista de contacte."
 
-#: ../libpurple/protocols/sametime/sametime.c:5313
-#: ../libpurple/protocols/sametime/sametime.c:5443
+#: ../libpurple/protocols/sametime/sametime.c:5359
+#: ../libpurple/protocols/sametime/sametime.c:5489
 msgid "Unable to add group"
 msgstr "Nu se poate adăuga grupul"
 
-#: ../libpurple/protocols/sametime/sametime.c:5372
+#: ../libpurple/protocols/sametime/sametime.c:5418
 msgid "Possible Matches"
 msgstr "Potriviri posibile"
 
-#: ../libpurple/protocols/sametime/sametime.c:5388
+#: ../libpurple/protocols/sametime/sametime.c:5434
 msgid "Notes Address Book group results"
 msgstr "Rezultate grup agendă Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:5389
+#: ../libpurple/protocols/sametime/sametime.c:5435
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -10340,15 +10556,15 @@
 "din agenda Notes. Selectaţi grupul corect din lista de mai jos şi adăugaţi-l "
 "în lista de contacte."
 
-#: ../libpurple/protocols/sametime/sametime.c:5394
+#: ../libpurple/protocols/sametime/sametime.c:5440
 msgid "Select Notes Address Book"
 msgstr "Selectaţi agenda Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:5437
+#: ../libpurple/protocols/sametime/sametime.c:5483
 msgid "Unable to add group: group not found"
 msgstr "Nu se poate adăuga grupul: nu a fost găsit"
 
-#: ../libpurple/protocols/sametime/sametime.c:5439
+#: ../libpurple/protocols/sametime/sametime.c:5485
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
@@ -10357,11 +10573,11 @@
 "Identificatorul „%s” nu se potriveşte cu nici un grup din agenda Notes a "
 "comunităţii Sametime din care faceţi parte."
 
-#: ../libpurple/protocols/sametime/sametime.c:5480
+#: ../libpurple/protocols/sametime/sametime.c:5526
 msgid "Notes Address Book Group"
 msgstr "Grup agendă Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:5481
+#: ../libpurple/protocols/sametime/sametime.c:5527
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
@@ -10369,12 +10585,12 @@
 "Introduceţi numele unei agende Notes în câmpul de mai jos şi adăugaţi grupul "
 "şi membrii săi în lista de contacte."
 
-#: ../libpurple/protocols/sametime/sametime.c:5530
+#: ../libpurple/protocols/sametime/sametime.c:5576
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Rezultatele căutării după „%s”"
 
-#: ../libpurple/protocols/sametime/sametime.c:5531
+#: ../libpurple/protocols/sametime/sametime.c:5577
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -10385,30 +10601,30 @@
 "utilizatori. Puteţi adăuga aceşti utilizatori la lista de contacte ori le "
 "puteţi trimite mesaje utilizând acţiunile de mai jos."
 
-#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:756
+#: ../libpurple/protocols/sametime/sametime.c:5584 ../pidgin/gtknotify.c:763
 msgid "Search Results"
 msgstr "Rezultatele căutării"
 
-#: ../libpurple/protocols/sametime/sametime.c:5563
+#: ../libpurple/protocols/sametime/sametime.c:5609
 msgid "No matches"
 msgstr "Nici o potrivire"
 
-#: ../libpurple/protocols/sametime/sametime.c:5564
+#: ../libpurple/protocols/sametime/sametime.c:5610
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr ""
 "Identificatorul „%s” nu corespunde nici unui utilizator din comunitatea "
 "Sametime din care faceţi parte."
 
-#: ../libpurple/protocols/sametime/sametime.c:5568
+#: ../libpurple/protocols/sametime/sametime.c:5614
 msgid "No Matches"
 msgstr "Nici o potrivire"
 
-#: ../libpurple/protocols/sametime/sametime.c:5605
+#: ../libpurple/protocols/sametime/sametime.c:5651
 msgid "Search for a user"
 msgstr "Caută un utilizator"
 
-#: ../libpurple/protocols/sametime/sametime.c:5606
+#: ../libpurple/protocols/sametime/sametime.c:5652
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
@@ -10416,32 +10632,32 @@
 "Introduceţi numele or parte din ID în câmpul de mai jos pentru a căuta "
 "utilizatori care să corespundă în comunitatea Sametime din care faceţi parte."
 
-#: ../libpurple/protocols/sametime/sametime.c:5609
+#: ../libpurple/protocols/sametime/sametime.c:5655
 msgid "User Search"
 msgstr "Căutare utilizator"
 
-#: ../libpurple/protocols/sametime/sametime.c:5622
+#: ../libpurple/protocols/sametime/sametime.c:5668
 msgid "Import Sametime List..."
 msgstr "Import listă Sametime..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5626
+#: ../libpurple/protocols/sametime/sametime.c:5672
 msgid "Export Sametime List..."
 msgstr "Export listă Sametime..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5630
+#: ../libpurple/protocols/sametime/sametime.c:5676
 msgid "Add Notes Address Book Group..."
 msgstr "Adaugă grupul agendei Notes..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5634
+#: ../libpurple/protocols/sametime/sametime.c:5680
 msgid "User Search..."
 msgstr "Căutare utilizatori..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5740
+#: ../libpurple/protocols/sametime/sametime.c:5786
 msgid "Force login (ignore server redirects)"
 msgstr "Autentificare forţată (ignoră redirectările serverului)"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5750
+#: ../libpurple/protocols/sametime/sametime.c:5796
 msgid "Hide client identity"
 msgstr "Ascunde identitatea clientului"
 
@@ -10572,8 +10788,8 @@
 #: ../libpurple/protocols/silc/buddy.c:496
 #: ../libpurple/protocols/silc/buddy.c:507
 #: ../libpurple/protocols/silc/buddy.c:540
-#: ../libpurple/protocols/silc/ops.c:1499
-#: ../libpurple/protocols/silc/ops.c:1510
+#: ../libpurple/protocols/silc/ops.c:1503
+#: ../libpurple/protocols/silc/ops.c:1514
 #: ../libpurple/protocols/silc10/buddy.c:513
 #: ../libpurple/protocols/silc10/buddy.c:548
 #: ../libpurple/protocols/silc10/ops.c:1494
@@ -10582,8 +10798,8 @@
 msgstr "Obţine cheia publică"
 
 #: ../libpurple/protocols/silc/buddy.c:541
-#: ../libpurple/protocols/silc/ops.c:1500
-#: ../libpurple/protocols/silc/ops.c:1511
+#: ../libpurple/protocols/silc/ops.c:1504
+#: ../libpurple/protocols/silc/ops.c:1515
 #: ../libpurple/protocols/silc10/buddy.c:549
 #: ../libpurple/protocols/silc10/ops.c:1495
 #: ../libpurple/protocols/silc10/ops.c:1506
@@ -10591,17 +10807,17 @@
 msgstr "Nu se poate obţine cheia publică"
 
 #: ../libpurple/protocols/silc/buddy.c:622
-#: ../libpurple/protocols/silc/buddy.c:1655
+#: ../libpurple/protocols/silc/buddy.c:1658
 #: ../libpurple/protocols/silc10/buddy.c:635
-#: ../libpurple/protocols/silc10/buddy.c:1654
+#: ../libpurple/protocols/silc10/buddy.c:1657
 msgid "Show Public Key"
 msgstr "Arată cheia publică"
 
 #: ../libpurple/protocols/silc/buddy.c:623
-#: ../libpurple/protocols/silc/buddy.c:1027
-#: ../libpurple/protocols/silc/chat.c:237
+#: ../libpurple/protocols/silc/buddy.c:1030
+#: ../libpurple/protocols/silc/chat.c:239
 #: ../libpurple/protocols/silc10/buddy.c:636
-#: ../libpurple/protocols/silc10/buddy.c:1033
+#: ../libpurple/protocols/silc10/buddy.c:1036
 #: ../libpurple/protocols/silc10/chat.c:237
 msgid "Could not load public key"
 msgstr "Nu s-a putut încărca cheia publică"
@@ -10609,9 +10825,9 @@
 #: ../libpurple/protocols/silc/buddy.c:701
 #: ../libpurple/protocols/silc/ops.c:1053
 #: ../libpurple/protocols/silc/ops.c:1168
-#: ../libpurple/protocols/silc/ops.c:1288
-#: ../libpurple/protocols/silc/ops.c:1289
-#: ../libpurple/protocols/silc/ops.c:1307
+#: ../libpurple/protocols/silc/ops.c:1290
+#: ../libpurple/protocols/silc/ops.c:1291
+#: ../libpurple/protocols/silc/ops.c:1309
 #: ../libpurple/protocols/silc10/buddy.c:713
 #: ../libpurple/protocols/silc10/ops.c:1087
 #: ../libpurple/protocols/silc10/ops.c:1159
@@ -10623,7 +10839,7 @@
 
 #: ../libpurple/protocols/silc/buddy.c:702
 #: ../libpurple/protocols/silc/ops.c:1169
-#: ../libpurple/protocols/silc/ops.c:1308
+#: ../libpurple/protocols/silc/ops.c:1310
 #: ../libpurple/protocols/silc10/buddy.c:714
 #: ../libpurple/protocols/silc10/ops.c:1160
 #: ../libpurple/protocols/silc10/ops.c:1314
@@ -10646,19 +10862,19 @@
 "sa publică. Utilizaţi comanda „Obţine cheia publică” pentru a o importa."
 
 #. Open file selector to select the public key.
-#: ../libpurple/protocols/silc/buddy.c:1059
-#: ../libpurple/protocols/silc10/buddy.c:1067
+#: ../libpurple/protocols/silc/buddy.c:1062
+#: ../libpurple/protocols/silc10/buddy.c:1070
 msgid "Open..."
 msgstr "Deschide..."
 
-#: ../libpurple/protocols/silc/buddy.c:1070
-#: ../libpurple/protocols/silc10/buddy.c:1078
+#: ../libpurple/protocols/silc/buddy.c:1073
+#: ../libpurple/protocols/silc10/buddy.c:1081
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "Utilizatorul %s nu este prezent în reţea"
 
-#: ../libpurple/protocols/silc/buddy.c:1073
-#: ../libpurple/protocols/silc10/buddy.c:1081
+#: ../libpurple/protocols/silc/buddy.c:1076
+#: ../libpurple/protocols/silc10/buddy.c:1084
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
@@ -10666,18 +10882,18 @@
 "Pentru a adăuga contactul trebuie să importaţi cheia sa publică. Utilizaţi "
 "pentru aceasta comandă „Importă”."
 
-#: ../libpurple/protocols/silc/buddy.c:1077
-#: ../libpurple/protocols/silc10/buddy.c:1085
+#: ../libpurple/protocols/silc/buddy.c:1080
+#: ../libpurple/protocols/silc10/buddy.c:1088
 msgid "_Import..."
 msgstr "_Importă..."
 
-#: ../libpurple/protocols/silc/buddy.c:1183
-#: ../libpurple/protocols/silc10/buddy.c:1181
+#: ../libpurple/protocols/silc/buddy.c:1186
+#: ../libpurple/protocols/silc10/buddy.c:1184
 msgid "Select correct user"
 msgstr "Selectaţi utilizatorul corect"
 
-#: ../libpurple/protocols/silc/buddy.c:1185
-#: ../libpurple/protocols/silc10/buddy.c:1183
+#: ../libpurple/protocols/silc/buddy.c:1188
+#: ../libpurple/protocols/silc10/buddy.c:1186
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
@@ -10685,8 +10901,8 @@
 "Mai mulţi utilizatori par să aibă aceeaşi cheie publică. Selectaţi-l pe cel "
 "corect din listă pentru a-l adăuga în lista de contacte."
 
-#: ../libpurple/protocols/silc/buddy.c:1187
-#: ../libpurple/protocols/silc10/buddy.c:1185
+#: ../libpurple/protocols/silc/buddy.c:1190
+#: ../libpurple/protocols/silc10/buddy.c:1188
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
@@ -10694,208 +10910,208 @@
 "Mai mulţi utilizatori par să aibă acelaşi nume. Selectaţi utilizatorul "
 "corect pentru a-l adăuga în lista de contacte."
 
-#: ../libpurple/protocols/silc/buddy.c:1474
-#: ../libpurple/protocols/silc10/buddy.c:1474
+#: ../libpurple/protocols/silc/buddy.c:1477
+#: ../libpurple/protocols/silc10/buddy.c:1477
 msgid "Detached"
 msgstr "Detaşat(ă)"
 
-#: ../libpurple/protocols/silc/buddy.c:1478
+#: ../libpurple/protocols/silc/buddy.c:1481
 #: ../libpurple/protocols/silc/silc.c:58
-#: ../libpurple/protocols/silc10/buddy.c:1478
+#: ../libpurple/protocols/silc10/buddy.c:1481
 #: ../libpurple/protocols/silc10/silc.c:49
 msgid "Indisposed"
 msgstr "Prost dispus(ă)"
 
-#: ../libpurple/protocols/silc/buddy.c:1482
+#: ../libpurple/protocols/silc/buddy.c:1485
 #: ../libpurple/protocols/silc/silc.c:60
-#: ../libpurple/protocols/silc10/buddy.c:1482
+#: ../libpurple/protocols/silc10/buddy.c:1485
 #: ../libpurple/protocols/silc10/silc.c:51
 msgid "Wake Me Up"
 msgstr "Trezeşte-mă!"
 
-#: ../libpurple/protocols/silc/buddy.c:1484
+#: ../libpurple/protocols/silc/buddy.c:1487
 #: ../libpurple/protocols/silc/silc.c:52
-#: ../libpurple/protocols/silc10/buddy.c:1484
+#: ../libpurple/protocols/silc10/buddy.c:1487
 #: ../libpurple/protocols/silc10/silc.c:43
 msgid "Hyper Active"
 msgstr "Hiperactiv(ă)"
 
-#: ../libpurple/protocols/silc/buddy.c:1486
-#: ../libpurple/protocols/silc10/buddy.c:1486
+#: ../libpurple/protocols/silc/buddy.c:1489
+#: ../libpurple/protocols/silc10/buddy.c:1489
 msgid "Robot"
 msgstr "Roboţel"
 
-#: ../libpurple/protocols/silc/buddy.c:1493
-#: ../libpurple/protocols/silc/silc.c:743
-#: ../libpurple/protocols/silc/util.c:516
-#: ../libpurple/protocols/silc10/buddy.c:1493
+#: ../libpurple/protocols/silc/buddy.c:1496
+#: ../libpurple/protocols/silc/silc.c:886
+#: ../libpurple/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc10/buddy.c:1496
 #: ../libpurple/protocols/silc10/silc.c:654
 #: ../libpurple/protocols/silc10/util.c:512
 msgid "Happy"
 msgstr "Fericit(ă)"
 
-#: ../libpurple/protocols/silc/buddy.c:1495
-#: ../libpurple/protocols/silc/silc.c:745
-#: ../libpurple/protocols/silc/util.c:518
-#: ../libpurple/protocols/silc10/buddy.c:1495
+#: ../libpurple/protocols/silc/buddy.c:1498
+#: ../libpurple/protocols/silc/silc.c:888
+#: ../libpurple/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc10/buddy.c:1498
 #: ../libpurple/protocols/silc10/silc.c:656
 #: ../libpurple/protocols/silc10/util.c:514
 msgid "Sad"
 msgstr "Trist(ă)"
 
-#: ../libpurple/protocols/silc/buddy.c:1497
-#: ../libpurple/protocols/silc/silc.c:747
-#: ../libpurple/protocols/silc/util.c:520
-#: ../libpurple/protocols/silc10/buddy.c:1497
+#: ../libpurple/protocols/silc/buddy.c:1500
+#: ../libpurple/protocols/silc/silc.c:890
+#: ../libpurple/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc10/buddy.c:1500
 #: ../libpurple/protocols/silc10/silc.c:658
 #: ../libpurple/protocols/silc10/util.c:516
 msgid "Angry"
 msgstr "Supărat(ă)"
 
-#: ../libpurple/protocols/silc/buddy.c:1499
-#: ../libpurple/protocols/silc/silc.c:749
-#: ../libpurple/protocols/silc/util.c:522
-#: ../libpurple/protocols/silc10/buddy.c:1499
+#: ../libpurple/protocols/silc/buddy.c:1502
+#: ../libpurple/protocols/silc/silc.c:892
+#: ../libpurple/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc10/buddy.c:1502
 #: ../libpurple/protocols/silc10/silc.c:660
 #: ../libpurple/protocols/silc10/util.c:518
 msgid "Jealous"
 msgstr "Gelos/Geloasă"
 
-#: ../libpurple/protocols/silc/buddy.c:1501
-#: ../libpurple/protocols/silc/silc.c:751
-#: ../libpurple/protocols/silc/util.c:524
-#: ../libpurple/protocols/silc10/buddy.c:1501
+#: ../libpurple/protocols/silc/buddy.c:1504
+#: ../libpurple/protocols/silc/silc.c:894
+#: ../libpurple/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc10/buddy.c:1504
 #: ../libpurple/protocols/silc10/silc.c:662
 #: ../libpurple/protocols/silc10/util.c:520
 msgid "Ashamed"
 msgstr "Ruşinat(ă)"
 
-#: ../libpurple/protocols/silc/buddy.c:1503
-#: ../libpurple/protocols/silc/silc.c:753
-#: ../libpurple/protocols/silc/util.c:526
-#: ../libpurple/protocols/silc10/buddy.c:1503
+#: ../libpurple/protocols/silc/buddy.c:1506
+#: ../libpurple/protocols/silc/silc.c:896
+#: ../libpurple/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc10/buddy.c:1506
 #: ../libpurple/protocols/silc10/silc.c:664
 #: ../libpurple/protocols/silc10/util.c:522
 msgid "Invincible"
 msgstr "Invincibil(ă)"
 
-#: ../libpurple/protocols/silc/buddy.c:1505
-#: ../libpurple/protocols/silc/util.c:528
-#: ../libpurple/protocols/silc10/buddy.c:1505
+#: ../libpurple/protocols/silc/buddy.c:1508
+#: ../libpurple/protocols/silc/util.c:534
+#: ../libpurple/protocols/silc10/buddy.c:1508
 #: ../libpurple/protocols/silc10/util.c:524
 msgid "In Love"
 msgstr "Îndrăgostit(ă)"
 
-#: ../libpurple/protocols/silc/buddy.c:1507
-#: ../libpurple/protocols/silc/silc.c:757
-#: ../libpurple/protocols/silc/util.c:530
-#: ../libpurple/protocols/silc10/buddy.c:1507
+#: ../libpurple/protocols/silc/buddy.c:1510
+#: ../libpurple/protocols/silc/silc.c:900
+#: ../libpurple/protocols/silc/util.c:536
+#: ../libpurple/protocols/silc10/buddy.c:1510
 #: ../libpurple/protocols/silc10/silc.c:668
 #: ../libpurple/protocols/silc10/util.c:526
 msgid "Sleepy"
 msgstr "Adormit(ă)"
 
-#: ../libpurple/protocols/silc/buddy.c:1509
-#: ../libpurple/protocols/silc/silc.c:759
-#: ../libpurple/protocols/silc/util.c:532
-#: ../libpurple/protocols/silc10/buddy.c:1509
+#: ../libpurple/protocols/silc/buddy.c:1512
+#: ../libpurple/protocols/silc/silc.c:902
+#: ../libpurple/protocols/silc/util.c:538
+#: ../libpurple/protocols/silc10/buddy.c:1512
 #: ../libpurple/protocols/silc10/silc.c:670
 #: ../libpurple/protocols/silc10/util.c:528
 msgid "Bored"
 msgstr "Plictisit(ă)"
 
-#: ../libpurple/protocols/silc/buddy.c:1511
-#: ../libpurple/protocols/silc/silc.c:761
-#: ../libpurple/protocols/silc/util.c:534
-#: ../libpurple/protocols/silc10/buddy.c:1511
+#: ../libpurple/protocols/silc/buddy.c:1514
+#: ../libpurple/protocols/silc/silc.c:904
+#: ../libpurple/protocols/silc/util.c:540
+#: ../libpurple/protocols/silc10/buddy.c:1514
 #: ../libpurple/protocols/silc10/silc.c:672
 #: ../libpurple/protocols/silc10/util.c:530
 msgid "Excited"
 msgstr "Entuziast(ă)"
 
-#: ../libpurple/protocols/silc/buddy.c:1513
-#: ../libpurple/protocols/silc/silc.c:763
-#: ../libpurple/protocols/silc/util.c:536
-#: ../libpurple/protocols/silc10/buddy.c:1513
+#: ../libpurple/protocols/silc/buddy.c:1516
+#: ../libpurple/protocols/silc/silc.c:906
+#: ../libpurple/protocols/silc/util.c:542
+#: ../libpurple/protocols/silc10/buddy.c:1516
 #: ../libpurple/protocols/silc10/silc.c:674
 #: ../libpurple/protocols/silc10/util.c:532
 msgid "Anxious"
 msgstr "Stresat(ă)"
 
-#: ../libpurple/protocols/silc/buddy.c:1545
+#: ../libpurple/protocols/silc/buddy.c:1548
 #: ../libpurple/protocols/silc/ops.c:1207
-#: ../libpurple/protocols/silc10/buddy.c:1545
+#: ../libpurple/protocols/silc10/buddy.c:1548
 #: ../libpurple/protocols/silc10/ops.c:1202
 msgid "User Modes"
 msgstr "Moduri utilizator"
 
-#: ../libpurple/protocols/silc/buddy.c:1562
+#: ../libpurple/protocols/silc/buddy.c:1565
 #: ../libpurple/protocols/silc/ops.c:1224
-#: ../libpurple/protocols/silc10/buddy.c:1562
+#: ../libpurple/protocols/silc10/buddy.c:1565
 #: ../libpurple/protocols/silc10/ops.c:1219
 msgid "Preferred Contact"
 msgstr "Contact preferat"
 
-#: ../libpurple/protocols/silc/buddy.c:1567
+#: ../libpurple/protocols/silc/buddy.c:1570
 #: ../libpurple/protocols/silc/ops.c:1229
-#: ../libpurple/protocols/silc10/buddy.c:1567
+#: ../libpurple/protocols/silc10/buddy.c:1570
 #: ../libpurple/protocols/silc10/ops.c:1224
 msgid "Preferred Language"
 msgstr "Limbă preferată"
 
-#: ../libpurple/protocols/silc/buddy.c:1572
+#: ../libpurple/protocols/silc/buddy.c:1575
 #: ../libpurple/protocols/silc/ops.c:1234
-#: ../libpurple/protocols/silc10/buddy.c:1572
+#: ../libpurple/protocols/silc10/buddy.c:1575
 #: ../libpurple/protocols/silc10/ops.c:1229
 msgid "Device"
 msgstr "Dispozitiv"
 
-#: ../libpurple/protocols/silc/buddy.c:1577
+#: ../libpurple/protocols/silc/buddy.c:1580
 #: ../libpurple/protocols/silc/ops.c:1239
-#: ../libpurple/protocols/silc10/buddy.c:1577
+#: ../libpurple/protocols/silc10/buddy.c:1580
 #: ../libpurple/protocols/silc10/ops.c:1234
 #: ../libpurple/protocols/silc10/silc.c:722
 #: ../libpurple/protocols/silc10/silc.c:724
 msgid "Timezone"
 msgstr "Fus orar"
 
-#: ../libpurple/protocols/silc/buddy.c:1582
+#: ../libpurple/protocols/silc/buddy.c:1585
 #: ../libpurple/protocols/silc/ops.c:1244
-#: ../libpurple/protocols/silc10/buddy.c:1582
+#: ../libpurple/protocols/silc10/buddy.c:1585
 #: ../libpurple/protocols/silc10/ops.c:1239
 msgid "Geolocation"
 msgstr "Locaţie geografică"
 
-#: ../libpurple/protocols/silc/buddy.c:1638
-#: ../libpurple/protocols/silc10/buddy.c:1636
+#: ../libpurple/protocols/silc/buddy.c:1641
+#: ../libpurple/protocols/silc10/buddy.c:1639
 msgid "Reset IM Key"
 msgstr "Resetează cheia IM"
 
-#: ../libpurple/protocols/silc/buddy.c:1643
-#: ../libpurple/protocols/silc10/buddy.c:1642
+#: ../libpurple/protocols/silc/buddy.c:1646
+#: ../libpurple/protocols/silc10/buddy.c:1645
 msgid "IM with Key Exchange"
 msgstr "IM cu schimb de chei"
 
-#: ../libpurple/protocols/silc/buddy.c:1648
-#: ../libpurple/protocols/silc10/buddy.c:1647
+#: ../libpurple/protocols/silc/buddy.c:1651
+#: ../libpurple/protocols/silc10/buddy.c:1650
 msgid "IM with Password"
 msgstr "IM parolat"
 
-#: ../libpurple/protocols/silc/buddy.c:1661
-#: ../libpurple/protocols/silc10/buddy.c:1660
+#: ../libpurple/protocols/silc/buddy.c:1664
+#: ../libpurple/protocols/silc10/buddy.c:1663
 msgid "Get Public Key..."
 msgstr "Obţine cheia publică..."
 
-#: ../libpurple/protocols/silc/buddy.c:1668
-#: ../libpurple/protocols/silc/ops.c:1608
-#: ../libpurple/protocols/silc10/buddy.c:1667
+#: ../libpurple/protocols/silc/buddy.c:1671
+#: ../libpurple/protocols/silc/ops.c:1612
+#: ../libpurple/protocols/silc10/buddy.c:1670
 #: ../libpurple/protocols/silc10/ops.c:1624
 msgid "Kill User"
 msgstr "Elimină utilizatorul"
 
-#: ../libpurple/protocols/silc/buddy.c:1678
-#: ../libpurple/protocols/silc/chat.c:993
-#: ../libpurple/protocols/silc10/buddy.c:1677
+#: ../libpurple/protocols/silc/buddy.c:1681
+#: ../libpurple/protocols/silc/chat.c:997
+#: ../libpurple/protocols/silc10/buddy.c:1680
 #: ../libpurple/protocols/silc10/chat.c:977
 msgid "Draw On Whiteboard"
 msgstr "Desenează în „whiteboard”"
@@ -10912,7 +11128,7 @@
 msgstr "Chat-ul %s nu există în reţea"
 
 #: ../libpurple/protocols/silc/chat.c:81
-#: ../libpurple/protocols/silc/chat.c:175
+#: ../libpurple/protocols/silc/chat.c:177
 #: ../libpurple/protocols/silc10/chat.c:81
 #: ../libpurple/protocols/silc10/chat.c:174
 msgid "Channel Information"
@@ -10962,46 +11178,44 @@
 
 #: ../libpurple/protocols/silc/chat.c:153
 #: ../libpurple/protocols/silc10/chat.c:152
-#, c-format
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Moduri chat:</b> "
 
-#: ../libpurple/protocols/silc/chat.c:166
+#: ../libpurple/protocols/silc/chat.c:167
 #: ../libpurple/protocols/silc10/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>Amprenta cheii fondatorului:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:167
+#: ../libpurple/protocols/silc/chat.c:168
 #: ../libpurple/protocols/silc10/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>Amprentă silabică a cheii fondatorului:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:236
+#: ../libpurple/protocols/silc/chat.c:238
 #: ../libpurple/protocols/silc10/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "Adaugă cheia publică a chat-ului"
 
 #. Add new public key
-#: ../libpurple/protocols/silc/chat.c:304
+#: ../libpurple/protocols/silc/chat.c:306
 #: ../libpurple/protocols/silc10/chat.c:291
 msgid "Open Public Key..."
 msgstr "Deschide cheia publică..."
 
-#: ../libpurple/protocols/silc/chat.c:423
+#: ../libpurple/protocols/silc/chat.c:425
 #: ../libpurple/protocols/silc10/chat.c:401
 msgid "Channel Passphrase"
 msgstr "Frază secretă pentru chat"
 
-#: ../libpurple/protocols/silc/chat.c:430
+#: ../libpurple/protocols/silc/chat.c:432
 #: ../libpurple/protocols/silc10/chat.c:408
 msgid "Channel Public Keys List"
 msgstr "Listă chei publice chat"
 
-#: ../libpurple/protocols/silc/chat.c:435
+#: ../libpurple/protocols/silc/chat.c:437
 #: ../libpurple/protocols/silc10/chat.c:413
-#, c-format
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -11015,11 +11229,11 @@
 "În cel de-al doilea, doar utilizatorii ale căror semnături digitale sunt "
 "listate pot intra în chat."
 
-#: ../libpurple/protocols/silc/chat.c:444
-#: ../libpurple/protocols/silc/chat.c:445
-#: ../libpurple/protocols/silc/chat.c:479
-#: ../libpurple/protocols/silc/chat.c:480
-#: ../libpurple/protocols/silc/chat.c:927
+#: ../libpurple/protocols/silc/chat.c:446
+#: ../libpurple/protocols/silc/chat.c:447
+#: ../libpurple/protocols/silc/chat.c:483
+#: ../libpurple/protocols/silc/chat.c:484
+#: ../libpurple/protocols/silc/chat.c:931
 #: ../libpurple/protocols/silc10/chat.c:422
 #: ../libpurple/protocols/silc10/chat.c:423
 #: ../libpurple/protocols/silc10/chat.c:461
@@ -11028,110 +11242,110 @@
 msgid "Channel Authentication"
 msgstr "Autentificare în chat"
 
-#: ../libpurple/protocols/silc/chat.c:446
-#: ../libpurple/protocols/silc/chat.c:481
+#: ../libpurple/protocols/silc/chat.c:448
+#: ../libpurple/protocols/silc/chat.c:485
 #: ../libpurple/protocols/silc10/chat.c:424
 #: ../libpurple/protocols/silc10/chat.c:463
 msgid "Add / Remove"
 msgstr "Adaugă/Şterge"
 
-#: ../libpurple/protocols/silc/chat.c:597
+#: ../libpurple/protocols/silc/chat.c:601
 #: ../libpurple/protocols/silc10/chat.c:581
 msgid "Group Name"
 msgstr "Nume grup"
 
-#: ../libpurple/protocols/silc/chat.c:601
-#: ../libpurple/protocols/silc/ops.c:1813
-#: ../libpurple/protocols/silc/silc.c:1020
+#: ../libpurple/protocols/silc/chat.c:605
+#: ../libpurple/protocols/silc/ops.c:1817
+#: ../libpurple/protocols/silc/silc.c:1163
 #: ../libpurple/protocols/silc10/chat.c:585
 #: ../libpurple/protocols/silc10/ops.c:1901
 #: ../libpurple/protocols/silc10/silc.c:931
 msgid "Passphrase"
 msgstr "Frază secretă"
 
-#: ../libpurple/protocols/silc/chat.c:612
+#: ../libpurple/protocols/silc/chat.c:616
 #: ../libpurple/protocols/silc10/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "Introduceţi numele grupului chat-ului privat %s şi fraza secretă."
 
-#: ../libpurple/protocols/silc/chat.c:614
+#: ../libpurple/protocols/silc/chat.c:618
 #: ../libpurple/protocols/silc10/chat.c:598
 msgid "Add Channel Private Group"
 msgstr "Adaugă grupul chat-ului privat"
 
-#: ../libpurple/protocols/silc/chat.c:742
+#: ../libpurple/protocols/silc/chat.c:746
 #: ../libpurple/protocols/silc10/chat.c:726
 msgid "User Limit"
 msgstr "Limită utilizatori"
 
-#: ../libpurple/protocols/silc/chat.c:743
+#: ../libpurple/protocols/silc/chat.c:747
 #: ../libpurple/protocols/silc10/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 "Setaţi numărul maxim de utilizatori în chat. Zero pentru număr nelimitat."
 
-#: ../libpurple/protocols/silc/chat.c:907
+#: ../libpurple/protocols/silc/chat.c:911
 #: ../libpurple/protocols/silc10/chat.c:891
 msgid "Invite List"
 msgstr "Listă invitaţii"
 
-#: ../libpurple/protocols/silc/chat.c:912
+#: ../libpurple/protocols/silc/chat.c:916
 #: ../libpurple/protocols/silc10/chat.c:896
 msgid "Ban List"
 msgstr "Listă interdicţii"
 
-#: ../libpurple/protocols/silc/chat.c:920
+#: ../libpurple/protocols/silc/chat.c:924
 #: ../libpurple/protocols/silc10/chat.c:904
 msgid "Add Private Group"
 msgstr "Adaugă grupul privat"
 
-#: ../libpurple/protocols/silc/chat.c:933
+#: ../libpurple/protocols/silc/chat.c:937
 #: ../libpurple/protocols/silc10/chat.c:917
 msgid "Reset Permanent"
 msgstr "Resetează permanent"
 
-#: ../libpurple/protocols/silc/chat.c:938
+#: ../libpurple/protocols/silc/chat.c:942
 #: ../libpurple/protocols/silc10/chat.c:922
 msgid "Set Permanent"
 msgstr "Setează permanent"
 
-#: ../libpurple/protocols/silc/chat.c:946
+#: ../libpurple/protocols/silc/chat.c:950
 #: ../libpurple/protocols/silc10/chat.c:930
 msgid "Set User Limit"
 msgstr "Setare limită utilizatori"
 
-#: ../libpurple/protocols/silc/chat.c:952
+#: ../libpurple/protocols/silc/chat.c:956
 #: ../libpurple/protocols/silc10/chat.c:936
 msgid "Reset Topic Restriction"
 msgstr "Resetează blocarea topicului"
 
-#: ../libpurple/protocols/silc/chat.c:957
+#: ../libpurple/protocols/silc/chat.c:961
 #: ../libpurple/protocols/silc10/chat.c:941
 msgid "Set Topic Restriction"
 msgstr "Setează blocarea topicului"
 
-#: ../libpurple/protocols/silc/chat.c:964
+#: ../libpurple/protocols/silc/chat.c:968
 #: ../libpurple/protocols/silc10/chat.c:948
 msgid "Reset Private Channel"
 msgstr "Resetează chat-ul privat"
 
-#: ../libpurple/protocols/silc/chat.c:969
+#: ../libpurple/protocols/silc/chat.c:973
 #: ../libpurple/protocols/silc10/chat.c:953
 msgid "Set Private Channel"
 msgstr "Setează chat-ul privat"
 
-#: ../libpurple/protocols/silc/chat.c:976
+#: ../libpurple/protocols/silc/chat.c:980
 #: ../libpurple/protocols/silc10/chat.c:960
 msgid "Reset Secret Channel"
 msgstr "Resetează chat-ul secret"
 
-#: ../libpurple/protocols/silc/chat.c:981
+#: ../libpurple/protocols/silc/chat.c:985
 #: ../libpurple/protocols/silc10/chat.c:965
 msgid "Set Secret Channel"
 msgstr "Setează chat-ul secret"
 
-#: ../libpurple/protocols/silc/chat.c:1045
+#: ../libpurple/protocols/silc/chat.c:1046
 #: ../libpurple/protocols/silc10/chat.c:1102
 #, c-format
 msgid ""
@@ -11140,34 +11354,34 @@
 "Trebuie să intraţi în chat-ul %s înainte de a vă putea alătura grupului "
 "privat."
 
-#: ../libpurple/protocols/silc/chat.c:1047
+#: ../libpurple/protocols/silc/chat.c:1048
 #: ../libpurple/protocols/silc10/chat.c:1104
 msgid "Join Private Group"
 msgstr "Intră în grupul privat"
 
-#: ../libpurple/protocols/silc/chat.c:1048
+#: ../libpurple/protocols/silc/chat.c:1049
 #: ../libpurple/protocols/silc10/chat.c:1105
 msgid "Cannot join private group"
 msgstr "Nu se poate intra în grupul privat"
 
-#: ../libpurple/protocols/silc/chat.c:1260
-#: ../libpurple/protocols/silc/silc.c:1217
+#: ../libpurple/protocols/silc/chat.c:1245
+#: ../libpurple/protocols/silc/silc.c:1360
 #: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1137
+#: ../libpurple/protocols/silc10/silc.c:1140
 msgid "Call Command"
 msgstr "Iniţiază comanda"
 
-#: ../libpurple/protocols/silc/chat.c:1260
-#: ../libpurple/protocols/silc/silc.c:1218
+#: ../libpurple/protocols/silc/chat.c:1245
+#: ../libpurple/protocols/silc/silc.c:1361
 #: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1137
+#: ../libpurple/protocols/silc10/silc.c:1140
 msgid "Cannot call command"
 msgstr "Nu se poate iniţia comanda"
 
-#: ../libpurple/protocols/silc/chat.c:1261
-#: ../libpurple/protocols/silc/silc.c:1219
+#: ../libpurple/protocols/silc/chat.c:1246
+#: ../libpurple/protocols/silc/silc.c:1362
 #: ../libpurple/protocols/silc10/chat.c:1300
-#: ../libpurple/protocols/silc10/silc.c:1138
+#: ../libpurple/protocols/silc10/silc.c:1141
 msgid "Unknown command"
 msgstr "Comandă necunoscută"
 
@@ -11325,7 +11539,7 @@
 msgstr "Funcţie"
 
 #: ../libpurple/protocols/silc/ops.c:1018
-#: ../libpurple/protocols/silc/silc.c:1013
+#: ../libpurple/protocols/silc/silc.c:1156
 #: ../libpurple/protocols/silc10/ops.c:1052
 #: ../libpurple/protocols/silc10/silc.c:924
 msgid "Organization"
@@ -11359,7 +11573,7 @@
 msgstr "Iniţiatorul chat-ului în <I>%s</I> este <I>%s</I>"
 
 #: ../libpurple/protocols/silc/ops.c:1190
-#: ../libpurple/protocols/silc/ops.c:1326
+#: ../libpurple/protocols/silc/ops.c:1328
 #: ../libpurple/protocols/silc10/ops.c:1183
 #: ../libpurple/protocols/silc10/ops.c:1332
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1071
@@ -11371,90 +11585,90 @@
 msgid "Status Text"
 msgstr "Text status"
 
-#: ../libpurple/protocols/silc/ops.c:1279
-#: ../libpurple/protocols/silc/ops.c:1351
+#: ../libpurple/protocols/silc/ops.c:1280
+#: ../libpurple/protocols/silc/ops.c:1354
 #: ../libpurple/protocols/silc10/ops.c:1285
 #: ../libpurple/protocols/silc10/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr "Amprentă cheie publică"
 
-#: ../libpurple/protocols/silc/ops.c:1280
-#: ../libpurple/protocols/silc/ops.c:1352
+#: ../libpurple/protocols/silc/ops.c:1281
+#: ../libpurple/protocols/silc/ops.c:1355
 #: ../libpurple/protocols/silc10/ops.c:1286
 #: ../libpurple/protocols/silc10/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr "Amprentă silabică cheie publică"
 
-#: ../libpurple/protocols/silc/ops.c:1292
+#: ../libpurple/protocols/silc/ops.c:1294
 #: ../libpurple/protocols/silc10/ops.c:1298
 msgid "_More..."
 msgstr "_Mai mult..."
 
-#: ../libpurple/protocols/silc/ops.c:1369
-#: ../libpurple/protocols/silc/silc.c:1077
+#: ../libpurple/protocols/silc/ops.c:1373
+#: ../libpurple/protocols/silc/silc.c:1220
 #: ../libpurple/protocols/silc10/ops.c:1371
-#: ../libpurple/protocols/silc10/silc.c:988
+#: ../libpurple/protocols/silc10/silc.c:991
 msgid "Detach From Server"
 msgstr "Detaşare de server"
 
-#: ../libpurple/protocols/silc/ops.c:1369
+#: ../libpurple/protocols/silc/ops.c:1373
 #: ../libpurple/protocols/silc10/ops.c:1371
 msgid "Cannot detach"
 msgstr "Detaşarea nu a reuşit"
 
-#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/silc/ops.c:1393
 #: ../libpurple/protocols/silc10/ops.c:1382
 msgid "Cannot set topic"
 msgstr "Nu se poate schimba topicul"
 
-#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/silc/ops.c:1422
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Failed to change nickname"
 msgstr "Schimbarea pseudonimului a eşuat"
 
-#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc/ops.c:1471
 #: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Roomlist"
 msgstr "Listă camere de chat"
 
-#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc/ops.c:1471
 #: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Cannot get room list"
 msgstr "Nu se poate obţine lista camerelor de chat"
 
-#: ../libpurple/protocols/silc/ops.c:1468
+#: ../libpurple/protocols/silc/ops.c:1472
 msgid "Network is empty"
 msgstr "Reţeaua este goală"
 
-#: ../libpurple/protocols/silc/ops.c:1512
+#: ../libpurple/protocols/silc/ops.c:1516
 #: ../libpurple/protocols/silc10/ops.c:1507
 msgid "No public key was received"
 msgstr "Nu s-a primit nici o cheie publică"
 
-#: ../libpurple/protocols/silc/ops.c:1524
-#: ../libpurple/protocols/silc/ops.c:1537
+#: ../libpurple/protocols/silc/ops.c:1528
+#: ../libpurple/protocols/silc/ops.c:1541
 #: ../libpurple/protocols/silc10/ops.c:1519
 #: ../libpurple/protocols/silc10/ops.c:1532
 msgid "Server Information"
 msgstr "Informaţii server"
 
-#: ../libpurple/protocols/silc/ops.c:1525
+#: ../libpurple/protocols/silc/ops.c:1529
 #: ../libpurple/protocols/silc10/ops.c:1520
 msgid "Cannot get server information"
 msgstr "Nu s-au putut obţine detalii despre server"
 
-#: ../libpurple/protocols/silc/ops.c:1548
+#: ../libpurple/protocols/silc/ops.c:1552
 #: ../libpurple/protocols/silc10/ops.c:1549
 #: ../libpurple/protocols/silc10/ops.c:1558
 msgid "Server Statistics"
 msgstr "Statistici server"
 
-#: ../libpurple/protocols/silc/ops.c:1549
+#: ../libpurple/protocols/silc/ops.c:1553
 #: ../libpurple/protocols/silc10/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr "Nu s-au putut obţine statisticile serverului"
 
-#: ../libpurple/protocols/silc/ops.c:1556
+#: ../libpurple/protocols/silc/ops.c:1560
 #: ../libpurple/protocols/silc10/ops.c:1581
 #, c-format
 msgid ""
@@ -11490,54 +11704,54 @@
 "Total operatori servere: %d\n"
 "Total operatori routere: %d\n"
 
-#: ../libpurple/protocols/silc/ops.c:1588
+#: ../libpurple/protocols/silc/ops.c:1592
 #: ../libpurple/protocols/silc10/ops.c:1604
 msgid "Network Statistics"
 msgstr "Statistici reţea"
 
-#: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc/ops.c:1600
 #: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "Ping eşuat"
 
-#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc/ops.c:1605
 #: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping reply received from server"
 msgstr "Replică ping primită de la server"
 
-#: ../libpurple/protocols/silc/ops.c:1609
+#: ../libpurple/protocols/silc/ops.c:1613
 #: ../libpurple/protocols/silc10/ops.c:1625
 msgid "Could not kill user"
 msgstr "Utilizatorul nu a putut fi eliminat"
 
-#: ../libpurple/protocols/silc/ops.c:1648
+#: ../libpurple/protocols/silc/ops.c:1652
 msgid "WATCH"
 msgstr "WATCH"
 
-#: ../libpurple/protocols/silc/ops.c:1648
+#: ../libpurple/protocols/silc/ops.c:1652
 msgid "Cannot watch user"
 msgstr "Nu se poate face watch pentru acest utilizator"
 
-#: ../libpurple/protocols/silc/ops.c:1724
-#: ../libpurple/protocols/silc/ops.c:1775
-#: ../libpurple/protocols/silc/silc.c:277
+#: ../libpurple/protocols/silc/ops.c:1728
+#: ../libpurple/protocols/silc/ops.c:1779
+#: ../libpurple/protocols/silc/silc.c:385
 #: ../libpurple/protocols/silc10/ops.c:1811
 #: ../libpurple/protocols/silc10/ops.c:1858
 #: ../libpurple/protocols/silc10/silc.c:190
 msgid "Resuming session"
 msgstr "Se reia sesiunea"
 
-#: ../libpurple/protocols/silc/ops.c:1726
+#: ../libpurple/protocols/silc/ops.c:1730
 #: ../libpurple/protocols/silc10/ops.c:1813
 msgid "Authenticating connection"
 msgstr "Se autentifică conexiunea"
 
-#: ../libpurple/protocols/silc/ops.c:1777
+#: ../libpurple/protocols/silc/ops.c:1781
 #: ../libpurple/protocols/silc10/ops.c:1860
 msgid "Verifying server public key"
 msgstr "Se verifică cheia publică a serverului"
 
-#: ../libpurple/protocols/silc/ops.c:1814
+#: ../libpurple/protocols/silc/ops.c:1818
 #: ../libpurple/protocols/silc10/ops.c:1902
 msgid "Passphrase required"
 msgstr "Se cere fraza secretă"
@@ -11584,22 +11798,22 @@
 msgid "Unsupported public key type"
 msgstr "Tip nesuportat de cheie publică"
 
-#: ../libpurple/protocols/silc/silc.c:217
+#: ../libpurple/protocols/silc/silc.c:319
 #: ../libpurple/protocols/silc10/ops.c:1749
 msgid "Disconnected by server"
 msgstr "Deconectat(ă) de server"
 
-#: ../libpurple/protocols/silc/silc.c:224
+#: ../libpurple/protocols/silc/silc.c:327
 #: ../libpurple/protocols/silc10/ops.c:1700
 msgid "Error during connecting to SILC Server"
 msgstr "Eroare la conectarea la serverul SILC"
 
-#: ../libpurple/protocols/silc/silc.c:229
+#: ../libpurple/protocols/silc/silc.c:333
 #: ../libpurple/protocols/silc10/ops.c:1705
 msgid "Key Exchange failed"
 msgstr "Schimbul de chei a eşuat"
 
-#: ../libpurple/protocols/silc/silc.c:238
+#: ../libpurple/protocols/silc/silc.c:343
 #: ../libpurple/protocols/silc10/ops.c:1714
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
@@ -11607,64 +11821,62 @@
 "Reluarea sesiunii detaşate a eşuat. Încercaţi „Reconectare” pentru a crea o "
 "nouă conexiune."
 
-#: ../libpurple/protocols/silc/silc.c:265
-#: ../libpurple/protocols/silc/silc.c:311
+#: ../libpurple/protocols/silc/silc.c:373
+#: ../libpurple/protocols/silc/silc.c:420
 #: ../libpurple/protocols/silc10/silc.c:161
 msgid "Connection failed"
 msgstr "Conexiunea a eşuat"
 
-#: ../libpurple/protocols/silc/silc.c:280
+#: ../libpurple/protocols/silc/silc.c:388
 #: ../libpurple/protocols/silc10/silc.c:193
 msgid "Performing key exchange"
 msgstr "Se efectuează schimbul de chei"
 
 #. Progress
-#: ../libpurple/protocols/silc/silc.c:343
+#: ../libpurple/protocols/silc/silc.c:445
 #: ../libpurple/protocols/silc10/silc.c:325
 msgid "Connecting to SILC Server"
 msgstr "Conectare în progres la serverul SILC"
 
-#: ../libpurple/protocols/silc/silc.c:352
-#, c-format
+#: ../libpurple/protocols/silc/silc.c:455
 msgid "Could not load SILC key pair"
 msgstr "Nu s-a putut încărca perechea de chei SILC"
 
-#: ../libpurple/protocols/silc/silc.c:366
+#: ../libpurple/protocols/silc/silc.c:469
 #: ../libpurple/protocols/silc10/silc.c:355
 msgid "Unable to create connection"
 msgstr "Nu se poate crea o nouă conexiune"
 
-#: ../libpurple/protocols/silc/silc.c:395
+#: ../libpurple/protocols/silc/silc.c:499
 #: ../libpurple/protocols/silc10/silc.c:267
 msgid "Out of memory"
 msgstr "Nu mai există memorie disponibilă"
 
-#: ../libpurple/protocols/silc/silc.c:438
+#: ../libpurple/protocols/silc/silc.c:550
 #: ../libpurple/protocols/silc10/silc.c:313
 msgid "Cannot initialize SILC protocol"
 msgstr "Nu s-a putut iniţializa protocolul SILC"
 
-#: ../libpurple/protocols/silc/silc.c:445
+#: ../libpurple/protocols/silc/silc.c:559
 msgid "Error loading SILC key pair"
 msgstr "Eroare la încărcarea perechii de chei SILC"
 
-#: ../libpurple/protocols/silc/silc.c:739
+#: ../libpurple/protocols/silc/silc.c:882
 #: ../libpurple/protocols/silc10/silc.c:650
 msgid "Your Current Mood"
 msgstr "Propria dispoziţie"
 
-#: ../libpurple/protocols/silc/silc.c:741
-#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1641
-#, c-format
+#: ../libpurple/protocols/silc/silc.c:884
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1741
 msgid "Normal"
 msgstr "Normal"
 
-#: ../libpurple/protocols/silc/silc.c:755
+#: ../libpurple/protocols/silc/silc.c:898
 #: ../libpurple/protocols/silc10/silc.c:666
 msgid "In love"
 msgstr "Îndrăgostit(ă)"
 
-#: ../libpurple/protocols/silc/silc.c:766
+#: ../libpurple/protocols/silc/silc.c:909
 #: ../libpurple/protocols/silc10/silc.c:677
 msgid ""
 "\n"
@@ -11673,62 +11885,62 @@
 "\n"
 "Metode de contactare preferate"
 
-#: ../libpurple/protocols/silc/silc.c:774
-#: ../libpurple/protocols/silc/util.c:561
+#: ../libpurple/protocols/silc/silc.c:917
+#: ../libpurple/protocols/silc/util.c:567
 #: ../libpurple/protocols/silc10/silc.c:685
 #: ../libpurple/protocols/silc10/util.c:557
 msgid "SMS"
 msgstr "SMS"
 
-#: ../libpurple/protocols/silc/silc.c:776
-#: ../libpurple/protocols/silc/util.c:563
+#: ../libpurple/protocols/silc/silc.c:919
+#: ../libpurple/protocols/silc/util.c:569
 #: ../libpurple/protocols/silc10/silc.c:687
 #: ../libpurple/protocols/silc10/util.c:559
 msgid "MMS"
 msgstr "MMS"
 
-#: ../libpurple/protocols/silc/silc.c:778
+#: ../libpurple/protocols/silc/silc.c:921
 #: ../libpurple/protocols/silc10/silc.c:689
 msgid "Video conferencing"
 msgstr "Videoconferinţă"
 
-#: ../libpurple/protocols/silc/silc.c:783
+#: ../libpurple/protocols/silc/silc.c:926
 #: ../libpurple/protocols/silc10/silc.c:694
 msgid "Your Current Status"
 msgstr "Propriul status curent"
 
-#: ../libpurple/protocols/silc/silc.c:790
+#: ../libpurple/protocols/silc/silc.c:933
 #: ../libpurple/protocols/silc10/silc.c:701
 msgid "Online Services"
 msgstr "Servicii de conectare"
 
-#: ../libpurple/protocols/silc/silc.c:793
+#: ../libpurple/protocols/silc/silc.c:936
 #: ../libpurple/protocols/silc10/silc.c:704
 msgid "Let others see what services you are using"
 msgstr "Permite altora să vadă serviciile utilizate"
 
-#: ../libpurple/protocols/silc/silc.c:799
+#: ../libpurple/protocols/silc/silc.c:942
 #: ../libpurple/protocols/silc10/silc.c:710
 msgid "Let others see what computer you are using"
 msgstr "Permite altora să vadă calculatorul utilizat"
 
-#: ../libpurple/protocols/silc/silc.c:806
+#: ../libpurple/protocols/silc/silc.c:949
 #: ../libpurple/protocols/silc10/silc.c:717
 msgid "Your VCard File"
 msgstr "Propriul fişier VCard"
 
-#: ../libpurple/protocols/silc/silc.c:812
+#: ../libpurple/protocols/silc/silc.c:955
 msgid "Timezone (UTC)"
 msgstr "Fus orar (UTC)"
 
-#: ../libpurple/protocols/silc/silc.c:816
-#: ../libpurple/protocols/silc/silc.c:817
+#: ../libpurple/protocols/silc/silc.c:959
+#: ../libpurple/protocols/silc/silc.c:960
 #: ../libpurple/protocols/silc10/silc.c:729
 #: ../libpurple/protocols/silc10/silc.c:730
 msgid "User Online Status Attributes"
 msgstr "Atribute status utilizator"
 
-#: ../libpurple/protocols/silc/silc.c:818
+#: ../libpurple/protocols/silc/silc.c:961
 #: ../libpurple/protocols/silc10/silc.c:731
 msgid ""
 "You can let other users see your online status information and your personal "
@@ -11739,31 +11951,31 @@
 "informaţiile personale. Completaţi datele pe care doriţi să le faceţi "
 "accesibile."
 
-#: ../libpurple/protocols/silc/silc.c:859
-#: ../libpurple/protocols/silc/silc.c:865
-#: ../libpurple/protocols/silc/silc.c:1486
+#: ../libpurple/protocols/silc/silc.c:1002
+#: ../libpurple/protocols/silc/silc.c:1008
+#: ../libpurple/protocols/silc/silc.c:1629
 #: ../libpurple/protocols/silc10/silc.c:772
 #: ../libpurple/protocols/silc10/silc.c:778
-#: ../libpurple/protocols/silc10/silc.c:1415
+#: ../libpurple/protocols/silc10/silc.c:1418
 msgid "Message of the Day"
 msgstr "Mesajul zilei"
 
-#: ../libpurple/protocols/silc/silc.c:859
+#: ../libpurple/protocols/silc/silc.c:1002
 #: ../libpurple/protocols/silc10/silc.c:772
 msgid "No Message of the Day available"
 msgstr "Nu s-a găsit un mesaj al zilei pe server"
 
-#: ../libpurple/protocols/silc/silc.c:860
-#: ../libpurple/protocols/silc/silc.c:1481
+#: ../libpurple/protocols/silc/silc.c:1003
+#: ../libpurple/protocols/silc/silc.c:1624
 #: ../libpurple/protocols/silc10/silc.c:773
-#: ../libpurple/protocols/silc10/silc.c:1410
+#: ../libpurple/protocols/silc10/silc.c:1413
 msgid "There is no Message of the Day associated with this connection"
 msgstr "Nu există un mesaj al zilei asociat acestei conexiuni."
 
-#: ../libpurple/protocols/silc/silc.c:911
-#: ../libpurple/protocols/silc/silc.c:957
-#: ../libpurple/protocols/silc/silc.c:1028
-#: ../libpurple/protocols/silc/silc.c:1029
+#: ../libpurple/protocols/silc/silc.c:1054
+#: ../libpurple/protocols/silc/silc.c:1100
+#: ../libpurple/protocols/silc/silc.c:1171
+#: ../libpurple/protocols/silc/silc.c:1172
 #: ../libpurple/protocols/silc10/silc.c:824
 #: ../libpurple/protocols/silc10/silc.c:868
 #: ../libpurple/protocols/silc10/silc.c:939
@@ -11771,185 +11983,185 @@
 msgid "Create New SILC Key Pair"
 msgstr "Creează o nouă pereche de chei SILC"
 
-#: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc/silc.c:1054
 #: ../libpurple/protocols/silc10/silc.c:824
 msgid "Passphrases do not match"
 msgstr "Frazele secrete nu se potrivesc"
 
-#: ../libpurple/protocols/silc/silc.c:957
+#: ../libpurple/protocols/silc/silc.c:1100
 #: ../libpurple/protocols/silc10/silc.c:868
 msgid "Key Pair Generation failed"
 msgstr "Generarea perechii de chei a eşuat"
 
-#: ../libpurple/protocols/silc/silc.c:996
+#: ../libpurple/protocols/silc/silc.c:1139
 #: ../libpurple/protocols/silc10/silc.c:907
 msgid "Key length"
 msgstr "Lungime cheie"
 
-#: ../libpurple/protocols/silc/silc.c:998
+#: ../libpurple/protocols/silc/silc.c:1141
 #: ../libpurple/protocols/silc10/silc.c:909
 msgid "Public key file"
 msgstr "Fişier cheie publică"
 
-#: ../libpurple/protocols/silc/silc.c:1000
+#: ../libpurple/protocols/silc/silc.c:1143
 #: ../libpurple/protocols/silc10/silc.c:911
 msgid "Private key file"
 msgstr "Fişier cheie privată"
 
-#: ../libpurple/protocols/silc/silc.c:1023
+#: ../libpurple/protocols/silc/silc.c:1166
 #: ../libpurple/protocols/silc10/silc.c:934
 msgid "Passphrase (retype)"
 msgstr "Confirmare frază-parolă"
 
-#: ../libpurple/protocols/silc/silc.c:1030
+#: ../libpurple/protocols/silc/silc.c:1173
 #: ../libpurple/protocols/silc10/silc.c:941
 msgid "Generate Key Pair"
 msgstr "Generează pereche de chei"
 
-#: ../libpurple/protocols/silc/silc.c:1073
-#: ../libpurple/protocols/silc10/silc.c:984
+#: ../libpurple/protocols/silc/silc.c:1216
+#: ../libpurple/protocols/silc10/silc.c:987
 msgid "Online Status"
 msgstr "Status conectare"
 
-#: ../libpurple/protocols/silc/silc.c:1081
-#: ../libpurple/protocols/silc10/silc.c:992
+#: ../libpurple/protocols/silc/silc.c:1224
+#: ../libpurple/protocols/silc10/silc.c:995
 msgid "View Message of the Day"
 msgstr "Arată mesajul zilei"
 
-#: ../libpurple/protocols/silc/silc.c:1085
-#: ../libpurple/protocols/silc10/silc.c:996
+#: ../libpurple/protocols/silc/silc.c:1228
+#: ../libpurple/protocols/silc10/silc.c:999
 msgid "Create SILC Key Pair..."
 msgstr "Creare pereche de chei SILC..."
 
-#: ../libpurple/protocols/silc/silc.c:1177
-#: ../libpurple/protocols/silc10/silc.c:1095
+#: ../libpurple/protocols/silc/silc.c:1320
+#: ../libpurple/protocols/silc10/silc.c:1098
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "Utilizatorul <I>%s</I> nu este prezent în reţea"
 
-#: ../libpurple/protocols/silc/silc.c:1357
-#: ../libpurple/protocols/silc10/silc.c:1286
+#: ../libpurple/protocols/silc/silc.c:1500
+#: ../libpurple/protocols/silc10/silc.c:1289
 msgid "Topic too long"
 msgstr "Topic prea lung"
 
-#: ../libpurple/protocols/silc/silc.c:1438
-#: ../libpurple/protocols/silc10/silc.c:1367
+#: ../libpurple/protocols/silc/silc.c:1581
+#: ../libpurple/protocols/silc10/silc.c:1370
 msgid "You must specify a nick"
 msgstr "Trebuie să specificaţi un pseudonim"
 
-#: ../libpurple/protocols/silc/silc.c:1540
-#: ../libpurple/protocols/silc10/silc.c:1469
+#: ../libpurple/protocols/silc/silc.c:1683
+#: ../libpurple/protocols/silc10/silc.c:1472
 #, c-format
 msgid "channel %s not found"
 msgstr "chat-ul %s nu a fost găsit"
 
-#: ../libpurple/protocols/silc/silc.c:1545
-#: ../libpurple/protocols/silc10/silc.c:1474
+#: ../libpurple/protocols/silc/silc.c:1688
+#: ../libpurple/protocols/silc10/silc.c:1477
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "modurile de chat pentru %s sunt: %s"
 
-#: ../libpurple/protocols/silc/silc.c:1547
-#: ../libpurple/protocols/silc10/silc.c:1476
+#: ../libpurple/protocols/silc/silc.c:1690
+#: ../libpurple/protocols/silc10/silc.c:1479
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "chat-ul %s nu are setat nici un mod"
 
-#: ../libpurple/protocols/silc/silc.c:1560
-#: ../libpurple/protocols/silc10/silc.c:1489
+#: ../libpurple/protocols/silc/silc.c:1703
+#: ../libpurple/protocols/silc10/silc.c:1492
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "Nu s-au putut seta modurile chat-ului %s"
 
-#: ../libpurple/protocols/silc/silc.c:1590
-#: ../libpurple/protocols/silc10/silc.c:1519
+#: ../libpurple/protocols/silc/silc.c:1733
+#: ../libpurple/protocols/silc10/silc.c:1522
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
 msgstr "Comandă necunoscută: %s (poate fi o problemă de client)"
 
-#: ../libpurple/protocols/silc/silc.c:1653
-#: ../libpurple/protocols/silc10/silc.c:1582
+#: ../libpurple/protocols/silc/silc.c:1796
+#: ../libpurple/protocols/silc10/silc.c:1585
 msgid "part [channel]:  Leave the chat"
 msgstr "part [chat]:  Părăseşte un chat"
 
-#: ../libpurple/protocols/silc/silc.c:1657
-#: ../libpurple/protocols/silc10/silc.c:1586
+#: ../libpurple/protocols/silc/silc.c:1800
+#: ../libpurple/protocols/silc10/silc.c:1589
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [chat]:  Părăseşte un chat"
 
-#: ../libpurple/protocols/silc/silc.c:1661
-#: ../libpurple/protocols/silc10/silc.c:1590
+#: ../libpurple/protocols/silc/silc.c:1804
+#: ../libpurple/protocols/silc10/silc.c:1593
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;nou topic&gt;]: Arată sau schimbă topicul"
 
-#: ../libpurple/protocols/silc/silc.c:1666
-#: ../libpurple/protocols/silc10/silc.c:1595
+#: ../libpurple/protocols/silc/silc.c:1809
+#: ../libpurple/protocols/silc10/silc.c:1598
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr ""
 "join &lt;chat&gt; [&lt;parolă&gt;]:  Intră într-un chat din această reţea"
 
-#: ../libpurple/protocols/silc/silc.c:1670
-#: ../libpurple/protocols/silc10/silc.c:1599
+#: ../libpurple/protocols/silc/silc.c:1813
+#: ../libpurple/protocols/silc10/silc.c:1602
 msgid "list:  List channels on this network"
 msgstr "list:  Listează chat-urile din această reţea"
 
-#: ../libpurple/protocols/silc/silc.c:1674
-#: ../libpurple/protocols/silc10/silc.c:1603
+#: ../libpurple/protocols/silc/silc.c:1817
+#: ../libpurple/protocols/silc10/silc.c:1606
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;pseudonim&gt;:  Arată detaliile utilizatorului"
 
-#: ../libpurple/protocols/silc/silc.c:1678
-#: ../libpurple/protocols/silc10/silc.c:1607
+#: ../libpurple/protocols/silc/silc.c:1821
+#: ../libpurple/protocols/silc10/silc.c:1610
 #: ../libpurple/protocols/zephyr/zephyr.c:2685
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
 "msg &lt;pseudonim&gt; &lt;message&gt;:  Trimite un mesaj privat "
 "utilizatorului"
 
-#: ../libpurple/protocols/silc/silc.c:1682
-#: ../libpurple/protocols/silc10/silc.c:1611
+#: ../libpurple/protocols/silc/silc.c:1825
+#: ../libpurple/protocols/silc10/silc.c:1614
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
 "query &lt;pseudonim&gt; [&lt;mesaj&gt;]:  Trimite un mesaj privat "
 "utilizatorului"
 
-#: ../libpurple/protocols/silc/silc.c:1686
-#: ../libpurple/protocols/silc10/silc.c:1615
+#: ../libpurple/protocols/silc/silc.c:1829
+#: ../libpurple/protocols/silc10/silc.c:1618
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  Arată mesajul zilei de pe server"
 
-#: ../libpurple/protocols/silc/silc.c:1690
-#: ../libpurple/protocols/silc10/silc.c:1619
+#: ../libpurple/protocols/silc/silc.c:1833
+#: ../libpurple/protocols/silc10/silc.c:1622
 msgid "detach:  Detach this session"
 msgstr "detach:  Detaşează această sesiune"
 
-#: ../libpurple/protocols/silc/silc.c:1694
-#: ../libpurple/protocols/silc10/silc.c:1623
+#: ../libpurple/protocols/silc/silc.c:1837
+#: ../libpurple/protocols/silc10/silc.c:1626
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [mesaj]:  Deconectare de la server cu mesajul precizat"
 
-#: ../libpurple/protocols/silc/silc.c:1698
-#: ../libpurple/protocols/silc10/silc.c:1627
+#: ../libpurple/protocols/silc/silc.c:1841
+#: ../libpurple/protocols/silc10/silc.c:1630
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;comandă&gt;:  Iniţiază o comandă client SILC"
 
-#: ../libpurple/protocols/silc/silc.c:1704
-#: ../libpurple/protocols/silc10/silc.c:1633
+#: ../libpurple/protocols/silc/silc.c:1847
+#: ../libpurple/protocols/silc10/silc.c:1636
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;pseudonim&gt;  [-cheie|&lt;motiv&gt;]:  Elimină utilizatorul"
 
-#: ../libpurple/protocols/silc/silc.c:1708
-#: ../libpurple/protocols/silc10/silc.c:1637
+#: ../libpurple/protocols/silc/silc.c:1851
+#: ../libpurple/protocols/silc10/silc.c:1640
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;pseudonim nou&gt;:  Schimbare pseudonim propriu"
 
-#: ../libpurple/protocols/silc/silc.c:1712
-#: ../libpurple/protocols/silc10/silc.c:1641
+#: ../libpurple/protocols/silc/silc.c:1855
+#: ../libpurple/protocols/silc10/silc.c:1644
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowah &lt;pseudonim&gt;:  Arată detaliile utilizatorului"
 
-#: ../libpurple/protocols/silc/silc.c:1716
-#: ../libpurple/protocols/silc10/silc.c:1645
+#: ../libpurple/protocols/silc/silc.c:1859
+#: ../libpurple/protocols/silc10/silc.c:1648
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -11957,8 +12169,8 @@
 "cmode &lt;chat&gt; [+|-&lt;moduri&gt;] [argumente]:   Schimbă sau arată "
 "modurile chat-ului."
 
-#: ../libpurple/protocols/silc/silc.c:1720
-#: ../libpurple/protocols/silc10/silc.c:1649
+#: ../libpurple/protocols/silc/silc.c:1863
+#: ../libpurple/protocols/silc10/silc.c:1652
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -11966,18 +12178,18 @@
 "cumode &lt;chat&gt; +|-&lt;moduri&gt; &lt;pseudonim&gt;:  Schimbă modurile "
 "respectivului utilizator în chat"
 
-#: ../libpurple/protocols/silc/silc.c:1724
-#: ../libpurple/protocols/silc10/silc.c:1653
+#: ../libpurple/protocols/silc/silc.c:1867
+#: ../libpurple/protocols/silc10/silc.c:1656
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt:moduri_utilizator&gt;:  Setează modurile în reţea"
 
-#: ../libpurple/protocols/silc/silc.c:1728
-#: ../libpurple/protocols/silc10/silc.c:1657
+#: ../libpurple/protocols/silc/silc.c:1871
+#: ../libpurple/protocols/silc10/silc.c:1660
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;pseudonim&gt; [-cheie]:  Cere privilegii de utilizator"
 
-#: ../libpurple/protocols/silc/silc.c:1732
-#: ../libpurple/protocols/silc10/silc.c:1661
+#: ../libpurple/protocols/silc/silc.c:1875
+#: ../libpurple/protocols/silc10/silc.c:1664
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -11985,49 +12197,49 @@
 "invite &lt;chat&gt; [-|+]&lt;pseudonim&gt;:  invită respectivul utilizator "
 "sau adaugă-l/şterge-l din lista invitaţilor chat-ului"
 
-#: ../libpurple/protocols/silc/silc.c:1736
-#: ../libpurple/protocols/silc10/silc.c:1665
+#: ../libpurple/protocols/silc/silc.c:1879
+#: ../libpurple/protocols/silc10/silc.c:1668
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 "kick &lt;chat&gt; &lt;pseudonim&gt; [comentariu]: Dă afară din chat un "
 "utilizator."
 
-#: ../libpurple/protocols/silc/silc.c:1740
-#: ../libpurple/protocols/silc10/silc.c:1669
+#: ../libpurple/protocols/silc/silc.c:1883
+#: ../libpurple/protocols/silc10/silc.c:1672
 msgid "info [server]:  View server administrative details"
 msgstr "info [server]:  Arată detalii administrative despre server"
 
-#: ../libpurple/protocols/silc/silc.c:1744
-#: ../libpurple/protocols/silc10/silc.c:1673
+#: ../libpurple/protocols/silc/silc.c:1887
+#: ../libpurple/protocols/silc10/silc.c:1676
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr ""
 "ban [&lt;chat&gt; +|-&lt;pseudonim&gt]:  Interzice utilizatorului respectiv "
 "accesul la acest chat"
 
-#: ../libpurple/protocols/silc/silc.c:1748
-#: ../libpurple/protocols/silc10/silc.c:1677
+#: ../libpurple/protocols/silc/silc.c:1891
+#: ../libpurple/protocols/silc10/silc.c:1680
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 "getkey &lt;pseudonim|server&gt;:  Regăseşte cheia publică a clientului sau a "
 "serverului"
 
-#: ../libpurple/protocols/silc/silc.c:1752
-#: ../libpurple/protocols/silc10/silc.c:1681
+#: ../libpurple/protocols/silc/silc.c:1895
+#: ../libpurple/protocols/silc10/silc.c:1684
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Arată statisticile serverului şi ale reţelei"
 
-#: ../libpurple/protocols/silc/silc.c:1756
-#: ../libpurple/protocols/silc10/silc.c:1685
+#: ../libpurple/protocols/silc/silc.c:1899
+#: ../libpurple/protocols/silc10/silc.c:1688
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  PING către serverul curent"
 
-#: ../libpurple/protocols/silc/silc.c:1761
-#: ../libpurple/protocols/silc10/silc.c:1690
+#: ../libpurple/protocols/silc/silc.c:1904
+#: ../libpurple/protocols/silc10/silc.c:1693
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "user &lt;chat&gt;:  Listează utilizatorii dintr-un chat"
 
-#: ../libpurple/protocols/silc/silc.c:1765
-#: ../libpurple/protocols/silc10/silc.c:1694
+#: ../libpurple/protocols/silc/silc.c:1908
+#: ../libpurple/protocols/silc10/silc.c:1697
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -12044,140 +12256,140 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:1876
-#: ../libpurple/protocols/silc10/silc.c:1819
+#: ../libpurple/protocols/silc/silc.c:2019
+#: ../libpurple/protocols/silc10/silc.c:1822
 msgid "SILC Protocol Plugin"
 msgstr "Modul de protocol SILC"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:1878
-#: ../libpurple/protocols/silc10/silc.c:1821
+#: ../libpurple/protocols/silc/silc.c:2021
+#: ../libpurple/protocols/silc10/silc.c:1824
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Protocol SILC (Secure Internet Live Conferencing)"
 
-#: ../libpurple/protocols/silc/silc.c:1910
-#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2036
+#: ../libpurple/protocols/silc/silc.c:2053
+#: ../libpurple/protocols/silc10/silc.c:1856 ../pidgin/gtkprefs.c:2138
 msgid "Network"
 msgstr "Reţea"
 
-#: ../libpurple/protocols/silc/silc.c:1921
-#: ../libpurple/protocols/silc10/silc.c:1864
+#: ../libpurple/protocols/silc/silc.c:2064
+#: ../libpurple/protocols/silc10/silc.c:1867
 msgid "Public Key file"
 msgstr "Fişier cheie publică"
 
-#: ../libpurple/protocols/silc/silc.c:1925
-#: ../libpurple/protocols/silc10/silc.c:1868
+#: ../libpurple/protocols/silc/silc.c:2068
+#: ../libpurple/protocols/silc10/silc.c:1871
 msgid "Private Key file"
 msgstr "Fişier cheie privată"
 
-#: ../libpurple/protocols/silc/silc.c:1935
-#: ../libpurple/protocols/silc10/silc.c:1878
+#: ../libpurple/protocols/silc/silc.c:2078
+#: ../libpurple/protocols/silc10/silc.c:1881
 msgid "Cipher"
 msgstr "Cifru"
 
-#: ../libpurple/protocols/silc/silc.c:1945
-#: ../libpurple/protocols/silc10/silc.c:1888
+#: ../libpurple/protocols/silc/silc.c:2088
+#: ../libpurple/protocols/silc10/silc.c:1891
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../libpurple/protocols/silc/silc.c:1948
+#: ../libpurple/protocols/silc/silc.c:2091
 msgid "Use Perfect Forward Secrecy"
 msgstr "Utilizează „Perfect Forward Secrecy”"
 
-#: ../libpurple/protocols/silc/silc.c:1952
-#: ../libpurple/protocols/silc10/silc.c:1891
+#: ../libpurple/protocols/silc/silc.c:2095
+#: ../libpurple/protocols/silc10/silc.c:1894
 msgid "Public key authentication"
 msgstr "Autentificare cu cheie publică"
 
-#: ../libpurple/protocols/silc/silc.c:1955
-#: ../libpurple/protocols/silc10/silc.c:1894
+#: ../libpurple/protocols/silc/silc.c:2098
+#: ../libpurple/protocols/silc10/silc.c:1897
 msgid "Block IMs without Key Exchange"
 msgstr "Blochează mesajele fără schimb de chei"
 
-#: ../libpurple/protocols/silc/silc.c:1958
-#: ../libpurple/protocols/silc10/silc.c:1897
+#: ../libpurple/protocols/silc/silc.c:2101
+#: ../libpurple/protocols/silc10/silc.c:1900
 msgid "Block messages to whiteboard"
 msgstr "Blochează mesajele către „whiteboard”"
 
-#: ../libpurple/protocols/silc/silc.c:1961
-#: ../libpurple/protocols/silc10/silc.c:1900
+#: ../libpurple/protocols/silc/silc.c:2104
+#: ../libpurple/protocols/silc10/silc.c:1903
 msgid "Automatically open whiteboard"
 msgstr "Deschide automat un „whiteboard”"
 
-#: ../libpurple/protocols/silc/silc.c:1964
-#: ../libpurple/protocols/silc10/silc.c:1903
+#: ../libpurple/protocols/silc/silc.c:2107
+#: ../libpurple/protocols/silc10/silc.c:1906
 msgid "Digitally sign and verify all messages"
 msgstr "Semnează digital şi verifică toate mesajele"
 
 #: ../libpurple/protocols/silc/util.c:207
-#: ../libpurple/protocols/silc/util.c:249
+#: ../libpurple/protocols/silc/util.c:250
 #: ../libpurple/protocols/silc10/util.c:207
 #: ../libpurple/protocols/silc10/util.c:247
 msgid "Creating SILC key pair..."
 msgstr "Creez perechea de chei SILC..."
 
-#: ../libpurple/protocols/silc/util.c:215
-#: ../libpurple/protocols/silc/util.c:257
+#: ../libpurple/protocols/silc/util.c:216
+#: ../libpurple/protocols/silc/util.c:259
 msgid "Cannot create SILC key pair\n"
 msgstr "Nu s-a putut crea perechea de chei SILC\n"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: ../libpurple/protocols/silc/util.c:358
+#: ../libpurple/protocols/silc/util.c:364
 #: ../libpurple/protocols/silc10/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Nume real: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:360
+#: ../libpurple/protocols/silc/util.c:366
 #: ../libpurple/protocols/silc10/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Nume utilizator: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:362
+#: ../libpurple/protocols/silc/util.c:368
 #: ../libpurple/protocols/silc10/util.c:359
 #, c-format
 msgid "E-Mail: \t\t%s\n"
 msgstr "Adresă de mail: \t\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:364
+#: ../libpurple/protocols/silc/util.c:370
 #: ../libpurple/protocols/silc10/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Nume calculator: \t\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:366
+#: ../libpurple/protocols/silc/util.c:372
 #: ../libpurple/protocols/silc10/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "Organizaţie: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:368
+#: ../libpurple/protocols/silc/util.c:374
 #: ../libpurple/protocols/silc10/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "Ţară: \t\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:369
+#: ../libpurple/protocols/silc/util.c:375
 #: ../libpurple/protocols/silc10/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Algoritm: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc/util.c:376
 #: ../libpurple/protocols/silc10/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "Lungime cheie: \t%d octeţi\n"
 
-#: ../libpurple/protocols/silc/util.c:372
+#: ../libpurple/protocols/silc/util.c:378
 #, c-format
 msgid "Version: \t%s\n"
 msgstr "Versiune: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:374
+#: ../libpurple/protocols/silc/util.c:380
 #: ../libpurple/protocols/silc10/util.c:369
 #, c-format
 msgid ""
@@ -12189,7 +12401,7 @@
 "%s\n"
 "\n"
 
-#: ../libpurple/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc/util.c:381
 #: ../libpurple/protocols/silc10/util.c:370
 #, c-format
 msgid ""
@@ -12199,45 +12411,45 @@
 "Cheie publică silabică:\n"
 "%s"
 
-#: ../libpurple/protocols/silc/util.c:379
-#: ../libpurple/protocols/silc/util.c:380
+#: ../libpurple/protocols/silc/util.c:385
+#: ../libpurple/protocols/silc/util.c:386
 #: ../libpurple/protocols/silc10/util.c:374
 #: ../libpurple/protocols/silc10/util.c:375
 msgid "Public Key Information"
 msgstr "Detalii cheie publică"
 
-#: ../libpurple/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc/util.c:565
 #: ../libpurple/protocols/silc10/util.c:555
 msgid "Paging"
 msgstr "Pager"
 
-#: ../libpurple/protocols/silc/util.c:565
+#: ../libpurple/protocols/silc/util.c:571
 #: ../libpurple/protocols/silc10/util.c:561
 msgid "Video Conferencing"
 msgstr "Videoconferinţă"
 
-#: ../libpurple/protocols/silc/util.c:583
+#: ../libpurple/protocols/silc/util.c:589
 #: ../libpurple/protocols/silc10/util.c:579
 msgid "Computer"
 msgstr "Calculator"
 
-#: ../libpurple/protocols/silc/util.c:587
+#: ../libpurple/protocols/silc/util.c:593
 #: ../libpurple/protocols/silc10/util.c:583
 msgid "PDA"
 msgstr "PDA"
 
-#: ../libpurple/protocols/silc/util.c:589
+#: ../libpurple/protocols/silc/util.c:595
 #: ../libpurple/protocols/silc10/util.c:585
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../libpurple/protocols/silc/wb.c:284 ../libpurple/protocols/silc10/wb.c:284
+#: ../libpurple/protocols/silc/wb.c:288 ../libpurple/protocols/silc10/wb.c:287
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr ""
 "%s a trimis un mesaj pentru „whiteboard”. Doriţi să deschid un „whiteboard”?"
 
-#: ../libpurple/protocols/silc/wb.c:288 ../libpurple/protocols/silc10/wb.c:288
+#: ../libpurple/protocols/silc/wb.c:292 ../libpurple/protocols/silc10/wb.c:291
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
@@ -12246,7 +12458,7 @@
 "%s a trimis un mesaj către „whiteboard” în chat-ul %s. Doriţi să deschid un "
 "whiteboard?"
 
-#: ../libpurple/protocols/silc/wb.c:302 ../libpurple/protocols/silc10/wb.c:302
+#: ../libpurple/protocols/silc/wb.c:306 ../libpurple/protocols/silc10/wb.c:305
 msgid "Whiteboard"
 msgstr "„Whiteboard”"
 
@@ -12255,55 +12467,45 @@
 msgstr "Nici o statistică nu e disponibilă pentru server"
 
 #: ../libpurple/protocols/silc10/ops.c:1931
-#, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr ""
 "Eroare: Nepotrivire de versiune, încercaţi o versiune mai nouă de client"
 
 #: ../libpurple/protocols/silc10/ops.c:1934
-#, c-format
 msgid "Failure: Remote does not trust/support your public key"
 msgstr ""
 "Eroare: Partenerul nu vă suportă tipul de cheie publică sau nu are încredere "
 "în ea."
 
 #: ../libpurple/protocols/silc10/ops.c:1937
-#, c-format
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Eroare: Partenerul nu suportă grupul KE propus"
 
 #: ../libpurple/protocols/silc10/ops.c:1940
-#, c-format
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Eroare: Partenerul nu suportă cifrul propus"
 
 #: ../libpurple/protocols/silc10/ops.c:1943
-#, c-format
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Eroare: Partenerul nu suport PKCS-ul propus"
 
 #: ../libpurple/protocols/silc10/ops.c:1946
-#, c-format
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Eroare: Partenerul nu suportă funcţia hash propusă"
 
 #: ../libpurple/protocols/silc10/ops.c:1949
-#, c-format
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Eroare: Partenerul nu suporta HMAC-ul propus"
 
 #: ../libpurple/protocols/silc10/ops.c:1951
-#, c-format
 msgid "Failure: Incorrect signature"
 msgstr "Eroare: Semnătură incorectă"
 
 #: ../libpurple/protocols/silc10/ops.c:1953
-#, c-format
 msgid "Failure: Invalid cookie"
 msgstr "Eroare: Cookie invalid"
 
 #: ../libpurple/protocols/silc10/ops.c:1964
-#, c-format
 msgid "Failure: Authentication failed"
 msgstr "Eroare: Autentificare eşuată"
 
@@ -12324,37 +12526,35 @@
 msgid "Could not load SILC key pair: %s"
 msgstr "Nu s-a putut încărca perechea de chei SILC: %s"
 
-#. TODO: do we really want to disconnect on a failure to write?
-#: ../libpurple/protocols/simple/simple.c:416
+#: ../libpurple/protocols/simple/simple.c:419
 msgid "Could not write"
 msgstr "Nu s-a putut scrie"
 
-#: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1529
+#: ../libpurple/protocols/simple/simple.c:443
+#: ../libpurple/protocols/simple/simple.c:1691
 msgid "Could not connect"
 msgstr "Conectare eşuată"
 
-#: ../libpurple/protocols/simple/simple.c:1059
-#, fuzzy
+#: ../libpurple/protocols/simple/simple.c:1127
 msgid "Unknown server response."
-msgstr "Motiv necunoscut."
-
-#: ../libpurple/protocols/simple/simple.c:1563
-#: ../libpurple/protocols/simple/simple.c:1605
-#: ../libpurple/protocols/simple/simple.c:1618
-#: ../libpurple/protocols/simple/simple.c:1669
+msgstr "Răspuns necunoscut de la server."
+
+#: ../libpurple/protocols/simple/simple.c:1727
+#: ../libpurple/protocols/simple/simple.c:1773
+#: ../libpurple/protocols/simple/simple.c:1788
+#: ../libpurple/protocols/simple/simple.c:1843
 msgid "Could not create listen socket"
 msgstr "Nu s-a putut crea un socket de ascultare"
 
-#: ../libpurple/protocols/simple/simple.c:1586
+#: ../libpurple/protocols/simple/simple.c:1752
 msgid "Couldn't resolve host"
 msgstr "Nu s-a putut rezolva numele calculatorului"
 
-#: ../libpurple/protocols/simple/simple.c:1677
+#: ../libpurple/protocols/simple/simple.c:1853
 msgid "Could not resolve hostname"
 msgstr "Nu s-a putut rezolva numele calculatorului"
 
-#: ../libpurple/protocols/simple/simple.c:1694
+#: ../libpurple/protocols/simple/simple.c:1871
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "Numele de identificare SIP nu pot conţine spaţii sau simbolul @"
 
@@ -12366,36 +12566,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1870
+#: ../libpurple/protocols/simple/simple.c:2057
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "Modul de protocol SIP/SIMPLE"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1871
+#: ../libpurple/protocols/simple/simple.c:2058
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "Modulul de protocol SIP/SIMPLE"
 
-#: ../libpurple/protocols/simple/simple.c:1899
+#: ../libpurple/protocols/simple/simple.c:2086
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Publică statusul (atenţie: oricine vă poate vedea)"
 
-#: ../libpurple/protocols/simple/simple.c:1905
+#: ../libpurple/protocols/simple/simple.c:2092
 msgid "Use UDP"
 msgstr "Utilizează UDP"
 
-#: ../libpurple/protocols/simple/simple.c:1907
+#: ../libpurple/protocols/simple/simple.c:2094
 msgid "Use proxy"
 msgstr "Utilizează proxy"
 
-#: ../libpurple/protocols/simple/simple.c:1909
+#: ../libpurple/protocols/simple/simple.c:2096
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../libpurple/protocols/simple/simple.c:1911
+#: ../libpurple/protocols/simple/simple.c:2098
 msgid "Auth User"
 msgstr "Autentificare utilizator"
 
-#: ../libpurple/protocols/simple/simple.c:1913
+#: ../libpurple/protocols/simple/simple.c:2100
 msgid "Auth Domain"
 msgstr "Autentificare domeniu"
 
@@ -12440,7 +12640,6 @@
 msgstr "Atenţionarea lui %s nu este permisă."
 
 #: ../libpurple/protocols/toc/toc.c:503
-#, c-format
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "Un mesaj s-a pierdut, aţi depăşit limita de viteză fixată de server."
 
@@ -12465,47 +12664,38 @@
 msgstr "Aţi pierdut un mesaj de la %s pentru că a fost trimis prea repede."
 
 #: ../libpurple/protocols/toc/toc.c:518
-#, c-format
 msgid "Failure."
 msgstr "Eşec."
 
 #: ../libpurple/protocols/toc/toc.c:521
-#, c-format
 msgid "Too many matches."
 msgstr "Prea multe potriviri."
 
 #: ../libpurple/protocols/toc/toc.c:524
-#, c-format
 msgid "Need more qualifiers."
 msgstr "E nevoie de mai multe atribute."
 
 #: ../libpurple/protocols/toc/toc.c:527
-#, c-format
 msgid "Dir service temporarily unavailable."
 msgstr "Serviciul „Dir” este temporar indisponibil."
 
 #: ../libpurple/protocols/toc/toc.c:530
-#, c-format
 msgid "E-mail lookup restricted."
 msgstr "Căutarea după adresa de mail este restricţionată."
 
 #: ../libpurple/protocols/toc/toc.c:533
-#, c-format
 msgid "Keyword ignored."
 msgstr "Cuvântul-cheie a fost ignorat."
 
 #: ../libpurple/protocols/toc/toc.c:536
-#, c-format
 msgid "No keywords."
 msgstr "Fără cuvinte-cheie."
 
 #: ../libpurple/protocols/toc/toc.c:539
-#, c-format
 msgid "User has no directory information."
 msgstr "Nu există informaţii detaliate în director."
 
 #: ../libpurple/protocols/toc/toc.c:543
-#, c-format
 msgid "Country not supported."
 msgstr "Nu există suport de ţară."
 
@@ -12515,24 +12705,20 @@
 msgstr "Eşec necunoscut: %s."
 
 #: ../libpurple/protocols/toc/toc.c:549
-#, c-format
 msgid "Incorrect screen name or password."
 msgstr "Nume de identificare sau parolă incorecte."
 
 #: ../libpurple/protocols/toc/toc.c:552
-#, c-format
 msgid "The service is temporarily unavailable."
 msgstr "Serviciul este temporar indisponibil."
 
 #: ../libpurple/protocols/toc/toc.c:555
-#, c-format
 msgid "Your warning level is currently too high to log in."
 msgstr ""
 "Nivelul propriu de avertizare este prea ridicat pentru a vă putea "
 "autentifica."
 
 #: ../libpurple/protocols/toc/toc.c:558
-#, c-format
 msgid ""
 "You have been connecting and disconnecting too frequently.  Wait ten minutes "
 "and try again.  If you continue to try, you will need to wait even longer."
@@ -12571,8 +12757,8 @@
 msgid "Password Change Successful"
 msgstr "Parola a fost schimbată cu succes"
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5582
-#: ../pidgin/gtkblist.c:5932
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:6280
+#: ../pidgin/gtkblist.c:6638
 msgid "_Group:"
 msgstr "_Grup:"
 
@@ -12634,25 +12820,25 @@
 msgid "TOC Protocol Plugin"
 msgstr "Modul de protocol TOC"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:782
+#: ../libpurple/protocols/yahoo/yahoo.c:784
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:838
+msgstr "%s v-a trimis o invitaţie de a-i vedea webcam-ul, invitaţie ce nu este încă suportată"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:840
 msgid "Your Yahoo! message did not get sent."
 msgstr "Mesajul dumneavoastră Yahoo! nu a fost trimis."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:960
+#: ../libpurple/protocols/yahoo/yahoo.c:962
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Mesaj sistem Yahoo! de la %s:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1029
+#: ../libpurple/protocols/yahoo/yahoo.c:1031
 msgid "Authorization denied message:"
 msgstr "Mesaj de autorizare refuzată:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1047
+#: ../libpurple/protocols/yahoo/yahoo.c:1049
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -12661,18 +12847,18 @@
 "Utilizatorul %s v-a refuzat retroactiv cererea de a-l adăuga la lista de "
 "contacte, din următorul motiv: %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1050
+#: ../libpurple/protocols/yahoo/yahoo.c:1052
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 "Utilizatorul %s v-a refuzat retroactiv cererea de a-l adăuga la lista de "
 "contacte."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1052
+#: ../libpurple/protocols/yahoo/yahoo.c:1054
 msgid "Add buddy rejected"
 msgstr "Adăugarea contactului a fost refuzată"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1994
+#: ../libpurple/protocols/yahoo/yahoo.c:1996
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -12683,11 +12869,11 @@
 "Probabil nu vă veţi putea autentifica cu succes pe Yahoo!, căutaţi versiuni "
 "mai noi la %s ."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1997
+#: ../libpurple/protocols/yahoo/yahoo.c:1999
 msgid "Failed Yahoo! Authentication"
 msgstr "Autentificarea Yahoo! a eşuat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2063
+#: ../libpurple/protocols/yahoo/yahoo.c:2065
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -12696,52 +12882,52 @@
 "Doriţi să ignoraţi utilizatorul %s, dar e prezent în lista de contacte. "
 "Alegeţi „Da” pentru a-l şterge din listă şi a-l ignora de acum înainte."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2066
+#: ../libpurple/protocols/yahoo/yahoo.c:2068
 msgid "Ignore buddy?"
 msgstr "Ignor contactul?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2129
+#: ../libpurple/protocols/yahoo/yahoo.c:2133
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "Contul vă este blocat, autentificaţi-vă la www.yahoo.com !"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2132
+#: ../libpurple/protocols/yahoo/yahoo.c:2136
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Eroare necunoscută cu numărul %d. Autentificarea la www.yahoo.com ar putea "
 "rezolva această problemă."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2186
+#: ../libpurple/protocols/yahoo/yahoo.c:2189
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Contactul %s nu a putut fi adăugat în grupul %s în lista de pe server pentru "
 "contul %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2189
+#: ../libpurple/protocols/yahoo/yahoo.c:2192
 msgid "Could not add buddy to server list"
 msgstr "Contactul nu a putut fi adăugat în lista de pe server"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2308
+#: ../libpurple/protocols/yahoo/yahoo.c:2311
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audibil %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2651
+#: ../libpurple/protocols/yahoo/yahoo.c:2657
 msgid "Received unexpected HTTP response from server."
 msgstr "S-a primit un răspuns HTTP neaşteptat de la server."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2675
-#: ../libpurple/protocols/yahoo/yahoo.c:2861
-#: ../libpurple/protocols/yahoo/yahoo.c:2964
+#: ../libpurple/protocols/yahoo/yahoo.c:2682
+#: ../libpurple/protocols/yahoo/yahoo.c:2870
 #: ../libpurple/protocols/yahoo/yahoo.c:2974
+#: ../libpurple/protocols/yahoo/yahoo.c:2985
 #: ../libpurple/protocols/yahoo/yahoochat.c:1514
 #: ../libpurple/protocols/yahoo/yahoochat.c:1584
-#: ../libpurple/protocols/yahoo/ycht.c:585
+#: ../libpurple/protocols/yahoo/ycht.c:586
 msgid "Connection problem"
 msgstr "Probleme la conectare"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2701
+#: ../libpurple/protocols/yahoo/yahoo.c:2708
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
@@ -12750,7 +12936,7 @@
 "S-a pierdut conexiunea cu %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2726
+#: ../libpurple/protocols/yahoo/yahoo.c:2733
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
@@ -12759,115 +12945,103 @@
 "Nu s-a putut face o conexiune cu %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3081
-#: ../libpurple/protocols/yahoo/yahoo.c:3767
+#: ../libpurple/protocols/yahoo/yahoo.c:3092
+#: ../libpurple/protocols/yahoo/yahoo.c:3778
 msgid "Not at Home"
 msgstr "Nu acasă"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3083
-#: ../libpurple/protocols/yahoo/yahoo.c:3770
+#: ../libpurple/protocols/yahoo/yahoo.c:3094
+#: ../libpurple/protocols/yahoo/yahoo.c:3781
 msgid "Not at Desk"
 msgstr "Nu la birou"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3085
-#: ../libpurple/protocols/yahoo/yahoo.c:3773
+#: ../libpurple/protocols/yahoo/yahoo.c:3096
+#: ../libpurple/protocols/yahoo/yahoo.c:3784
 msgid "Not in Office"
 msgstr "Nu la serviciu"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3089
-#: ../libpurple/protocols/yahoo/yahoo.c:3779
+#: ../libpurple/protocols/yahoo/yahoo.c:3100
+#: ../libpurple/protocols/yahoo/yahoo.c:3790
 msgid "On Vacation"
 msgstr "În vacanţă"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3093
-#: ../libpurple/protocols/yahoo/yahoo.c:3785
+#: ../libpurple/protocols/yahoo/yahoo.c:3104
+#: ../libpurple/protocols/yahoo/yahoo.c:3796
 msgid "Stepped Out"
 msgstr "Ieşit(ă) afară"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3186
-#: ../libpurple/protocols/yahoo/yahoo.c:3216
+#: ../libpurple/protocols/yahoo/yahoo.c:3197
+#: ../libpurple/protocols/yahoo/yahoo.c:3227
 msgid "Not on server list"
 msgstr "Nu este în lista de pe server"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3233
-#: ../libpurple/protocols/yahoo/yahoo.c:3291
+#: ../libpurple/protocols/yahoo/yahoo.c:3244
+#: ../libpurple/protocols/yahoo/yahoo.c:3302
 msgid "Appear Online"
 msgstr "Apar autentificat(ă)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3236
-#: ../libpurple/protocols/yahoo/yahoo.c:3312
+#: ../libpurple/protocols/yahoo/yahoo.c:3247
+#: ../libpurple/protocols/yahoo/yahoo.c:3323
 msgid "Appear Permanently Offline"
 msgstr "Par totdeauna deconectat(ă)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3254
+#: ../libpurple/protocols/yahoo/yahoo.c:3265
 msgid "Presence"
 msgstr "Prezenţă"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3297
+#: ../libpurple/protocols/yahoo/yahoo.c:3308
 msgid "Appear Offline"
 msgstr "Apar deconectat(ă)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3306
+#: ../libpurple/protocols/yahoo/yahoo.c:3317
 msgid "Don't Appear Permanently Offline"
 msgstr "Nu par totdeauna deconectat(ă)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3354
+#: ../libpurple/protocols/yahoo/yahoo.c:3365
 msgid "Join in Chat"
 msgstr "Intră în chat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3360
+#: ../libpurple/protocols/yahoo/yahoo.c:3371
 msgid "Initiate Conference"
 msgstr "Iniţiază o conferinţă"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3388
+#: ../libpurple/protocols/yahoo/yahoo.c:3399
 msgid "Presence Settings"
 msgstr "Setări prezenţă"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3394
+#: ../libpurple/protocols/yahoo/yahoo.c:3405
 msgid "Start Doodling"
 msgstr "Mâzgălituri"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3495
-#, fuzzy
+#: ../libpurple/protocols/yahoo/yahoo.c:3506
 msgid "Activate which ID?"
 msgstr "Ce identitate doriţi să activaţi?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3506
-msgid "Join whom in chat?"
+#: ../libpurple/protocols/yahoo/yahoo.c:3517
+msgid "Join who in chat?"
 msgstr "Cui doriţi să vă alăturaţi în chat?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3518
+#: ../libpurple/protocols/yahoo/yahoo.c:3529
 msgid "Activate ID..."
 msgstr "Activare identitate..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3522
+#: ../libpurple/protocols/yahoo/yahoo.c:3533
 msgid "Join User in Chat..."
 msgstr "Chat cu un utilizator..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3527
-#, fuzzy
+#: ../libpurple/protocols/yahoo/yahoo.c:3538
 msgid "Open Inbox"
-msgstr "Deschidere mail Hotmail"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4119
-#, fuzzy
-msgid "Buzz"
-msgstr "Alooo!"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4121
-#, c-format
-msgid "Buzzing %s..."
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4136
+msgstr "Deschidere mail"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4147
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt;room&gt;:  Intraţi într-un chat din reţeaua Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4141
+#: ../libpurple/protocols/yahoo/yahoo.c:4152
 msgid "list: List rooms on the Yahoo network"
 msgstr "list:  Listează chat-urile din reţeaua Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4149
+#: ../libpurple/protocols/yahoo/yahoo.c:4160
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle:  Cereţi unui utilizator să iniţie o sesiune de mâzgălituri"
 
@@ -12881,56 +13055,56 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4358
-#: ../libpurple/protocols/yahoo/yahoo.c:4360
+#: ../libpurple/protocols/yahoo/yahoo.c:4369
+#: ../libpurple/protocols/yahoo/yahoo.c:4371
 msgid "Yahoo Protocol Plugin"
 msgstr "Modul de protocol Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4383
+#: ../libpurple/protocols/yahoo/yahoo.c:4394
 msgid "Yahoo Japan"
 msgstr "Yahoo Japonia"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4386
+#: ../libpurple/protocols/yahoo/yahoo.c:4397
 msgid "Pager server"
 msgstr "Server pager"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4389
+#: ../libpurple/protocols/yahoo/yahoo.c:4400
 msgid "Japan Pager server"
 msgstr "Server pager Japonia"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4392
+#: ../libpurple/protocols/yahoo/yahoo.c:4403
 msgid "Pager port"
 msgstr "Port pager"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4395
+#: ../libpurple/protocols/yahoo/yahoo.c:4406
 msgid "File transfer server"
 msgstr "Server transfer de fişiere"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4398
+#: ../libpurple/protocols/yahoo/yahoo.c:4409
 msgid "Japan file transfer server"
 msgstr "Server transfer de fişiere Japonia"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4401
+#: ../libpurple/protocols/yahoo/yahoo.c:4412
 msgid "File transfer port"
 msgstr "Port transfer de fişiere"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4404
+#: ../libpurple/protocols/yahoo/yahoo.c:4415
 msgid "Chat room locale"
 msgstr "Setări locale chat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4407
+#: ../libpurple/protocols/yahoo/yahoo.c:4418
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignoră invitaţiile la conferinţe şi chat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4415
+#: ../libpurple/protocols/yahoo/yahoo.c:4426
 msgid "Chat room list URL"
 msgstr "Adresă listă camere de chat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4418
+#: ../libpurple/protocols/yahoo/yahoo.c:4429
 msgid "Yahoo Chat server"
 msgstr "Server Yahoo Chat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4421
+#: ../libpurple/protocols/yahoo/yahoo.c:4432
 msgid "Yahoo Chat port"
 msgstr "Port Yahoo Chat"
 
@@ -12947,7 +13121,6 @@
 msgid "Unable to establish file descriptor."
 msgstr "Nu se poate evalua descriptorul fişierului."
 
-#. TODO: what to do here - do we really have to disconnect?
 #: ../libpurple/protocols/yahoo/yahoo_packet.c:307
 msgid "Write Error"
 msgstr "Eroare la scriere"
@@ -13120,11 +13293,11 @@
 msgid "User Rooms"
 msgstr "Camere de chat utilizatori"
 
-#: ../libpurple/protocols/yahoo/ycht.c:456
+#: ../libpurple/protocols/yahoo/ycht.c:457
 msgid "Connection problem with the YCHT server."
 msgstr "Probleme de conectare la serverul YCHT."
 
-#: ../libpurple/protocols/yahoo/ycht.c:475
+#: ../libpurple/protocols/yahoo/ycht.c:476
 #, c-format
 msgid ""
 "Lost connection with server\n"
@@ -13297,8 +13470,8 @@
 msgid "Exposure"
 msgstr "Expunere"
 
-#: ../libpurple/proxy.c:459 ../libpurple/proxy.c:894 ../libpurple/proxy.c:1049
-#: ../libpurple/proxy.c:1617
+#: ../libpurple/proxy.c:461 ../libpurple/proxy.c:902 ../libpurple/proxy.c:1061
+#: ../libpurple/proxy.c:1632
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -13307,46 +13480,60 @@
 "Nu s-a putut crea un socket:\n"
 "%s"
 
-#: ../libpurple/proxy.c:659
+#: ../libpurple/proxy.c:662
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s\n"
 msgstr "Nu se poate prelucra răspunsul de la serverul proxy HTTP: %s\n"
 
-#: ../libpurple/proxy.c:698 ../libpurple/proxy.c:744 ../libpurple/proxy.c:780
-#: ../libpurple/proxy.c:792
+#: ../libpurple/proxy.c:702 ../libpurple/proxy.c:750 ../libpurple/proxy.c:786
+#: ../libpurple/proxy.c:798
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Eroare la conectarea la serverul proxy HTTP: %d"
 
-#: ../libpurple/proxy.c:788
+#: ../libpurple/proxy.c:794
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
 msgstr "Acces interzis: serverul proxy nu permite tunelarea portului %d."
 
-#: ../libpurple/proxy.c:1012
+#: ../libpurple/proxy.c:1022
 #, c-format
 msgid "Error resolving %s"
 msgstr "Eroare la rezolvarea %s"
 
-#: ../libpurple/proxy.c:1714
+#: ../libpurple/proxy.c:1730
 msgid "Could not resolve host name"
 msgstr "Nu s-a putut rezolva numele serverului"
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
+#. *
+#. * @since 2.3.0
 #.
-#: ../libpurple/request.h:1378
+#. *
+#. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
+#. *
+#. * @deprecated Please use purple_request_yes_no_with_hint instead.
+#.
+#: ../libpurple/request.h:1802 ../libpurple/request.h:1815
 msgid "_Yes"
 msgstr "_Da"
 
-#: ../libpurple/request.h:1378
+#: ../libpurple/request.h:1802 ../libpurple/request.h:1815
 msgid "_No"
 msgstr "_Nu"
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
+#. *
+#. * @since 2.3.0
 #.
-#: ../libpurple/request.h:1398
+#. *
+#. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
+#. *
+#. * @deprecated Please use purple_request_accept_cancel_with_hint instead.
+#.
+#: ../libpurple/request.h:1854 ../libpurple/request.h:1867
 msgid "_Accept"
 msgstr "_Acceptă"
 
@@ -13369,14 +13556,14 @@
 #: ../libpurple/server.c:302
 #, c-format
 msgid "Requesting %s's attention..."
-msgstr ""
+msgstr "Se cere atenţie din partea contactului %s..."
 
 #: ../libpurple/server.c:347
 #, c-format
 msgid "%s has requested your attention!"
-msgstr ""
-
-#: ../libpurple/server.c:796
+msgstr "%s v-a cerut puţină atenţie!"
+
+#: ../libpurple/server.c:793
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -13385,19 +13572,18 @@
 "%s a invitat utilizatorul %s în camera de chat %s\n"
 "%s"
 
-#: ../libpurple/server.c:801
+#: ../libpurple/server.c:798
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s a invitat utilizatorul %s în camera de chat %s\n"
 
-#: ../libpurple/server.c:805
+#: ../libpurple/server.c:802
 msgid "Accept chat invitation?"
 msgstr "Acceptaţi invitaţia la chat?"
 
 #: ../libpurple/sslconn.c:164
-#, fuzzy
 msgid "SSL Connection Failed"
-msgstr "Conexiunea a eşuat"
+msgstr "Conexiunea SSL a eşuat"
 
 #: ../libpurple/sslconn.c:166
 msgid "SSL Handshake Failed"
@@ -13405,18 +13591,18 @@
 
 #: ../libpurple/sslconn.c:168
 msgid "SSL peer presented an invalid certificate"
-msgstr ""
+msgstr "Partenerul SSL a prezentat un certificat invalid"
 
 #: ../libpurple/sslconn.c:171
-#, fuzzy
 msgid "Unknown SSL error"
-msgstr "Eroare necunoscută"
+msgstr "Eroare SSL necunoscută"
 
 #: ../libpurple/status.c:153
 msgid "Unset"
 msgstr "Nesetat"
 
-#: ../libpurple/status.c:156 ../pidgin/gtkstatusbox.c:1059
+#: ../libpurple/status.c:156 ../pidgin/gtkdocklet.c:553
+#: ../pidgin/gtkstatusbox.c:1059
 msgid "Do not disturb"
 msgstr "Nu deranjaţi"
 
@@ -13428,52 +13614,71 @@
 msgid "Mobile"
 msgstr "Mobil"
 
-#: ../libpurple/status.c:609
+#: ../libpurple/status.c:161
+msgid "Listening to music"
+msgstr "Audiţie muzicală"
+
+#: ../libpurple/status.c:610
 #, c-format
 msgid "%s changed status from %s to %s"
 msgstr "%s şi-a schimbat statusul din %s în %s"
 
-#: ../libpurple/status.c:619
+#: ../libpurple/status.c:613
+#, c-format
+msgid "%s (%s) changed status from %s to %s"
+msgstr "%s (%s) şi-a schimbat statusul din %s în %s"
+
+#: ../libpurple/status.c:624
 #, c-format
 msgid "%s is now %s"
 msgstr "%s este acum %s"
 
-#: ../libpurple/status.c:624
+#: ../libpurple/status.c:626
+#, c-format
+msgid "%s (%s) is now %s"
+msgstr "%s (%s) este acum %s"
+
+#: ../libpurple/status.c:632
 #, c-format
 msgid "%s is no longer %s"
 msgstr "%s nu mai este %s"
 
-#: ../libpurple/status.c:1234
+#: ../libpurple/status.c:634
+#, c-format
+msgid "%s (%s) is no longer %s"
+msgstr "%s (%s) nu mai este %s"
+
+#: ../libpurple/status.c:1247
 #, c-format
 msgid "%s became idle"
 msgstr "%s a intrat în inactivitate"
 
-#: ../libpurple/status.c:1251
+#: ../libpurple/status.c:1264
 #, c-format
 msgid "%s became unidle"
 msgstr "%s a revenit din inactivitate"
 
-#: ../libpurple/status.c:1314
+#: ../libpurple/status.c:1327
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s a intrat în inactivitate"
 
-#: ../libpurple/status.c:1316
+#: ../libpurple/status.c:1329
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s a revenit din inactivitate"
 
-#: ../libpurple/util.c:718
+#: ../libpurple/util.c:721
 #, c-format
 msgid "%x %X"
 msgstr "%x la %X"
 
-#: ../libpurple/util.c:2722
+#: ../libpurple/util.c:2783
 #, c-format
 msgid "Error Reading %s"
 msgstr "Eroare la citirea %s"
 
-#: ../libpurple/util.c:2723
+#: ../libpurple/util.c:2784
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -13482,15 +13687,15 @@
 "A apărut o eroare la citirea fişierului %s. Încărcarea datelor a eşuat şi "
 "vechiul fişier a fost redenumit „%s~”."
 
-#: ../libpurple/util.c:3223
+#: ../libpurple/util.c:3281
 msgid "Calculating..."
 msgstr "Se calculează..."
 
-#: ../libpurple/util.c:3226
+#: ../libpurple/util.c:3284
 msgid "Unknown."
 msgstr "Necunoscut."
 
-#: ../libpurple/util.c:3252
+#: ../libpurple/util.c:3310
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -13498,7 +13703,7 @@
 msgstr[1] "%d secunde"
 msgstr[2] "%d de secunde"
 
-#: ../libpurple/util.c:3264
+#: ../libpurple/util.c:3322
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -13506,7 +13711,7 @@
 msgstr[1] "%d zile"
 msgstr[2] "%d de zile"
 
-#: ../libpurple/util.c:3272
+#: ../libpurple/util.c:3330
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
@@ -13514,7 +13719,7 @@
 msgstr[1] "%s, %d ore"
 msgstr[2] "%s, %d de ore"
 
-#: ../libpurple/util.c:3278
+#: ../libpurple/util.c:3336
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -13522,7 +13727,7 @@
 msgstr[1] "%d ore"
 msgstr[2] "%d de ore"
 
-#: ../libpurple/util.c:3286
+#: ../libpurple/util.c:3344
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
@@ -13530,7 +13735,7 @@
 msgstr[1] "%s, %d minute"
 msgstr[2] "%s, %d de minute"
 
-#: ../libpurple/util.c:3292
+#: ../libpurple/util.c:3350
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -13538,17 +13743,17 @@
 msgstr[1] "%d minute"
 msgstr[2] "%d de minute"
 
-#: ../libpurple/util.c:3552
+#: ../libpurple/util.c:3610
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr "Nu s-a putut deschide %s: prea multe redirectări"
 
-#: ../libpurple/util.c:3589 ../libpurple/util.c:3885
+#: ../libpurple/util.c:3647 ../libpurple/util.c:3943
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Conectarea la %s a eşuat"
 
-#: ../libpurple/util.c:3712
+#: ../libpurple/util.c:3770
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
@@ -13557,17 +13762,17 @@
 "Nu se poate aloca suficientă memorie pentru a păstra datele de la %s. S-ar "
 "putea ca serverul web să încerce ceva rău intenţionat."
 
-#: ../libpurple/util.c:3747
+#: ../libpurple/util.c:3805
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Eroare la citirea din %s: %s"
 
-#: ../libpurple/util.c:3778
+#: ../libpurple/util.c:3836
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Eroare la scrierea %s: %s"
 
-#: ../libpurple/util.c:3803
+#: ../libpurple/util.c:3861
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Nu s-a reuşit conectarea la %s: %s"
@@ -13584,80 +13789,80 @@
 msgid "Send instant messages over multiple protocols"
 msgstr "Trimiteţi mesaje instant prin orice protocol IM"
 
-#: ../pidgin/eggtrayicon.c:129
+#: ../pidgin/eggtrayicon.c:128
 msgid "Orientation"
 msgstr "Orientare"
 
-#: ../pidgin/eggtrayicon.c:130
+#: ../pidgin/eggtrayicon.c:129
 msgid "The orientation of the tray."
 msgstr "Orientare zonă de notificare."
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:407
+#: ../pidgin/gtkaccount.c:410
 msgid "Login Options"
 msgstr "Opţiuni autentificare"
 
-#: ../pidgin/gtkaccount.c:428
+#: ../pidgin/gtkaccount.c:431
 msgid "Pro_tocol:"
 msgstr "Pro_tocol:"
 
-#: ../pidgin/gtkaccount.c:439
+#: ../pidgin/gtkaccount.c:442
 msgid "Screen _name:"
 msgstr "_Nume de identificare:"
 
-#: ../pidgin/gtkaccount.c:529
+#: ../pidgin/gtkaccount.c:532
 msgid "_Local alias:"
 msgstr "_Alias local:"
 
-#: ../pidgin/gtkaccount.c:533
+#: ../pidgin/gtkaccount.c:536
 msgid "Remember pass_word"
 msgstr "_Salvare parolă"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:591
+#: ../pidgin/gtkaccount.c:594
 msgid "User Options"
 msgstr "Opţiuni personale"
 
-#: ../pidgin/gtkaccount.c:604
+#: ../pidgin/gtkaccount.c:607
 msgid "New _mail notifications"
 msgstr "Notificare la _mail nou"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:609
+#: ../pidgin/gtkaccount.c:612
 msgid "Use this buddy _icon for this account:"
 msgstr "Utilizează această _iconiţă pentru acest cont:"
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:731
+#: ../pidgin/gtkaccount.c:734
 #, c-format
 msgid "%s Options"
 msgstr "Opţiuni %s"
 
-#: ../pidgin/gtkaccount.c:936
+#: ../pidgin/gtkaccount.c:939
 msgid "Use GNOME Proxy Settings"
 msgstr "Utilizează setările GNOME"
 
-#: ../pidgin/gtkaccount.c:937
+#: ../pidgin/gtkaccount.c:940
 msgid "Use Global Proxy Settings"
 msgstr "Utilizează setările generice"
 
-#: ../pidgin/gtkaccount.c:943
+#: ../pidgin/gtkaccount.c:946
 msgid "No Proxy"
 msgstr "Fără proxy"
 
-#: ../pidgin/gtkaccount.c:949
+#: ../pidgin/gtkaccount.c:952
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:955
+#: ../pidgin/gtkaccount.c:958
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:961
+#: ../pidgin/gtkaccount.c:964
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1211
+#: ../pidgin/gtkaccount.c:970 ../pidgin/gtkprefs.c:1283
 msgid "Use Environmental Settings"
 msgstr "Utilizează setările de mediu"
 
@@ -13666,73 +13871,72 @@
 #. A) your network is really slow and you have nothing better to do than
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
-#: ../pidgin/gtkaccount.c:1006
+#: ../pidgin/gtkaccount.c:1009
 msgid "If you look real closely"
 msgstr "Dacă vă uitaţi cu atenţie"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:1009
+#: ../pidgin/gtkaccount.c:1012
 msgid "you can see the butterflies mating"
 msgstr "veţi puteţi vedea cum se scurg secundele..."
 
-#: ../pidgin/gtkaccount.c:1030
+#: ../pidgin/gtkaccount.c:1033
 msgid "Proxy Options"
 msgstr "Opţiuni proxy"
 
-#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1205
+#: ../pidgin/gtkaccount.c:1047 ../pidgin/gtkprefs.c:1277
 msgid "Proxy _type:"
 msgstr "_Tip proxy:"
 
-#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1226
+#: ../pidgin/gtkaccount.c:1056 ../pidgin/gtkprefs.c:1298
 msgid "_Host:"
 msgstr "Ser_ver:"
 
-#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1244
+#: ../pidgin/gtkaccount.c:1060 ../pidgin/gtkprefs.c:1316
 msgid "_Port:"
 msgstr "P_ort:"
 
-#: ../pidgin/gtkaccount.c:1065
+#: ../pidgin/gtkaccount.c:1068
 msgid "_Username:"
 msgstr "Nume _utilizator:"
 
-#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1281
+#: ../pidgin/gtkaccount.c:1075 ../pidgin/gtkprefs.c:1353
 msgid "Pa_ssword:"
 msgstr "Pa_rolă:"
 
-#: ../pidgin/gtkaccount.c:1195
-#, fuzzy
+#: ../pidgin/gtkaccount.c:1199
 msgid "Unable to save new account"
-msgstr "Nu se poate crea o nouă conexiune"
-
-#: ../pidgin/gtkaccount.c:1196
+msgstr "Nu se poate salva noul cont"
+
+#: ../pidgin/gtkaccount.c:1200
 msgid "An account already exists with the specified criteria."
-msgstr ""
-
-#: ../pidgin/gtkaccount.c:1473
+msgstr "Există deja un cont cu aceste proprietăţi."
+
+#: ../pidgin/gtkaccount.c:1478
 msgid "Add Account"
 msgstr "Adăugare cont"
 
-#: ../pidgin/gtkaccount.c:1492
+#: ../pidgin/gtkaccount.c:1497
 msgid "_Basic"
 msgstr "S_tandard"
 
-#: ../pidgin/gtkaccount.c:1499
+#: ../pidgin/gtkaccount.c:1504
 msgid "Create this new account on the server"
-msgstr ""
-
-#: ../pidgin/gtkaccount.c:1515
+msgstr "Creează acest nou cont pe server"
+
+#: ../pidgin/gtkaccount.c:1520
 msgid "_Advanced"
 msgstr "_Avansate"
 
-#: ../pidgin/gtkaccount.c:1973 ../pidgin/gtkplugin.c:569
+#: ../pidgin/gtkaccount.c:1978 ../pidgin/gtkplugin.c:595
 msgid "Enabled"
 msgstr "Activat"
 
-#: ../pidgin/gtkaccount.c:2001
+#: ../pidgin/gtkaccount.c:2006
 msgid "Protocol"
 msgstr "Protocol"
 
-#: ../pidgin/gtkaccount.c:2201
+#: ../pidgin/gtkaccount.c:2207
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -13756,105 +13960,135 @@
 "conturi utilizând <b>Conturi->Adăugare/Editare</b> în fereastra listei de "
 "contacte."
 
-#: ../pidgin/gtkblist.c:767
-msgid "Join a Chat"
-msgstr "Intră într-un chat"
-
-#: ../pidgin/gtkblist.c:788
+#: ../pidgin/gtkblist.c:543
+#, c-format
+msgid "You have %d contact named %s. Would you like to merge them?"
+msgid_plural ""
+"You currently have %d contacts named %s. Would you like to merge them?"
+msgstr[0] "Aveţi deja %d contact numit %s. Doriţi să le uniţi?"
+msgstr[1] "Aveţi deja %d contacte numite %s. Doriţi să le uniţi?"
+msgstr[2] "Aveţi deja %d de contacte numite %s. Doriţi să le uniţi?"
+
+#: ../pidgin/gtkblist.c:544
+msgid ""
+"Merging these contacts will cause them to share a single entry on the buddy "
+"list and use a single conversation window. You can separate them again by "
+"choosing 'Expand' from the contact's context menu"
+msgstr ""
+"Unirea acestor contacte le va face să apară ca o singură intrare în lista de contacte şi să folosească o singură fereastră de conversaţie. Le puteţi separa din nou alegând „Desfă” din meniul contextual al contactului."
+
+#: ../pidgin/gtkblist.c:546
+msgid "_Merge"
+msgstr "_Unire"
+
+#: ../pidgin/gtkblist.c:961
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "Introduceţi detaliile chat-ului în care doriţi să intraţi.\n"
 
-#. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:799 ../pidgin/gtkblist.c:5530
-#: ../pidgin/gtkblist.c:5893 ../pidgin/gtkpounce.c:539
-#: ../pidgin/gtkroomlist.c:396
+#: ../pidgin/gtkblist.c:972 ../pidgin/gtkblist.c:6599
+#: ../pidgin/gtkpounce.c:554 ../pidgin/gtkroomlist.c:709
 msgid "_Account:"
 msgstr "C_ont:"
 
-#: ../pidgin/gtkblist.c:1088 ../pidgin/gtkprivacy.c:603
-#: ../pidgin/gtkprivacy.c:617
+#: ../pidgin/gtkblist.c:1261 ../pidgin/gtkprivacy.c:605
+#: ../pidgin/gtkprivacy.c:619
 msgid "_Block"
 msgstr "_Blochează"
 
-#: ../pidgin/gtkblist.c:1088
+#: ../pidgin/gtkblist.c:1261
 msgid "Un_block"
 msgstr "De_blochează"
 
-#: ../pidgin/gtkblist.c:1139
+#: ../pidgin/gtkblist.c:1304
+msgid "Move to"
+msgstr "Mută în"
+
+#: ../pidgin/gtkblist.c:1344
 msgid "Get _Info"
 msgstr "_Detalii"
 
-#: ../pidgin/gtkblist.c:1142 ../pidgin/pidginstock.c:90
+#: ../pidgin/gtkblist.c:1347 ../pidgin/pidginstock.c:90
 msgid "I_M"
 msgstr "_Mesaj"
 
-#: ../pidgin/gtkblist.c:1148
-#, fuzzy
-msgid "_Send File"
-msgstr "Trimitere fişier"
-
-#: ../pidgin/gtkblist.c:1155
-msgid "Add Buddy _Pounce"
-msgstr "Adaugă î_ntâmpinare"
-
-#: ../pidgin/gtkblist.c:1160 ../pidgin/gtkblist.c:1164
-#: ../pidgin/gtkblist.c:1269 ../pidgin/gtkblist.c:1292
+#: ../pidgin/gtkblist.c:1353
+msgid "_Send File..."
+msgstr "_Trimitere fişier..."
+
+#: ../pidgin/gtkblist.c:1360
+msgid "Add Buddy _Pounce..."
+msgstr "Adăugare întâm_pinare..."
+
+#: ../pidgin/gtkblist.c:1365 ../pidgin/gtkblist.c:1369
+#: ../pidgin/gtkblist.c:1484 ../pidgin/gtkblist.c:1507
 msgid "View _Log"
 msgstr "Arată în_registrările"
 
-#: ../pidgin/gtkblist.c:1177 ../pidgin/gtkblist.c:1186
-#: ../pidgin/gtkblist.c:1277 ../pidgin/gtkblist.c:1298
+#: ../pidgin/gtkblist.c:1375
+msgid "Hide when offline"
+msgstr "Ascunde la deconectare"
+
+#: ../pidgin/gtkblist.c:1375
+msgid "Show when offline"
+msgstr "Arată la deconectare"
+
+#: ../pidgin/gtkblist.c:1389 ../pidgin/gtkblist.c:1398
+#: ../pidgin/gtkblist.c:1492 ../pidgin/gtkblist.c:1513
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: ../pidgin/gtkblist.c:1180 ../pidgin/gtkblist.c:1188
-#: ../pidgin/gtkblist.c:1279 ../pidgin/gtkblist.c:1300
+#: ../pidgin/gtkblist.c:1392 ../pidgin/gtkblist.c:1400
+#: ../pidgin/gtkblist.c:1494 ../pidgin/gtkblist.c:1515
 msgid "_Remove"
 msgstr "Şter_ge"
 
-#: ../pidgin/gtkblist.c:1238
-msgid "Add a _Buddy"
-msgstr "_Adăugare contact"
-
-#: ../pidgin/gtkblist.c:1241
-msgid "Add a C_hat"
-msgstr "Adăugare c_hat"
-
-#: ../pidgin/gtkblist.c:1244
+#: ../pidgin/gtkblist.c:1450
+msgid "Add _Buddy..."
+msgstr "Adaugă _contact..."
+
+#: ../pidgin/gtkblist.c:1453
+msgid "Add C_hat..."
+msgstr "Adaugă un c_hat..."
+
+#: ../pidgin/gtkblist.c:1456
 msgid "_Delete Group"
 msgstr "Şter_gere grup"
 
-#: ../pidgin/gtkblist.c:1246
+#: ../pidgin/gtkblist.c:1458
 msgid "_Rename"
 msgstr "_Redenumire"
 
 #. join button
-#: ../pidgin/gtkblist.c:1265 ../pidgin/gtkroomlist.c:307
-#: ../pidgin/gtkroomlist.c:460 ../pidgin/pidginstock.c:88
+#: ../pidgin/gtkblist.c:1478 ../pidgin/gtkroomlist.c:316
+#: ../pidgin/gtkroomlist.c:773 ../pidgin/pidginstock.c:88
 msgid "_Join"
 msgstr "_Intră"
 
-#: ../pidgin/gtkblist.c:1267
+#: ../pidgin/gtkblist.c:1480
 msgid "Auto-Join"
 msgstr "Intră automat"
 
-#: ../pidgin/gtkblist.c:1305 ../pidgin/gtkblist.c:1329
+#: ../pidgin/gtkblist.c:1482
+msgid "Persistent"
+msgstr "Persistent"
+
+#: ../pidgin/gtkblist.c:1520 ../pidgin/gtkblist.c:1543
 msgid "_Collapse"
 msgstr "_Strânge"
 
-#: ../pidgin/gtkblist.c:1334
+#: ../pidgin/gtkblist.c:1548
 msgid "_Expand"
 msgstr "Des_fă"
 
-#: ../pidgin/gtkblist.c:1585 ../pidgin/gtkblist.c:1597
-#: ../pidgin/gtkblist.c:4603 ../pidgin/gtkblist.c:4616
+#: ../pidgin/gtkblist.c:1799 ../pidgin/gtkblist.c:1811
+#: ../pidgin/gtkblist.c:5264 ../pidgin/gtkblist.c:5277
 msgid "/Tools/Mute Sounds"
 msgstr "/Unelte/Fără sunete"
 
-#: ../pidgin/gtkblist.c:2057 ../pidgin/gtkconv.c:4840
-#: ../pidgin/gtkpounce.c:430
+#: ../pidgin/gtkblist.c:2271 ../pidgin/gtkconv.c:4922
+#: ../pidgin/gtkpounce.c:437
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
@@ -13862,145 +14096,138 @@
 "adăuga acel contact."
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2869
+#: ../pidgin/gtkblist.c:3103
 msgid "/_Buddies"
 msgstr "/Contact_e"
 
-#: ../pidgin/gtkblist.c:2870
+#: ../pidgin/gtkblist.c:3104
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Contacte/Trimite un nou _mesaj..."
 
-#: ../pidgin/gtkblist.c:2871
+#: ../pidgin/gtkblist.c:3105
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Contacte/Intră într-un _chat..."
 
-#: ../pidgin/gtkblist.c:2872
+#: ../pidgin/gtkblist.c:3106
 msgid "/Buddies/Get User _Info..."
 msgstr "/Contacte/Caută deta_lii..."
 
-#: ../pidgin/gtkblist.c:2873
+#: ../pidgin/gtkblist.c:3107
 msgid "/Buddies/View User _Log..."
 msgstr "/Contacte/Caută în în_registrări..."
 
-#: ../pidgin/gtkblist.c:2875
-#, fuzzy
-msgid "/Buddies/Show"
-msgstr "/Contact_e"
-
-#: ../pidgin/gtkblist.c:2876
-#, fuzzy
+#: ../pidgin/gtkblist.c:3109
+msgid "/Buddies/Sh_ow"
+msgstr "/Contacte/Ara_tă"
+
+#: ../pidgin/gtkblist.c:3110
 msgid "/Buddies/Show/_Offline Buddies"
-msgstr "/Contacte/Arată contactele dec_onectate"
-
-#: ../pidgin/gtkblist.c:2877
-#, fuzzy
+msgstr "/Contacte/Arată/Contactele dec_onectate"
+
+#: ../pidgin/gtkblist.c:3111
 msgid "/Buddies/Show/_Empty Groups"
-msgstr "/Contacte/Arată grupurile _fără contacte"
-
-#: ../pidgin/gtkblist.c:2878
-#, fuzzy
+msgstr "/Contacte/Arată/Grupurile _fără contacte"
+
+#: ../pidgin/gtkblist.c:3112
 msgid "/Buddies/Show/Buddy _Details"
-msgstr "/Contacte/Arată _detaliile contactelor"
-
-#: ../pidgin/gtkblist.c:2879
-#, fuzzy
+msgstr "/Contacte/Arată/_Detaliile contactelor"
+
+#: ../pidgin/gtkblist.c:3113
 msgid "/Buddies/Show/Idle _Times"
-msgstr "/Contacte/Arată inac_tivitatea contactelor"
-
-#: ../pidgin/gtkblist.c:2880
-#, fuzzy
+msgstr "/Contacte/Arată/Inac_tivitatea contactelor"
+
+#: ../pidgin/gtkblist.c:3114
 msgid "/Buddies/Show/_Protocol Icons"
-msgstr "/Contacte/Arată grupurile _fără contacte"
-
-#: ../pidgin/gtkblist.c:2881
+msgstr "/Contacte/Arată/Iconiţele de _protocol"
+
+#: ../pidgin/gtkblist.c:3115
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Contacte/_Sortează contactele"
 
-#: ../pidgin/gtkblist.c:2883
+#: ../pidgin/gtkblist.c:3117
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Contacte/_Adaugă un contact..."
 
-#: ../pidgin/gtkblist.c:2884
+#: ../pidgin/gtkblist.c:3118
 msgid "/Buddies/Add C_hat..."
 msgstr "/Contacte/Adaugă un c_hat..."
 
-#: ../pidgin/gtkblist.c:2885
+#: ../pidgin/gtkblist.c:3119
 msgid "/Buddies/Add _Group..."
 msgstr "/Contacte/Adaugă un _grup..."
 
-#: ../pidgin/gtkblist.c:2887
+#: ../pidgin/gtkblist.c:3121
 msgid "/Buddies/_Quit"
 msgstr "/Contacte/_Ieşire"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2890
+#: ../pidgin/gtkblist.c:3124
 msgid "/_Accounts"
 msgstr "/_Conturi"
 
-#: ../pidgin/gtkblist.c:2891 ../pidgin/gtkblist.c:6589
-msgid "/Accounts/Add\\/Edit"
-msgstr "/Conturi/Adăugare\\/Editare"
+#: ../pidgin/gtkblist.c:3125 ../pidgin/gtkblist.c:7301
+msgid "/Accounts/Manage"
+msgstr "/Conturi/Administrare"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2894
+#: ../pidgin/gtkblist.c:3128
 msgid "/_Tools"
 msgstr "/Unel_te"
 
-#: ../pidgin/gtkblist.c:2895
+#: ../pidgin/gtkblist.c:3129
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Unelte/Î_ntâmpinări contacte"
 
-#: ../pidgin/gtkblist.c:2896
-#, fuzzy
+#: ../pidgin/gtkblist.c:3130
 msgid "/Tools/_Certificates"
-msgstr "/Unelte/_Preferinţe"
-
-#: ../pidgin/gtkblist.c:2897
+msgstr "/Unelte/_Certificate"
+
+#: ../pidgin/gtkblist.c:3131
 msgid "/Tools/Plu_gins"
 msgstr "/Unelte/_Module"
 
-#: ../pidgin/gtkblist.c:2898
+#: ../pidgin/gtkblist.c:3132
 msgid "/Tools/Pr_eferences"
 msgstr "/Unelte/_Preferinţe"
 
-#: ../pidgin/gtkblist.c:2899
+#: ../pidgin/gtkblist.c:3133
 msgid "/Tools/Pr_ivacy"
 msgstr "/Unelte/S_ecuritate"
 
-#: ../pidgin/gtkblist.c:2901
+#: ../pidgin/gtkblist.c:3135
 msgid "/Tools/_File Transfers"
 msgstr "/Unelte/_Transfer de fişiere"
 
-#: ../pidgin/gtkblist.c:2902
+#: ../pidgin/gtkblist.c:3136
 msgid "/Tools/R_oom List"
 msgstr "/Unelte/_Listă camere de chat"
 
-#: ../pidgin/gtkblist.c:2903
+#: ../pidgin/gtkblist.c:3137
 msgid "/Tools/System _Log"
 msgstr "/Unelte/În_registrări de sistem"
 
-#: ../pidgin/gtkblist.c:2905
+#: ../pidgin/gtkblist.c:3139
 msgid "/Tools/Mute _Sounds"
 msgstr "/Unelte/Fără _sunete"
 
 #. Help
-#: ../pidgin/gtkblist.c:2907
+#: ../pidgin/gtkblist.c:3141
 msgid "/_Help"
 msgstr "/_Ajutor"
 
-#: ../pidgin/gtkblist.c:2908
+#: ../pidgin/gtkblist.c:3142
 msgid "/Help/Online _Help"
 msgstr "/Ajutor/Ajutor _online"
 
-#: ../pidgin/gtkblist.c:2909
+#: ../pidgin/gtkblist.c:3143
 msgid "/Help/_Debug Window"
 msgstr "/Ajutor/_Fereastră de depanare"
 
-#: ../pidgin/gtkblist.c:2911 ../pidgin/gtkblist.c:2913
+#: ../pidgin/gtkblist.c:3145 ../pidgin/gtkblist.c:3147
 msgid "/Help/_About"
 msgstr "/Ajutor/_Despre"
 
-#: ../pidgin/gtkblist.c:2942
+#: ../pidgin/gtkblist.c:3176
 #, c-format
 msgid ""
 "\n"
@@ -14009,78 +14236,79 @@
 "\n"
 "<b>Cont:</b> %s"
 
-#: ../pidgin/gtkblist.c:3020
+#: ../pidgin/gtkblist.c:3254
 msgid "Buddy Alias"
 msgstr "Alias contact"
 
-#: ../pidgin/gtkblist.c:3049
+#: ../pidgin/gtkblist.c:3283
 msgid "Logged In"
 msgstr "Autentificat(ă)"
 
-#: ../pidgin/gtkblist.c:3095
+#: ../pidgin/gtkblist.c:3329
 msgid "Last Seen"
 msgstr "Ultima apariţie"
 
-#: ../pidgin/gtkblist.c:3116
+#: ../pidgin/gtkblist.c:3350
 msgid "Spooky"
 msgstr "Fantomatic"
 
-#: ../pidgin/gtkblist.c:3118
+#: ../pidgin/gtkblist.c:3352
 msgid "Awesome"
 msgstr "Genial"
 
-#: ../pidgin/gtkblist.c:3120
+#: ../pidgin/gtkblist.c:3354
 msgid "Rockin'"
 msgstr "Beton"
 
-#: ../pidgin/gtkblist.c:3453
+#: ../pidgin/gtkblist.c:3693
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "Inactiv(ă) de: %dd %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3455
+#: ../pidgin/gtkblist.c:3695
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Inactiv(ă) de: %do %02dm"
 
-#: ../pidgin/gtkblist.c:3457
+#: ../pidgin/gtkblist.c:3697
 #, c-format
 msgid "Idle %dm"
 msgstr "Inactiv(ă) de: %dm"
 
-#: ../pidgin/gtkblist.c:3602
+#: ../pidgin/gtkblist.c:3851
 msgid "/Buddies/New Instant Message..."
 msgstr "/Contacte/Trimite un nou mesaj..."
 
-#: ../pidgin/gtkblist.c:3603 ../pidgin/gtkblist.c:3636
+#: ../pidgin/gtkblist.c:3852 ../pidgin/gtkblist.c:3885
 msgid "/Buddies/Join a Chat..."
 msgstr "/Contacte/Intră într-un chat..."
 
-#: ../pidgin/gtkblist.c:3604
+#: ../pidgin/gtkblist.c:3853
 msgid "/Buddies/Get User Info..."
 msgstr "/Contacte/Caută detalii..."
 
-#: ../pidgin/gtkblist.c:3605
+#: ../pidgin/gtkblist.c:3854
 msgid "/Buddies/Add Buddy..."
 msgstr "/Contacte/Adaugă un contact..."
 
-#: ../pidgin/gtkblist.c:3606 ../pidgin/gtkblist.c:3639
+#: ../pidgin/gtkblist.c:3855 ../pidgin/gtkblist.c:3888
 msgid "/Buddies/Add Chat..."
 msgstr "/Contacte/Adaugă un chat..."
 
-#: ../pidgin/gtkblist.c:3607
+#: ../pidgin/gtkblist.c:3856
 msgid "/Buddies/Add Group..."
 msgstr "/Contacte/Adaugă un grup..."
 
-#: ../pidgin/gtkblist.c:3642
+#: ../pidgin/gtkblist.c:3891
 msgid "/Tools/Privacy"
 msgstr "/Unelte/Securitate"
 
-#: ../pidgin/gtkblist.c:3645
+#: ../pidgin/gtkblist.c:3894
 msgid "/Tools/Room List"
 msgstr "/Unelte/Listă camere de chat"
 
-#: ../pidgin/gtkblist.c:3742 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:4026 ../pidgin/gtkdocklet.c:155
+#: ../pidgin/gtkdocklet.c:160
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
@@ -14088,93 +14316,106 @@
 msgstr[1] "%d mesaje necitite de la %s\n"
 msgstr[2] "%d de mesaje necitite de la %s\n"
 
-#: ../pidgin/gtkblist.c:3822
+#: ../pidgin/gtkblist.c:4189
 msgid "Manually"
-msgstr "Manual"
-
-#: ../pidgin/gtkblist.c:3824
-msgid "Alphabetically"
-msgstr "Alfabetic"
-
-#: ../pidgin/gtkblist.c:3825
+msgstr "Manuală"
+
+#: ../pidgin/gtkblist.c:4192
 msgid "By status"
 msgstr "După status"
 
-#: ../pidgin/gtkblist.c:3826
+#: ../pidgin/gtkblist.c:4193
 msgid "By log size"
 msgstr "După mărimea înregistrărilor"
 
-#: ../pidgin/gtkblist.c:4031 ../pidgin/gtkconn.c:179
+#: ../pidgin/gtkblist.c:4492
 #, c-format
 msgid "%s disconnected"
 msgstr "%s s-a deconectat"
 
-#: ../pidgin/gtkblist.c:4067
-#, c-format
-msgid "<span color=\"red\">%s disconnected: %s</span>"
-msgstr "<span color=\"red\">%s a fost deconectat(ă): %s</span>"
-
-#: ../pidgin/gtkblist.c:4219
+#: ../pidgin/gtkblist.c:4494
+#, c-format
+msgid "%s disabled"
+msgstr "%s dezactivat(ă)"
+
+#: ../pidgin/gtkblist.c:4498
+msgid "Reconnect"
+msgstr "Reconectare"
+
+#: ../pidgin/gtkblist.c:4498 ../pidgin/gtkblist.c:4606
+msgid "Re-enable"
+msgstr "Reactivare"
+
+#: ../pidgin/gtkblist.c:4502 ../pidgin/gtkblist.c:4609
+#: ../pidgin/gtkconv.c:1679
+msgid "Ignore"
+msgstr "Ignoră"
+
+#: ../pidgin/gtkblist.c:4633
+#, c-format
+msgid "%d account was disabled because you signed on from another location."
+msgid_plural ""
+"%d accounts were disabled because you signed on from another location."
+msgstr[0] "Un cont v-a fost dezactivat pentru că v-aţi autentificat de la o altă locaţie."
+msgstr[1] "%d conturi v-au fost dezactivate pentru că v-aţi autentificat de la o altă locaţie."
+msgstr[2] "%d de conturi v-au fost dezactivate pentru că v-aţi autentificat de la o altă locaţie."
+
+#: ../pidgin/gtkblist.c:4870
 msgid "<b>Username:</b>"
 msgstr "<b>Nume utilizator:</b>"
 
-#: ../pidgin/gtkblist.c:4226
+#: ../pidgin/gtkblist.c:4877
 msgid "<b>Password:</b>"
 msgstr "<b>Parolă:</b>"
 
-#: ../pidgin/gtkblist.c:4237
+#: ../pidgin/gtkblist.c:4888
 msgid "_Login"
 msgstr "_Autentificare"
 
-#: ../pidgin/gtkblist.c:4320
+#: ../pidgin/gtkblist.c:4973
 msgid "/Accounts"
 msgstr "/Conturi"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4334
-#, fuzzy, c-format
+#: ../pidgin/gtkblist.c:4987
+#, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
 "\n"
 "You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
-"b> window at <b>Accounts->Add/Edit</b>. Once you enable accounts, you'll be "
+"b> window at <b>Accounts->Manage</b>. Once you enable accounts, you'll be "
 "able to sign on, set your status, and talk to your friends."
 msgstr ""
 "<span weight='bold' size='larger'>Bun venit în %s!</span>\n"
 "\n"
 "Nu aveţi nici un cont activ. Activaţi-vă conturile de mesagerie instant în "
-"fereastra <b>Conturi</b>, accesibilă pe calea <b>Conturi->Adăugare/Editare</"
-"b>. Abia după activare veţi putea utiliza conturile definite."
+"fereastra <b>Conturi</b>, accesibilă pe calea <b>Conturi->Administrare</b>. "
+"Abia după activare veţi putea utiliza conturile definite."
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4597
-#, fuzzy
+#: ../pidgin/gtkblist.c:5258
 msgid "/Buddies/Show/Offline Buddies"
-msgstr "/Contacte/Arată contactele deconectate"
-
-#: ../pidgin/gtkblist.c:4600
-#, fuzzy
+msgstr "/Contacte/Arată/Contactele deconectate"
+
+#: ../pidgin/gtkblist.c:5261
 msgid "/Buddies/Show/Empty Groups"
-msgstr "/Contacte/Arată grupurile fără contacte"
-
-#: ../pidgin/gtkblist.c:4606
-#, fuzzy
+msgstr "/Contacte/Arată/Grupurile fără contacte"
+
+#: ../pidgin/gtkblist.c:5267
 msgid "/Buddies/Show/Buddy Details"
-msgstr "/Contacte/Arată detaliile contactelor"
-
-#: ../pidgin/gtkblist.c:4609
-#, fuzzy
+msgstr "/Contacte/Arată/Detaliile contactelor"
+
+#: ../pidgin/gtkblist.c:5270
 msgid "/Buddies/Show/Idle Times"
-msgstr "/Contacte/Arată inactivitatea contactelor"
-
-#: ../pidgin/gtkblist.c:4612
-#, fuzzy
+msgstr "/Contacte/Arată/Inactivitatea contactelor"
+
+#: ../pidgin/gtkblist.c:5273
 msgid "/Buddies/Show/Protocol Icons"
-msgstr "/Contacte/Arată grupurile fără contacte"
-
-#: ../pidgin/gtkblist.c:5507
+msgstr "/Contacte/Arată/Iconiţele de protocol"
+
+#: ../pidgin/gtkblist.c:6205
 msgid ""
 "Please enter the screen name of the person you would like to add to your "
 "buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
@@ -14184,20 +14425,25 @@
 "în lista de contacte. Puteţi opţional introduce un alias ori un pseudonim. "
 "Aliasul va fi afişat în locul numelui original de câte ori este posibil.\n"
 
+#. Set up stuff for the account box
+#: ../pidgin/gtkblist.c:6228
+msgid "A_ccount:"
+msgstr "_Cont:"
+
 #. End of account box
-#: ../pidgin/gtkblist.c:5542
+#: ../pidgin/gtkblist.c:6240
 msgid "_Screen name:"
 msgstr "Nume de _identificare:"
 
-#: ../pidgin/gtkblist.c:5564 ../pidgin/gtkblist.c:5914
+#: ../pidgin/gtkblist.c:6262 ../pidgin/gtkblist.c:6620
 msgid "A_lias:"
 msgstr "A_lias:"
 
-#: ../pidgin/gtkblist.c:5826
+#: ../pidgin/gtkblist.c:6530
 msgid "This protocol does not support chat rooms."
 msgstr "Acest protocol nu suportă camere de chat."
 
-#: ../pidgin/gtkblist.c:5842
+#: ../pidgin/gtkblist.c:6546
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -14205,7 +14451,7 @@
 "Nu sunteţi autentificat(ă) cu vreun protocol prin care să puteţi iniţia un "
 "chat."
 
-#: ../pidgin/gtkblist.c:5883
+#: ../pidgin/gtkblist.c:6589
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -14213,82 +14459,76 @@
 "Introduceţi un alias şi informaţiile necesare pentru acel chat pe care "
 "doriţi să-l adăugaţi în lista de contacte.\n"
 
-#: ../pidgin/gtkblist.c:5964
+#: ../pidgin/gtkblist.c:6648
+msgid "Autojoin when account becomes online."
+msgstr "Intră automat când contul e online."
+
+#: ../pidgin/gtkblist.c:6649
+msgid "Hide chat when the window is closed."
+msgstr "Ascunde acest chat când fereastra e închisă."
+
+#: ../pidgin/gtkblist.c:6675
 msgid "Please enter the name of the group to be added."
 msgstr "Introduceţi numele grupului de adăugat."
 
-#: ../pidgin/gtkblist.c:6609
+#: ../pidgin/gtkblist.c:7321
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Conturi/"
 
-#: ../pidgin/gtkblist.c:6633
+#: ../pidgin/gtkblist.c:7345
 msgid "_Edit Account"
 msgstr "_Editare cont"
 
-#: ../pidgin/gtkblist.c:6646 ../pidgin/gtkconv.c:3073
+#: ../pidgin/gtkblist.c:7358 ../pidgin/gtkconv.c:3146
 msgid "No actions available"
 msgstr "Nici o acţiune nu e disponibilă"
 
-#: ../pidgin/gtkblist.c:6654
+#: ../pidgin/gtkblist.c:7366
 msgid "_Disable"
 msgstr "_Dezactivare"
 
-#: ../pidgin/gtkblist.c:6666
+#: ../pidgin/gtkblist.c:7378
 msgid "Enable Account"
 msgstr "Activare cont"
 
-#: ../pidgin/gtkblist.c:6672
+#: ../pidgin/gtkblist.c:7384
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Conturi/Activare cont"
 
-#: ../pidgin/gtkblist.c:6721
+#: ../pidgin/gtkblist.c:7433
 msgid "/Tools"
 msgstr "/Unelte"
 
-#: ../pidgin/gtkblist.c:6791
+#: ../pidgin/gtkblist.c:7503
 msgid "/Buddies/Sort Buddies"
 msgstr "/Contacte/Sortează contactele"
 
 #. Widget creation function
-#: ../pidgin/gtkcertmgr.c:530
-#, fuzzy
+#: ../pidgin/gtkcertmgr.c:531
 msgid "SSL Servers"
-msgstr "Server"
-
-#: ../pidgin/gtkconn.c:180
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"%s will not attempt to reconnect the account until you correct the error and "
-"re-enable the account."
-msgstr ""
-"%s\n"
-"\n"
-"Pentru a reîncerca reconectarea cu acest cont în %s trebuie să corectaţi "
-"eroarea şi să reactivaţi contul."
-
-#: ../pidgin/gtkconv.c:482
+msgstr "Servere SSL"
+
+#: ../pidgin/gtkconv.c:524
 msgid "Unknown command."
 msgstr "Comandă necunoscută."
 
-#: ../pidgin/gtkconv.c:754 ../pidgin/gtkconv.c:780
+#: ../pidgin/gtkconv.c:796 ../pidgin/gtkconv.c:822
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Contactul nu este în acelaşi protocol cu acest chat."
 
-#: ../pidgin/gtkconv.c:774
+#: ../pidgin/gtkconv.c:816
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
 "Nu sunteţi autentificat(ă) cu nici un protocol prin care care să puteţi "
 "invita acel contact."
 
-#: ../pidgin/gtkconv.c:827
+#: ../pidgin/gtkconv.c:869
 msgid "Invite Buddy Into Chat Room"
 msgstr "Invită contactul în camera de chat"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:857
+#: ../pidgin/gtkconv.c:899
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -14296,188 +14536,179 @@
 "Introduceţi numele utilizatorului pe care doriţi să-l invitaţi. Puteţi "
 "adăuga un mesaj de invitare opţional."
 
-#: ../pidgin/gtkconv.c:878
+#: ../pidgin/gtkconv.c:920
 msgid "_Buddy:"
 msgstr "_Contact:"
 
-#: ../pidgin/gtkconv.c:889 ../pidgin/gtksavedstatuses.c:1194
-#: ../pidgin/gtksavedstatuses.c:1528
+#: ../pidgin/gtkconv.c:931 ../pidgin/gtksavedstatuses.c:1200
+#: ../pidgin/gtksavedstatuses.c:1536
 msgid "_Message:"
 msgstr "_Mesaj:"
 
-#: ../pidgin/gtkconv.c:947 ../pidgin/gtkconv.c:2598 ../pidgin/gtkdebug.c:219
-#: ../pidgin/gtkft.c:543
-msgid "Unable to open file."
-msgstr "Nu se poate deschide fişierul."
-
-#: ../pidgin/gtkconv.c:953
+#: ../pidgin/gtkconv.c:995
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Discuţie cu %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:991
+#: ../pidgin/gtkconv.c:1033
 msgid "Save Conversation"
 msgstr "Salvează discuţia"
 
-#: ../pidgin/gtkconv.c:1140 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:743
+#: ../pidgin/gtkconv.c:1179 ../pidgin/gtkdebug.c:168 ../pidgin/gtkdebug.c:748
 msgid "Find"
 msgstr "Caută"
 
-#: ../pidgin/gtkconv.c:1166 ../pidgin/gtkdebug.c:195
+#: ../pidgin/gtkconv.c:1205 ../pidgin/gtkdebug.c:196
 msgid "_Search for:"
 msgstr "Cau_tă:"
 
-#: ../pidgin/gtkconv.c:1622
+#: ../pidgin/gtkconv.c:1676
 msgid "Un-Ignore"
 msgstr "Nu ignora"
 
-#: ../pidgin/gtkconv.c:1625
-msgid "Ignore"
-msgstr "Ignoră"
-
-#: ../pidgin/gtkconv.c:1645
+#: ../pidgin/gtkconv.c:1699
 msgid "Get Away Message"
 msgstr "Obţine mesajul în absenţă"
 
-#: ../pidgin/gtkconv.c:1668
+#: ../pidgin/gtkconv.c:1722
 msgid "Last said"
 msgstr "Ultima replică"
 
-#: ../pidgin/gtkconv.c:2606
+#: ../pidgin/gtkconv.c:2671
 msgid "Unable to save icon file to disk."
 msgstr "Nu se poate salva pe disc avatarul."
 
-#: ../pidgin/gtkconv.c:2657
+#: ../pidgin/gtkconv.c:2722
 msgid "Save Icon"
 msgstr "Salvare avatar"
 
-#: ../pidgin/gtkconv.c:2709
+#: ../pidgin/gtkconv.c:2774
 msgid "Animate"
 msgstr "Animare"
 
-#: ../pidgin/gtkconv.c:2714
+#: ../pidgin/gtkconv.c:2779
 msgid "Hide Icon"
 msgstr "Ascundere avatar"
 
-#: ../pidgin/gtkconv.c:2717
+#: ../pidgin/gtkconv.c:2782
 msgid "Save Icon As..."
 msgstr "Salvare avatar ca..."
 
-#: ../pidgin/gtkconv.c:2721
+#: ../pidgin/gtkconv.c:2786
 msgid "Set Custom Icon..."
 msgstr "Iconiţă personalizată..."
 
-#: ../pidgin/gtkconv.c:2734
+#: ../pidgin/gtkconv.c:2799
 msgid "Remove Custom Icon"
 msgstr "Iconiţă implicită"
 
-#: ../pidgin/gtkconv.c:2861
+#: ../pidgin/gtkconv.c:2931
 msgid "Show All"
-msgstr ""
+msgstr "Arată tot"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2880
+#: ../pidgin/gtkconv.c:2950
 msgid "/_Conversation"
 msgstr "/_Discuţie"
 
-#: ../pidgin/gtkconv.c:2882
+#: ../pidgin/gtkconv.c:2952
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Discuţie/_Mesaj nou..."
 
-#: ../pidgin/gtkconv.c:2887
+#: ../pidgin/gtkconv.c:2957
 msgid "/Conversation/_Find..."
 msgstr "/Discuţie/C_aută..."
 
-#: ../pidgin/gtkconv.c:2889
+#: ../pidgin/gtkconv.c:2959
 msgid "/Conversation/View _Log"
 msgstr "/Discuţie/Arată în_registrările"
 
-#: ../pidgin/gtkconv.c:2890
+#: ../pidgin/gtkconv.c:2960
 msgid "/Conversation/_Save As..."
 msgstr "/Discuţie/_Salvează ca..."
 
-#: ../pidgin/gtkconv.c:2892
+#: ../pidgin/gtkconv.c:2962
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Discuţie/G_oleşte fereastra"
 
-#: ../pidgin/gtkconv.c:2896
+#: ../pidgin/gtkconv.c:2966
 msgid "/Conversation/Se_nd File..."
 msgstr "/Discuţie/_Trimite un fişier..."
 
-#: ../pidgin/gtkconv.c:2897
+#: ../pidgin/gtkconv.c:2967
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Discuţie/Adaugă î_ntâmpinare..."
 
-#: ../pidgin/gtkconv.c:2899
+#: ../pidgin/gtkconv.c:2969
 msgid "/Conversation/_Get Info"
 msgstr "/Discuţie/D_etalii"
 
-#: ../pidgin/gtkconv.c:2901
+#: ../pidgin/gtkconv.c:2971
 msgid "/Conversation/In_vite..."
 msgstr "/Discuţie/_Invită..."
 
-#: ../pidgin/gtkconv.c:2903
+#: ../pidgin/gtkconv.c:2973
 msgid "/Conversation/M_ore"
 msgstr "/Discuţie/Mai m_ult"
 
-#: ../pidgin/gtkconv.c:2907
+#: ../pidgin/gtkconv.c:2977
 msgid "/Conversation/Al_ias..."
 msgstr "/Discuţie/Al_ias..."
 
-#: ../pidgin/gtkconv.c:2909
+#: ../pidgin/gtkconv.c:2979
 msgid "/Conversation/_Block..."
 msgstr "/Discuţie/_Blochează..."
 
-#: ../pidgin/gtkconv.c:2911
+#: ../pidgin/gtkconv.c:2981
 msgid "/Conversation/_Unblock..."
 msgstr "/Discuţie/Deblochea_ză..."
 
-#: ../pidgin/gtkconv.c:2913
+#: ../pidgin/gtkconv.c:2983
 msgid "/Conversation/_Add..."
 msgstr "/Discuţie/A_daugă..."
 
-#: ../pidgin/gtkconv.c:2915
+#: ../pidgin/gtkconv.c:2985
 msgid "/Conversation/_Remove..."
 msgstr "/Discuţie/Şter_ge..."
 
-#: ../pidgin/gtkconv.c:2920
+#: ../pidgin/gtkconv.c:2990
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Discuţie/Inserează o a_dresă..."
 
-#: ../pidgin/gtkconv.c:2922
+#: ../pidgin/gtkconv.c:2992
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Discuţie/Inserea_ză o imagine..."
 
-#: ../pidgin/gtkconv.c:2928
+#: ../pidgin/gtkconv.c:2998
 msgid "/Conversation/_Close"
 msgstr "/Discuţie/În_chide"
 
 #. Options
-#: ../pidgin/gtkconv.c:2932
+#: ../pidgin/gtkconv.c:3002
 msgid "/_Options"
 msgstr "/_Opţiuni"
 
-#: ../pidgin/gtkconv.c:2933
+#: ../pidgin/gtkconv.c:3003
 msgid "/Options/Enable _Logging"
 msgstr "/Opţiuni/Activează în_registrarea"
 
-#: ../pidgin/gtkconv.c:2934
+#: ../pidgin/gtkconv.c:3004
 msgid "/Options/Enable _Sounds"
 msgstr "/Opţiuni/Activează _sunetul"
 
-#: ../pidgin/gtkconv.c:2936
+#: ../pidgin/gtkconv.c:3006
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Opţiuni/Arată bara cu _unelte"
 
-#: ../pidgin/gtkconv.c:2937
+#: ../pidgin/gtkconv.c:3007
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Opţiuni/Arată _marcaje de timp"
 
-#: ../pidgin/gtkconv.c:3061
+#: ../pidgin/gtkconv.c:3134
 msgid "/Conversation/More"
 msgstr "/Discuţie/Mai mult"
 
-#: ../pidgin/gtkconv.c:3117
+#: ../pidgin/gtkconv.c:3190
 msgid "/Options"
 msgstr "/Opţiuni"
 
@@ -14486,97 +14717,97 @@
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:3152 ../pidgin/gtkconv.c:3184
+#: ../pidgin/gtkconv.c:3225 ../pidgin/gtkconv.c:3257
 msgid "/Conversation"
 msgstr "/Discuţie"
 
-#: ../pidgin/gtkconv.c:3192
+#: ../pidgin/gtkconv.c:3265
 msgid "/Conversation/View Log"
 msgstr "/Discuţie/Arată înregistrările"
 
-#: ../pidgin/gtkconv.c:3198
+#: ../pidgin/gtkconv.c:3271
 msgid "/Conversation/Send File..."
 msgstr "/Discuţie/Trimite un fişier..."
 
-#: ../pidgin/gtkconv.c:3202
+#: ../pidgin/gtkconv.c:3275
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Discuţie/Adaugă o întâmpinare..."
 
-#: ../pidgin/gtkconv.c:3208
+#: ../pidgin/gtkconv.c:3281
 msgid "/Conversation/Get Info"
 msgstr "/Discuţie/Caută detalii"
 
-#: ../pidgin/gtkconv.c:3212
+#: ../pidgin/gtkconv.c:3285
 msgid "/Conversation/Invite..."
 msgstr "/Discuţie/Invită..."
 
-#: ../pidgin/gtkconv.c:3218
+#: ../pidgin/gtkconv.c:3291
 msgid "/Conversation/Alias..."
 msgstr "/Discuţie/Alias..."
 
-#: ../pidgin/gtkconv.c:3222
+#: ../pidgin/gtkconv.c:3295
 msgid "/Conversation/Block..."
 msgstr "/Discuţie/Blochează..."
 
-#: ../pidgin/gtkconv.c:3226
+#: ../pidgin/gtkconv.c:3299
 msgid "/Conversation/Unblock..."
 msgstr "/Discuţie/Deblochează..."
 
-#: ../pidgin/gtkconv.c:3230
+#: ../pidgin/gtkconv.c:3303
 msgid "/Conversation/Add..."
 msgstr "/Discuţie/Adaugă..."
 
-#: ../pidgin/gtkconv.c:3234
+#: ../pidgin/gtkconv.c:3307
 msgid "/Conversation/Remove..."
 msgstr "/Discuţie/Şterge..."
 
-#: ../pidgin/gtkconv.c:3240
+#: ../pidgin/gtkconv.c:3313
 msgid "/Conversation/Insert Link..."
 msgstr "/Discuţie/Inserează o adresă..."
 
-#: ../pidgin/gtkconv.c:3244
+#: ../pidgin/gtkconv.c:3317
 msgid "/Conversation/Insert Image..."
 msgstr "/Discuţie/Inserează o imagine..."
 
-#: ../pidgin/gtkconv.c:3250
+#: ../pidgin/gtkconv.c:3323
 msgid "/Options/Enable Logging"
 msgstr "/Opţiuni/Activează înregistrarea"
 
-#: ../pidgin/gtkconv.c:3253
+#: ../pidgin/gtkconv.c:3326
 msgid "/Options/Enable Sounds"
 msgstr "/Opţiuni/Activează sunetul"
 
-#: ../pidgin/gtkconv.c:3266
+#: ../pidgin/gtkconv.c:3339
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Opţiuni/Arată bara cu unelte"
 
-#: ../pidgin/gtkconv.c:3269
+#: ../pidgin/gtkconv.c:3342
 msgid "/Options/Show Timestamps"
 msgstr "/Opţiuni/Arată marcaje de timp"
 
-#: ../pidgin/gtkconv.c:3346 ../pidgin/gtkconv.c:3388
+#: ../pidgin/gtkconv.c:3419 ../pidgin/gtkconv.c:3461
 msgid "User is typing..."
 msgstr "Utilizatorul vă scrie..."
 
-#: ../pidgin/gtkconv.c:3391
+#: ../pidgin/gtkconv.c:3464
 msgid "User has typed something and stopped"
 msgstr "Utilizatorul a scris ceva şi s-a oprit"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3574 ../pidgin/gtkconv.c:8022
-msgid "_Send To"
-msgstr "_Interlocutor"
-
-#: ../pidgin/gtkconv.c:4286
+#: ../pidgin/gtkconv.c:3648 ../pidgin/gtkconv.c:8248
+msgid "S_end To"
+msgstr "Trimite cătr_e"
+
+#: ../pidgin/gtkconv.c:4360
 msgid "_Send"
 msgstr "T_rimite"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4390
+#: ../pidgin/gtkconv.c:4473
 msgid "0 people in room"
 msgstr "Nici o persoană în chat"
 
-#: ../pidgin/gtkconv.c:5759 ../pidgin/gtkconv.c:5880
+#: ../pidgin/gtkconv.c:5846 ../pidgin/gtkconv.c:5967
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
@@ -14584,135 +14815,135 @@
 msgstr[1] "%d persoane în chat"
 msgstr[2] "%d de persoane în chat"
 
-#: ../pidgin/gtkconv.c:6486 ../pidgin/gtkstatusbox.c:660
+#: ../pidgin/gtkconv.c:6574 ../pidgin/gtkstatusbox.c:660
 msgid "Typing"
 msgstr "Scriu"
 
-#: ../pidgin/gtkconv.c:6490
+#: ../pidgin/gtkconv.c:6578
 msgid "Stopped Typing"
 msgstr "M-am oprit din scris"
 
-#: ../pidgin/gtkconv.c:6493
+#: ../pidgin/gtkconv.c:6581
 msgid "Nick Said"
 msgstr "Pseudonim spus"
 
-#: ../pidgin/gtkconv.c:6496 ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6584 ../pidgin/gtkdocklet.c:685
 msgid "Unread Messages"
 msgstr "Mesaje necitite"
 
-#: ../pidgin/gtkconv.c:6499
+#: ../pidgin/gtkconv.c:6590
 msgid "New Event"
 msgstr "Eveniment nou"
 
-#: ../pidgin/gtkconv.c:7572
+#: ../pidgin/gtkconv.c:7767
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear: Goleşte conţinutul ferestrei de discuţii."
 
-#: ../pidgin/gtkconv.c:7736
+#: ../pidgin/gtkconv.c:7930
 msgid "Confirm close"
 msgstr "Confirmare închidere"
 
-#: ../pidgin/gtkconv.c:7768
+#: ../pidgin/gtkconv.c:7962
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "Aveţi mesaje necitite. Sigur doriţi să închideţi fereastra?"
 
-#: ../pidgin/gtkconv.c:8355
+#: ../pidgin/gtkconv.c:8581
 msgid "Close other tabs"
 msgstr "Închide celelalte taburi"
 
-#: ../pidgin/gtkconv.c:8361
+#: ../pidgin/gtkconv.c:8587
 msgid "Close all tabs"
 msgstr "Închide toate taburile"
 
-#: ../pidgin/gtkconv.c:8369
+#: ../pidgin/gtkconv.c:8595
 msgid "Detach this tab"
 msgstr "Desprinde acest tab"
 
-#: ../pidgin/gtkconv.c:8375
+#: ../pidgin/gtkconv.c:8601
 msgid "Close this tab"
 msgstr "Închide acest tab"
 
-#: ../pidgin/gtkconv.c:8875
+#: ../pidgin/gtkconv.c:9106
 msgid "Close conversation"
 msgstr "Încheie discuţia"
 
-#: ../pidgin/gtkconv.c:9477
+#: ../pidgin/gtkconv.c:9708
 msgid "Last created window"
 msgstr "În ultima fereastră creată"
 
-#: ../pidgin/gtkconv.c:9479
+#: ../pidgin/gtkconv.c:9710
 msgid "Separate IM and Chat windows"
 msgstr "Nu în fereastra chat-urilor"
 
-#: ../pidgin/gtkconv.c:9481 ../pidgin/gtkprefs.c:1415
+#: ../pidgin/gtkconv.c:9712 ../pidgin/gtkprefs.c:1510
 msgid "New window"
 msgstr "În fereastră nouă"
 
-#: ../pidgin/gtkconv.c:9483
+#: ../pidgin/gtkconv.c:9714
 msgid "By group"
 msgstr "După grup"
 
-#: ../pidgin/gtkconv.c:9485
+#: ../pidgin/gtkconv.c:9716
 msgid "By account"
 msgstr "După cont"
 
-#: ../pidgin/gtkdebug.c:234
+#: ../pidgin/gtkdebug.c:235
 msgid "Save Debug Log"
 msgstr "Salvează mesajele de depanare"
 
-#: ../pidgin/gtkdebug.c:582
+#: ../pidgin/gtkdebug.c:583
 msgid "Invert"
 msgstr "Inversează"
 
-#: ../pidgin/gtkdebug.c:585
+#: ../pidgin/gtkdebug.c:586
 msgid "Highlight matches"
 msgstr "Evidenţiază potrivirile"
 
-#: ../pidgin/gtkdebug.c:652
+#: ../pidgin/gtkdebug.c:653
 msgid "_Icon Only"
 msgstr "_Doar iconiţe"
 
-#: ../pidgin/gtkdebug.c:653
+#: ../pidgin/gtkdebug.c:654
 msgid "_Text Only"
 msgstr "Doar _text"
 
-#: ../pidgin/gtkdebug.c:654
+#: ../pidgin/gtkdebug.c:655
 msgid "_Both Icon & Text"
 msgstr "_Iconiţe şi text"
 
-#: ../pidgin/gtkdebug.c:775
+#: ../pidgin/gtkdebug.c:780
 msgid "Filter"
 msgstr "Filtru"
 
-#: ../pidgin/gtkdebug.c:794
+#: ../pidgin/gtkdebug.c:799
 msgid "Right click for more options."
 msgstr "Click dreapta pentru mai multe opţiuni."
 
-#: ../pidgin/gtkdebug.c:824
+#: ../pidgin/gtkdebug.c:829
 msgid "Level "
 msgstr "Nivel "
 
-#: ../pidgin/gtkdebug.c:825 ../pidgin/gtkdebug.c:831
+#: ../pidgin/gtkdebug.c:830 ../pidgin/gtkdebug.c:836
 msgid "Select the debug filter level."
 msgstr "Selectare nivel filtru de depanare"
 
-#: ../pidgin/gtkdebug.c:833
+#: ../pidgin/gtkdebug.c:838
 msgid "All"
 msgstr "Tot"
 
-#: ../pidgin/gtkdebug.c:834
+#: ../pidgin/gtkdebug.c:839
 msgid "Misc"
 msgstr "Altele"
 
-#: ../pidgin/gtkdebug.c:836
+#: ../pidgin/gtkdebug.c:841
 msgid "Warning"
 msgstr "Avertizări"
 
-#: ../pidgin/gtkdebug.c:837
+#: ../pidgin/gtkdebug.c:842
 msgid "Error "
 msgstr "Erori "
 
-#: ../pidgin/gtkdebug.c:838
+#: ../pidgin/gtkdebug.c:843
 msgid "Fatal Error"
 msgstr "Erori fatale"
 
@@ -14727,26 +14958,26 @@
 #: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
 #: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:84
 #: ../pidgin/gtkdialogs.c:85 ../pidgin/gtkdialogs.c:86
-#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:91
-#: ../pidgin/gtkdialogs.c:92
+#: ../pidgin/gtkdialogs.c:87 ../pidgin/gtkdialogs.c:90
+#: ../pidgin/gtkdialogs.c:92 ../pidgin/gtkdialogs.c:93
 msgid "developer"
 msgstr "programator"
 
-#: ../pidgin/gtkdialogs.c:87
+#: ../pidgin/gtkdialogs.c:88
 msgid "support"
 msgstr "suport"
 
-#: ../pidgin/gtkdialogs.c:88
+#: ../pidgin/gtkdialogs.c:89
 msgid "support/QA"
 msgstr "suport şi asigurare a calităţii"
 
-#: ../pidgin/gtkdialogs.c:90 ../pidgin/gtkdialogs.c:112
+#: ../pidgin/gtkdialogs.c:91 ../pidgin/gtkdialogs.c:112
 msgid "developer & webmaster"
 msgstr "programator şi editor web"
 
 #: ../pidgin/gtkdialogs.c:99
 msgid "Senior Contributor/QA"
-msgstr ""
+msgstr "Contributori majori/CTC"
 
 #: ../pidgin/gtkdialogs.c:108
 msgid "win32 port"
@@ -14777,16 +15008,16 @@
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
-#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:228
 msgid "Arabic"
 msgstr "Arabă"
 
 #: ../pidgin/gtkdialogs.c:135
 msgid "Belarusian Latin"
-msgstr ""
+msgstr "Bielorusă (alfabet latin)"
 
 #: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
-#: ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:229
 msgid "Bulgarian"
 msgstr "Bulgară"
 
@@ -14799,8 +15030,8 @@
 msgid "Bosnian"
 msgstr "Bosniacă"
 
-#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:228
-#: ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:231
 msgid "Catalan"
 msgstr "Catalană"
 
@@ -14808,7 +15039,7 @@
 msgid "Valencian-Catalan"
 msgstr "Valenciană"
 
-#: ../pidgin/gtkdialogs.c:146 ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:146 ../pidgin/gtkdialogs.c:232
 msgid "Czech"
 msgstr "Cehă"
 
@@ -14817,7 +15048,7 @@
 msgstr "Daneză"
 
 #: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150
-#: ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:233
 msgid "German"
 msgstr "Germană"
 
@@ -14846,16 +15077,15 @@
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:232
-#: ../pidgin/gtkdialogs.c:233 ../pidgin/gtkdialogs.c:234
-#: ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:235 ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:237
 msgid "Spanish"
 msgstr "Spaniolă"
 
 #: ../pidgin/gtkdialogs.c:161
-#, fuzzy
 msgid "Estonian"
-msgstr "Bosniacă"
+msgstr "Estonă"
 
 #: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163
 msgid "Euskera(Basque)"
@@ -14866,19 +15096,19 @@
 msgid "Persian"
 msgstr "Persană"
 
-#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:236
-#: ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:239
 msgid "Finnish"
 msgstr "Finlandeză"
 
-#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:238
-#: ../pidgin/gtkdialogs.c:239 ../pidgin/gtkdialogs.c:240
-#: ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:241 ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:243
 msgid "French"
 msgstr "Franceză"
 
 #: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
-#: ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:244
 msgid "Galician"
 msgstr "Galiciană"
 
@@ -14890,7 +15120,7 @@
 msgid "Gujarati Language Team"
 msgstr "Echipa de localizare Gujarati"
 
-#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:243
+#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:245
 msgid "Hebrew"
 msgstr "Ebraică"
 
@@ -14898,7 +15128,7 @@
 msgid "Hindi"
 msgstr "Hindi"
 
-#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:246
 msgid "Hungarian"
 msgstr "Maghiară"
 
@@ -14906,16 +15136,16 @@
 msgid "Indonesian"
 msgstr "Indoneziană"
 
-#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:245
+#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:247
 msgid "Italian"
 msgstr "Italiană"
 
-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:246
-#: ../pidgin/gtkdialogs.c:247 ../pidgin/gtkdialogs.c:248
+#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:248
+#: ../pidgin/gtkdialogs.c:249 ../pidgin/gtkdialogs.c:250
 msgid "Japanese"
 msgstr "Japoneză"
 
-#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:249
+#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:251
 msgid "Georgian"
 msgstr "Georgiană"
 
@@ -14931,8 +15161,8 @@
 msgid "Kannada Translation team"
 msgstr "Echipa de localizare Kannada"
 
-#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:250
-#: ../pidgin/gtkdialogs.c:251
+#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:252
+#: ../pidgin/gtkdialogs.c:253
 msgid "Korean"
 msgstr "Coreeană"
 
@@ -14942,22 +15172,21 @@
 msgstr "Kurdă"
 
 #: ../pidgin/gtkdialogs.c:185
-#, fuzzy
 msgid "Lao"
-msgstr "Leu"
-
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:252
-#: ../pidgin/gtkdialogs.c:253
+msgstr "Lao"
+
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:254
+#: ../pidgin/gtkdialogs.c:255
 msgid "Lithuanian"
 msgstr "Lituaniană"
 
 #: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:188
-#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:254
+#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:256
 msgid "Macedonian"
 msgstr "Macedoneană"
 
-#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:255
-#: ../pidgin/gtkdialogs.c:256
+#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:257
+#: ../pidgin/gtkdialogs.c:258
 msgid "Bokmål Norwegian"
 msgstr "Norvegiană Bokmål"
 
@@ -14973,105 +15202,113 @@
 msgid "Norwegian Nynorsk"
 msgstr "Norvegiană (Nynorsk)"
 
-#: ../pidgin/gtkdialogs.c:194 ../pidgin/gtkdialogs.c:195
-#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:257
+#: ../pidgin/gtkdialogs.c:194
+msgid "Punjabi"
+msgstr "Punjabi"
+
+#: ../pidgin/gtkdialogs.c:195 ../pidgin/gtkdialogs.c:196
+#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:259
 msgid "Polish"
 msgstr "Poloneză"
 
-#: ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:198
 msgid "Portuguese"
 msgstr "Portugheză"
 
-#: ../pidgin/gtkdialogs.c:198
+#: ../pidgin/gtkdialogs.c:199
 msgid "Portuguese-Brazil"
 msgstr "Portugheză Braziliană"
 
-#: ../pidgin/gtkdialogs.c:199
+#: ../pidgin/gtkdialogs.c:200
 msgid "Pashto"
 msgstr "Pashto"
 
-#: ../pidgin/gtkdialogs.c:200
+#: ../pidgin/gtkdialogs.c:201
 msgid "Romanian"
 msgstr "Română"
 
-#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:258
-#: ../pidgin/gtkdialogs.c:259
+#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:260
+#: ../pidgin/gtkdialogs.c:261
 msgid "Russian"
 msgstr "Rusă"
 
-#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:203
-#: ../pidgin/gtkdialogs.c:260 ../pidgin/gtkdialogs.c:261
-#: ../pidgin/gtkdialogs.c:262
+#: ../pidgin/gtkdialogs.c:203 ../pidgin/gtkdialogs.c:204
+#: ../pidgin/gtkdialogs.c:262 ../pidgin/gtkdialogs.c:263
+#: ../pidgin/gtkdialogs.c:264
 msgid "Slovak"
 msgstr "Slovacă"
 
-#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:263
+#: ../pidgin/gtkdialogs.c:205 ../pidgin/gtkdialogs.c:265
 msgid "Slovenian"
 msgstr "Slovenă"
 
-#: ../pidgin/gtkdialogs.c:205
+#: ../pidgin/gtkdialogs.c:206
 msgid "Albanian"
 msgstr "Albaneză"
 
-#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:207
-#: ../pidgin/gtkdialogs.c:264 ../pidgin/gtkdialogs.c:265
+#: ../pidgin/gtkdialogs.c:207 ../pidgin/gtkdialogs.c:208
+#: ../pidgin/gtkdialogs.c:266 ../pidgin/gtkdialogs.c:267
 msgid "Serbian"
 msgstr "Sârbă"
 
-#: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:266
-#: ../pidgin/gtkdialogs.c:267
+#: ../pidgin/gtkdialogs.c:209 ../pidgin/gtkdialogs.c:268
+#: ../pidgin/gtkdialogs.c:269
 msgid "Swedish"
 msgstr "Suedeză"
 
-#: ../pidgin/gtkdialogs.c:209
-msgid "Tamil"
-msgstr "Tamil"
-
 #: ../pidgin/gtkdialogs.c:210
+msgid "Tamil"
+msgstr "Tamil"
+
+#: ../pidgin/gtkdialogs.c:211
 msgid "Telugu"
 msgstr "Telugu"
 
-#: ../pidgin/gtkdialogs.c:211
+#: ../pidgin/gtkdialogs.c:212
 msgid "Thai"
 msgstr "Thailandeză"
 
-#: ../pidgin/gtkdialogs.c:212 ../pidgin/gtkdialogs.c:268
+#: ../pidgin/gtkdialogs.c:213 ../pidgin/gtkdialogs.c:270
 msgid "Turkish"
 msgstr "Turcă"
 
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:214
+msgid "Urdu"
+msgstr "Urdu"
+
+#: ../pidgin/gtkdialogs.c:215
 msgid "Vietnamese"
 msgstr "Vietnameză"
 
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:215
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M. Thanh şi echipa „Gnome Vi”"
 
-#: ../pidgin/gtkdialogs.c:214 ../pidgin/gtkdialogs.c:269
+#: ../pidgin/gtkdialogs.c:216 ../pidgin/gtkdialogs.c:271
 msgid "Simplified Chinese"
 msgstr "Chineză simplificată"
 
-#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:216
-#: ../pidgin/gtkdialogs.c:217
+#: ../pidgin/gtkdialogs.c:217 ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:219
 msgid "Hong Kong Chinese"
 msgstr "Chineză Hong Kong"
 
-#: ../pidgin/gtkdialogs.c:218 ../pidgin/gtkdialogs.c:219
-#: ../pidgin/gtkdialogs.c:270
+#: ../pidgin/gtkdialogs.c:220 ../pidgin/gtkdialogs.c:221
+#: ../pidgin/gtkdialogs.c:272
 msgid "Traditional Chinese"
 msgstr "Chineză tradiţională"
 
-#: ../pidgin/gtkdialogs.c:225
+#: ../pidgin/gtkdialogs.c:227
 msgid "Amharic"
 msgstr "Amharic"
 
-#: ../pidgin/gtkdialogs.c:357
+#: ../pidgin/gtkdialogs.c:370
 #, c-format
 msgid "About %s"
 msgstr "Despre %s"
 
-#: ../pidgin/gtkdialogs.c:400
-#, fuzzy, c-format
+#: ../pidgin/gtkdialogs.c:413
+#, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
 "capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
@@ -15083,59 +15320,71 @@
 "complete list of contributors.  We provide no warranty for this program."
 "<BR><BR>"
 msgstr ""
-"%s este un client grafic modular de mesagerie ce utilizează libpurple şi "
-"este capabil să comunice simultan utilizând protocoalele AIM, MSN, Yahoo!, "
-"XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, "
-"Zephyr, Gadu-Gadu şi QQ. Este scris utilizând GTK+.<BR><BR>Puteţi modifica "
-"şi redistribui acest program în termenii licenţei GPL (versiunea 2 sau mai "
-"nouă). Fişierul „COPYING”, distribuit cu %s, este o copie a licenţei GPL. "
-"Drepturile de autor pentru %s aparţin contributorilor. Consultaţi fişierul "
-"„COPYRIGHT” pentru o listă completă a celor ce au contribuit. Nu se oferă "
-"nici un fel de garanţie pentru acest program.<BR><BR>"
-
-#: ../pidgin/gtkdialogs.c:418
-#, c-format
+"%s este un client grafic modular de mesagerie capabil să comunice simultan "
+"utilizând protocoalele AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
+"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu şi "
+"QQ. Este scris utilizând libpurple şi GTK+.<BR><BR>"
+"Puteţi modifica şi redistribui acest program în termenii licenţei GPL "
+"(versiunea 2 sau mai nouă). Fişierul „COPYING”, distribuit cu %s, este o "
+"copie a licenţei GPL. Drepturile de autor pentru %s aparţin contributorilor. "
+"Consultaţi fişierul „COPYRIGHT” pentru o listă completă a celor ce au "
+"contribuit. Nu se oferă nici un fel de garanţie pentru acest program.<BR><BR>"
+
+#: ../pidgin/gtkdialogs.c:431
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin pe irc.freenode.net<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:423
+#: ../pidgin/gtkdialogs.c:436
 msgid "Current Developers"
 msgstr "Programatori activi"
 
-#: ../pidgin/gtkdialogs.c:438
+#: ../pidgin/gtkdialogs.c:451
 msgid "Crazy Patch Writers"
 msgstr "Autori de patch-uri"
 
-#: ../pidgin/gtkdialogs.c:453
+#: ../pidgin/gtkdialogs.c:466
 msgid "Retired Developers"
 msgstr "Programatori inactivi"
 
-#: ../pidgin/gtkdialogs.c:468
-#, fuzzy
+#: ../pidgin/gtkdialogs.c:481
 msgid "Retired Crazy Patch Writers"
-msgstr "Autori de patch-uri"
-
-#: ../pidgin/gtkdialogs.c:483
+msgstr "Autori inactivi de patch-uri"
+
+#: ../pidgin/gtkdialogs.c:496
 msgid "Artists"
-msgstr "Artişti"
-
-#: ../pidgin/gtkdialogs.c:498
+msgstr "Designeri"
+
+#: ../pidgin/gtkdialogs.c:511
 msgid "Current Translators"
 msgstr "Traducători activi"
 
-#: ../pidgin/gtkdialogs.c:518
+#: ../pidgin/gtkdialogs.c:531
 msgid "Past Translators"
 msgstr "Traducători inactivi"
 
-#: ../pidgin/gtkdialogs.c:536
+#: ../pidgin/gtkdialogs.c:549
 msgid "Debugging Information"
 msgstr "Informaţii de depanare"
 
-#: ../pidgin/gtkdialogs.c:906
+#: ../pidgin/gtkdialogs.c:766 ../pidgin/gtkdialogs.c:909
+#: ../pidgin/gtkdialogs.c:990
+msgid "_Name"
+msgstr "_Nume"
+
+#: ../pidgin/gtkdialogs.c:771
+msgid "Buddy"
+msgstr "Contact"
+
+#: ../pidgin/gtkdialogs.c:775 ../pidgin/gtkdialogs.c:914
+#: ../pidgin/gtkdialogs.c:995
+msgid "_Account"
+msgstr "_Cont"
+
+#: ../pidgin/gtkdialogs.c:922
 msgid "Get User Info"
 msgstr "Caută detalii"
 
-#: ../pidgin/gtkdialogs.c:908
+#: ../pidgin/gtkdialogs.c:924
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
@@ -15143,11 +15392,11 @@
 "Introduceţi numele de identificare sau aliasul persoanei căreia vreţi să-i "
 "vedeţi detaliile personale."
 
-#: ../pidgin/gtkdialogs.c:998
+#: ../pidgin/gtkdialogs.c:1014
 msgid "View User Log"
 msgstr "Arată înregistrările unui utilizator"
 
-#: ../pidgin/gtkdialogs.c:1000
+#: ../pidgin/gtkdialogs.c:1016
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
@@ -15155,32 +15404,32 @@
 "Introduceţi numele de identificare sau aliasul persoanei căreia vreţi să-i "
 "vedeţi înregistrările."
 
-#: ../pidgin/gtkdialogs.c:1020
+#: ../pidgin/gtkdialogs.c:1036
 msgid "Alias Contact"
 msgstr "Alias contact"
 
-#: ../pidgin/gtkdialogs.c:1021
+#: ../pidgin/gtkdialogs.c:1037
 msgid "Enter an alias for this contact."
 msgstr "Introduceţi un alias pentru acest contact."
 
-#: ../pidgin/gtkdialogs.c:1043
+#: ../pidgin/gtkdialogs.c:1059
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Introduceţi un alias pentru %s."
 
-#: ../pidgin/gtkdialogs.c:1045
+#: ../pidgin/gtkdialogs.c:1061
 msgid "Alias Buddy"
 msgstr "Alias contact"
 
-#: ../pidgin/gtkdialogs.c:1066
+#: ../pidgin/gtkdialogs.c:1082
 msgid "Alias Chat"
 msgstr "Alias chat"
 
-#: ../pidgin/gtkdialogs.c:1067
+#: ../pidgin/gtkdialogs.c:1083
 msgid "Enter an alias for this chat."
 msgstr "Introduceţi un nou alias pentru acest chat."
 
-#: ../pidgin/gtkdialogs.c:1106
+#: ../pidgin/gtkdialogs.c:1122
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -15192,21 +15441,21 @@
 "Sunteţi pe cale să ştergeţi din listă contactul conţinând %s şi încă un alt "
 "contact. Doriţi să continuaţi?"
 msgstr[1] ""
-"Sunteţi pe cale să ştergeţi din listă contactul conţinând %s şi %d alte "
+"Sunteţi pe cale să ştergeţi din listă contactul conţinând %s şi încă %d alte "
 "contacte. Doriţi să continuaţi?"
 msgstr[2] ""
-"Sunteţi pe cale să ştergeţi din listă contactul conţinând %s şi %d de alte "
-"contacte. Doriţi să continuaţi?"
-
-#: ../pidgin/gtkdialogs.c:1114
+"Sunteţi pe cale să ştergeţi din listă contactul conţinând %s şi încă %d de "
+"alte contacte. Doriţi să continuaţi?"
+
+#: ../pidgin/gtkdialogs.c:1130
 msgid "Remove Contact"
 msgstr "Ştergere contact"
 
-#: ../pidgin/gtkdialogs.c:1117
+#: ../pidgin/gtkdialogs.c:1133
 msgid "_Remove Contact"
 msgstr "Şter_gere contact"
 
-#: ../pidgin/gtkdialogs.c:1148
+#: ../pidgin/gtkdialogs.c:1164
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
@@ -15215,15 +15464,15 @@
 "Sunteţi pe cale să mutaţi membrii grupului %s în grupul %s. Doriţi să "
 "continuaţi?"
 
-#: ../pidgin/gtkdialogs.c:1155
+#: ../pidgin/gtkdialogs.c:1171
 msgid "Merge Groups"
 msgstr "Unire grupuri"
 
-#: ../pidgin/gtkdialogs.c:1158
+#: ../pidgin/gtkdialogs.c:1174
 msgid "_Merge Groups"
 msgstr "_Unire grupuri"
 
-#: ../pidgin/gtkdialogs.c:1208
+#: ../pidgin/gtkdialogs.c:1224
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -15232,15 +15481,15 @@
 "Sunteţi pe cale să ştergeţi grupul %s şi toţi membrii săi din lista de "
 "contacte. Doriţi să continuaţi?"
 
-#: ../pidgin/gtkdialogs.c:1211
+#: ../pidgin/gtkdialogs.c:1227
 msgid "Remove Group"
 msgstr "Ştergere grup"
 
-#: ../pidgin/gtkdialogs.c:1214
+#: ../pidgin/gtkdialogs.c:1230
 msgid "_Remove Group"
 msgstr "Şter_gere grup"
 
-#: ../pidgin/gtkdialogs.c:1247
+#: ../pidgin/gtkdialogs.c:1263
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
@@ -15248,15 +15497,15 @@
 "Sunteţi pe cale să îl/o ştergeţi pe %s din lista de contacte. Doriţi să "
 "continuaţi?"
 
-#: ../pidgin/gtkdialogs.c:1250
+#: ../pidgin/gtkdialogs.c:1266
 msgid "Remove Buddy"
 msgstr "Ştergere contact"
 
-#: ../pidgin/gtkdialogs.c:1253
+#: ../pidgin/gtkdialogs.c:1269
 msgid "_Remove Buddy"
 msgstr "Şter_ge contactul"
 
-#: ../pidgin/gtkdialogs.c:1274
+#: ../pidgin/gtkdialogs.c:1290
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -15265,40 +15514,39 @@
 "Sunteţi pe cale să ştergeţi un chat cu numele %s din lista de contacte. "
 "Doriţi să continuaţi?"
 
-#: ../pidgin/gtkdialogs.c:1277
+#: ../pidgin/gtkdialogs.c:1293
 msgid "Remove Chat"
 msgstr "Ştergere chat"
 
-#: ../pidgin/gtkdialogs.c:1280
+#: ../pidgin/gtkdialogs.c:1296
 msgid "_Remove Chat"
 msgstr "Şter_gere chat"
 
-#: ../pidgin/gtkdocklet.c:150
+#: ../pidgin/gtkdocklet.c:152
 msgid "Right-click for more unread messages...\n"
 msgstr "Click dreapta pentru mai multe mesaje necitite...\n"
 
-#: ../pidgin/gtkdocklet.c:435
+#: ../pidgin/gtkdocklet.c:533
 msgid "Change Status"
 msgstr "Schimbare status"
 
-#: ../pidgin/gtkdocklet.c:487
+#: ../pidgin/gtkdocklet.c:680
 msgid "Show Buddy List"
 msgstr "Listă de contacte vizibilă"
 
-#: ../pidgin/gtkdocklet.c:513
+#: ../pidgin/gtkdocklet.c:706
 msgid "New Message..."
 msgstr "Mesaj nou..."
 
-#: ../pidgin/gtkdocklet.c:528
+#: ../pidgin/gtkdocklet.c:721
 msgid "Mute Sounds"
 msgstr "Fără sunete"
 
-#: ../pidgin/gtkdocklet.c:535
-#, fuzzy
-msgid "Blink on new message"
+#: ../pidgin/gtkdocklet.c:728
+msgid "Blink on New Message"
 msgstr "Clipire la mesaje noi"
 
-#: ../pidgin/gtkdocklet.c:542
+#: ../pidgin/gtkdocklet.c:738
 msgid "Quit"
 msgstr "Ieşire"
 
@@ -15388,43 +15636,43 @@
 msgid "_Resume"
 msgstr "_Reluare"
 
-#: ../pidgin/gtkimhtml.c:816
+#: ../pidgin/gtkimhtml.c:815
 msgid "Paste as Plain _Text"
 msgstr "Lipeşte ca text _simplu"
 
-#: ../pidgin/gtkimhtml.c:833 ../pidgin/gtkimhtmltoolbar.c:1194
+#: ../pidgin/gtkimhtml.c:832 ../pidgin/gtkimhtmltoolbar.c:1199
 msgid "_Reset formatting"
 msgstr "_Fără formatare"
 
-#: ../pidgin/gtkimhtml.c:1373
+#: ../pidgin/gtkimhtml.c:1357
 msgid "Hyperlink color"
 msgstr "Culoare adresă"
 
-#: ../pidgin/gtkimhtml.c:1374
+#: ../pidgin/gtkimhtml.c:1358
 msgid "Color to draw hyperlinks."
 msgstr "Culoare pentru afişarea adreselor."
 
-#: ../pidgin/gtkimhtml.c:1377
+#: ../pidgin/gtkimhtml.c:1361
 msgid "Hyperlink prelight color"
 msgstr "Culoare evidenţiere adresă"
 
-#: ../pidgin/gtkimhtml.c:1378
+#: ../pidgin/gtkimhtml.c:1362
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Culoare pentru afişarea adreselor sub cursorul de maus."
 
-#: ../pidgin/gtkimhtml.c:1598
+#: ../pidgin/gtkimhtml.c:1579
 msgid "_Copy E-Mail Address"
 msgstr "C_opiază adresa de mail"
 
-#: ../pidgin/gtkimhtml.c:1610
+#: ../pidgin/gtkimhtml.c:1591
 msgid "_Open Link in Browser"
 msgstr "_Deschide adresa în navigator"
 
-#: ../pidgin/gtkimhtml.c:1620
+#: ../pidgin/gtkimhtml.c:1601
 msgid "_Copy Link Location"
 msgstr "_Copiază locaţia adresei"
 
-#: ../pidgin/gtkimhtml.c:3369
+#: ../pidgin/gtkimhtml.c:3356
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -15434,7 +15682,7 @@
 "\n"
 "Se utilizează tipul implicit: PNG."
 
-#: ../pidgin/gtkimhtml.c:3372
+#: ../pidgin/gtkimhtml.c:3359
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -15444,7 +15692,7 @@
 "\n"
 "Se utilizează tipul implicit: PNG."
 
-#: ../pidgin/gtkimhtml.c:3401
+#: ../pidgin/gtkimhtml.c:3388
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -15455,7 +15703,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3404
+#: ../pidgin/gtkimhtml.c:3391
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -15466,12 +15714,11 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3482 ../pidgin/gtkimhtml.c:3494
+#: ../pidgin/gtkimhtml.c:3469 ../pidgin/gtkimhtml.c:3481
 msgid "Save Image"
 msgstr "Salvează imaginea"
 
-#: ../pidgin/gtkimhtml.c:3522
-#, c-format
+#: ../pidgin/gtkimhtml.c:3509
 msgid "_Save Image..."
 msgstr "_Salvează imaginea..."
 
@@ -15479,23 +15726,23 @@
 msgid "Select Font"
 msgstr "Alegeţi un font"
 
-#: ../pidgin/gtkimhtmltoolbar.c:242
+#: ../pidgin/gtkimhtmltoolbar.c:244
 msgid "Select Text Color"
 msgstr "Selectaţi culoarea textului"
 
-#: ../pidgin/gtkimhtmltoolbar.c:321
+#: ../pidgin/gtkimhtmltoolbar.c:323
 msgid "Select Background Color"
 msgstr "Selectaţi culoarea fundalului"
 
-#: ../pidgin/gtkimhtmltoolbar.c:410
+#: ../pidgin/gtkimhtmltoolbar.c:412
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:418
+#: ../pidgin/gtkimhtmltoolbar.c:420
 msgid "_Description"
 msgstr "_Descriere"
 
-#: ../pidgin/gtkimhtmltoolbar.c:421
+#: ../pidgin/gtkimhtmltoolbar.c:423
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -15503,170 +15750,154 @@
 "Introduceţi adresa pe care doriţi să o inseraţi şi descrierea ei. Descrierea "
 "este opţională."
 
-#: ../pidgin/gtkimhtmltoolbar.c:425
+#: ../pidgin/gtkimhtmltoolbar.c:427
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Introduceţi adresa pe care doriţi să o inseraţi."
 
-#: ../pidgin/gtkimhtmltoolbar.c:430 ../pidgin/gtkimhtmltoolbar.c:1102
+#: ../pidgin/gtkimhtmltoolbar.c:432 ../pidgin/gtkimhtmltoolbar.c:1106
 msgid "Insert Link"
 msgstr "Inserare adresă"
 
-#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtkimhtmltoolbar.c:1262
+#: ../pidgin/gtkimhtmltoolbar.c:436 ../pidgin/gtkimhtmltoolbar.c:1267
 msgid "_Insert"
-msgstr "_Inserează"
-
-#: ../pidgin/gtkimhtmltoolbar.c:514
+msgstr "Inserea_ză"
+
+#: ../pidgin/gtkimhtmltoolbar.c:516
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Nu s-a putut stoca imaginea: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:540 ../pidgin/gtkimhtmltoolbar.c:550
+#: ../pidgin/gtkimhtmltoolbar.c:542 ../pidgin/gtkimhtmltoolbar.c:552
 msgid "Insert Image"
 msgstr "Inserare imagine"
 
-#: ../pidgin/gtkimhtmltoolbar.c:761
+#: ../pidgin/gtkimhtmltoolbar.c:765
 msgid "This theme has no available smileys."
 msgstr "Această temă nu are iconiţe disponibile."
 
 #. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:778
+#: ../pidgin/gtkimhtmltoolbar.c:782
 msgid "Smile!"
 msgstr "Iconiţe simbolice"
 
-#: ../pidgin/gtkimhtmltoolbar.c:846 ../pidgin/gtkimhtmltoolbar.c:1219
+#: ../pidgin/gtkimhtmltoolbar.c:850 ../pidgin/gtkimhtmltoolbar.c:1224
 msgid "_Font"
 msgstr "_Font"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1054
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:1058
 msgid "Group Items"
-msgstr "ID grup:"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1054
+msgstr "Elemente grupate"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1058
 msgid "Ungroup Items"
-msgstr ""
-
-#: ../pidgin/gtkimhtmltoolbar.c:1088 ../pidgin/plugins/convcolors.c:287
+msgstr "Elemente negrupate"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1092 ../pidgin/plugins/convcolors.c:287
 msgid "Bold"
 msgstr "Aldin"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1089 ../pidgin/plugins/convcolors.c:294
+#: ../pidgin/gtkimhtmltoolbar.c:1093 ../pidgin/plugins/convcolors.c:294
 msgid "Italic"
 msgstr "Cursiv"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1090 ../pidgin/plugins/convcolors.c:301
+#: ../pidgin/gtkimhtmltoolbar.c:1094 ../pidgin/plugins/convcolors.c:301
 msgid "Underline"
 msgstr "Subliniat"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1091
+#: ../pidgin/gtkimhtmltoolbar.c:1095
 msgid "Strikethrough"
-msgstr ""
-
-#: ../pidgin/gtkimhtmltoolbar.c:1093
-msgid "Increase Font Size"
-msgstr ""
-
-#: ../pidgin/gtkimhtmltoolbar.c:1094
-msgid "Decrease Font Size"
-msgstr ""
-
-#: ../pidgin/gtkimhtmltoolbar.c:1096
-#, fuzzy
-msgid "Font Face"
-msgstr "_Nume font"
+msgstr "Tăiat"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1097
-#, fuzzy
-msgid "Background Color"
-msgstr "Culoare _fundal"
+msgid "Increase Font Size"
+msgstr "Măreşte fontul"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1098
-#, fuzzy
-msgid "Foreground Color"
-msgstr "Culoare te_xt"
+msgid "Decrease Font Size"
+msgstr "Micşorează fontul"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1100
-#, fuzzy
+msgid "Font Face"
+msgstr "Nume font"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1101
+msgid "Background Color"
+msgstr "Culoare fundal"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1102
+msgid "Foreground Color"
+msgstr "Culoare text"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1104
 msgid "Reset Formatting"
 msgstr "Fără formatare"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1103
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:1107
 msgid "Insert IM Image"
-msgstr "Inserare imagine"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1104
-#, fuzzy
+msgstr "Inserare imagine IM"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1108
 msgid "Insert Smiley"
 msgstr "Inserare iconiţă simbolică"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1179
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:1184
 msgid "<b>_Bold</b>"
-msgstr "<b>Parolă:</b>"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1180
-#, fuzzy
-msgid "<i>_Italic</i>"
-msgstr "_Cursiv"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1181
-#, fuzzy
-msgid "<u>_Underline</u>"
-msgstr "_Subliniat"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1182
-msgid "<span strikethrough='true'>Strikethrough</span>"
-msgstr ""
-
-#: ../pidgin/gtkimhtmltoolbar.c:1183
-#, fuzzy
-msgid "<span size='larger'>_Larger</span>"
-msgstr ""
-"<span size='larger' weight='bold'>Eroare la salvarea imaginii</span>\n"
-"\n"
-"%s"
+msgstr "<b>_Aldin</b>"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1185
+msgid "<i>_Italic</i>"
+msgstr "<i>_Cursiv</i>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1186
+msgid "<u>_Underline</u>"
+msgstr "<u>_Subliniat</u>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1187
+msgid "<span strikethrough='true'>Strikethrough</span>"
+msgstr "<span strikethrough='true'>Tăiat</span>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1188
+msgid "<span size='larger'>_Larger</span>"
+msgstr "<span size='larger'>_Mărit</span>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1190
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1187
+#: ../pidgin/gtkimhtmltoolbar.c:1192
 msgid "<span size='smaller'>_Smaller</span>"
-msgstr ""
+msgstr "<span size='smaller'>M_icşorat</span>"
 
 #. If we want to show the formatting for the following items, we would
 #. * need to update them when formatting changes. The above items don't need
 #. * no updating nor nothin'
-#: ../pidgin/gtkimhtmltoolbar.c:1191
+#: ../pidgin/gtkimhtmltoolbar.c:1196
 msgid "_Font face"
-msgstr "_Nume font"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1192
-#, fuzzy
+msgstr "Nume _font"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1197
 msgid "Foreground _color"
 msgstr "Culoare te_xt"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1193
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:1198
 msgid "Bac_kground color"
-msgstr "Culoare _fundal"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1270
-msgid "_Smiley"
-msgstr "Ico_niţe simbolice"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1276
+msgstr "Culoare f_undal"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1275
 msgid "_Image"
-msgstr "Im_agine"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1282
+msgstr "_Imagine"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1281
 msgid "_Link"
 msgstr "_Link"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1288
+#: ../pidgin/gtkimhtmltoolbar.c:1287
 msgid "_Horizontal rule"
-msgstr ""
+msgstr "Linie _orizontală"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1309
+msgid "_Smile!"
+msgstr "Ico_niţe simbolice"
 
 #: ../pidgin/gtklog.c:293
 #, c-format
@@ -15745,27 +15976,27 @@
 msgid "Total log size:"
 msgstr "Mărime totală înregistrări:"
 
-#: ../pidgin/gtklog.c:709
+#: ../pidgin/gtklog.c:714
 #, c-format
 msgid "Conversations in %s"
 msgstr "Discuţii în %s"
 
-#: ../pidgin/gtklog.c:717 ../pidgin/gtklog.c:779
+#: ../pidgin/gtklog.c:722 ../pidgin/gtklog.c:793
 #, c-format
 msgid "Conversations with %s"
 msgstr "Discuţii cu %s"
 
-#: ../pidgin/gtklog.c:804
+#: ../pidgin/gtklog.c:823
 msgid "System Log"
 msgstr "Înregistrări sistem"
 
-#: ../pidgin/gtkmain.c:386
+#: ../pidgin/gtkmain.c:398
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Încercaţi „%s -h” pentru mai multe informaţii.\n"
 
-#: ../pidgin/gtkmain.c:388
-#, fuzzy, c-format
+#: ../pidgin/gtkmain.c:400
+#, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -15777,6 +16008,7 @@
 "  -n, --nologin       don't automatically login\n"
 "  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
 "                      account(s) to use, separated by commas)\n"
+"  --display=DISPLAY   X display to use\n"
 "  -v, --version       display the current version and exit\n"
 msgstr ""
 "%s %s\n"
@@ -15789,12 +16021,13 @@
 "  -n, --nologin       fără autentificare automată\n"
 "  -l, --login[=NUME]  autentificare automată (argumentul NUME specifică\n"
 "                      conturile de utilizat, despărţite prin virgulă)\n"
+"  --display=ECRAN     ecran X de utilizat\n"
 "  -v, --version       arată versiunea curentă\n"
 
-#: ../pidgin/gtkmain.c:512
-#, fuzzy, c-format
-msgid ""
-"%s has segfaulted and attempted to dump a core file.\n"
+#: ../pidgin/gtkmain.c:528
+#, c-format
+msgid ""
+"%s %s 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"
@@ -15812,17 +16045,17 @@
 "on other protocols is at\n"
 "%swiki/DeveloperPages\n"
 msgstr ""
-"%s s-a blocat (segfault) şi a încercat să scrie un fişier.\n"
+"%s %s s-a blocat (segfault) şi a încercat să scrie un fişier\n"
 "core. Aceasta este o problemă de programare şi nu e din vina\n"
 "utilizatorului.\n"
 "\n"
-"Dacă problema e reproductibilă, notificaţi dezvoltatorii\n"
+"Dacă problema este reproductibilă, notificaţi dezvoltatorii\n"
 "raportând detalii la:\n"
 "%ssimpleticket/\n"
 "\n"
 "Nu uitaţi să specificaţi ce anume făceaţi în acel moment şi să\n"
 "includeţi un backtrace din fişierul core. Dacă nu ştiţi cum să\n"
-"faceţi asta, citiţi instrucţiunile de la:\n"
+"generaţi un backtrace, citiţi instrucţiunile de la:\n"
 "%swiki/GetABacktrace\n"
 "\n"
 "Dacă aveţi nevoie de ajutor suplimentar, contactaţi-i pe \n"
@@ -15832,19 +16065,19 @@
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:699 ../pidgin/pidgin.h:51
+#: ../pidgin/gtkmain.c:718 ../pidgin/pidgin.h:51
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#: ../pidgin/gtknotify.c:349
+#: ../pidgin/gtknotify.c:350
 msgid "Open All Messages"
 msgstr "Deschide toate mesajele"
 
-#: ../pidgin/gtknotify.c:402
+#: ../pidgin/gtknotify.c:403
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Aveţi mail nou!</span>"
 
-#: ../pidgin/gtknotify.c:540
+#: ../pidgin/gtknotify.c:546
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
@@ -15852,30 +16085,30 @@
 msgstr[1] "%s are %d mesaje noi."
 msgstr[2] "%s are %d de mesaje noi."
 
-#: ../pidgin/gtknotify.c:564
-#, fuzzy, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
-msgstr[0] "<b>Aveţi un mail nou.</b>"
-msgstr[1] "<b>Aveţi %d mailuri noi.</b>"
-msgstr[2] "<b>Aveţi %d de mailuri noi.</b>"
-
-#: ../pidgin/gtknotify.c:989
+#: ../pidgin/gtknotify.c:570
+#, c-format
+msgid "<b>%d new e-mail.</b>"
+msgid_plural "<b>%d new e-mails.</b>"
+msgstr[0] "<b>un mail nou.</b>"
+msgstr[1] "<b>%d mailuri noi.</b>"
+msgstr[2] "<b>%d de mailuri noi.</b>"
+
+#: ../pidgin/gtknotify.c:998
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "Navigatorul „%s” este invalid."
 
-#: ../pidgin/gtknotify.c:991 ../pidgin/gtknotify.c:1003
-#: ../pidgin/gtknotify.c:1016 ../pidgin/gtknotify.c:1144
+#: ../pidgin/gtknotify.c:1000 ../pidgin/gtknotify.c:1012
+#: ../pidgin/gtknotify.c:1025 ../pidgin/gtknotify.c:1153
 msgid "Unable to open URL"
 msgstr "Nu se poate deschide acest URL"
 
-#: ../pidgin/gtknotify.c:1001 ../pidgin/gtknotify.c:1014
+#: ../pidgin/gtknotify.c:1010 ../pidgin/gtknotify.c:1023
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Eroare la pornirea „%s”: %s"
 
-#: ../pidgin/gtknotify.c:1145
+#: ../pidgin/gtknotify.c:1154
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
@@ -15894,7 +16127,18 @@
 msgid "Unload Plugins"
 msgstr "Dezactivare module"
 
-#: ../pidgin/gtkplugin.c:400
+#: ../pidgin/gtkplugin.c:308
+msgid "Could not unload plugin"
+msgstr "Nu s-a putut descărca modulul"
+
+#: ../pidgin/gtkplugin.c:309
+msgid ""
+"The plugin could not be unloaded now, but will be disabled at the next "
+"startup."
+msgstr ""
+"Modulul nu a putut fi descărcat din memorie acum, dar va fi dezactivat la următoarea pornire."
+
+#: ../pidgin/gtkplugin.c:417
 #, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
@@ -15905,7 +16149,7 @@
 "<span weight=\"bold\">Adresă Internet:</span>\t\t%s\n"
 "<span weight=\"bold\">Nume fişier:</span>\t\t%s"
 
-#: ../pidgin/gtkplugin.c:410
+#: ../pidgin/gtkplugin.c:427
 #, c-format
 msgid ""
 "%s\n"
@@ -15916,11 +16160,11 @@
 "<span foreground=\"#ff0000\" weight=\"bold\">Eroare: %s\n"
 "Verificaţi adresa Internet a modulului pentru o versiune mai nouă.</span>"
 
-#: ../pidgin/gtkplugin.c:536
+#: ../pidgin/gtkplugin.c:562
 msgid "Configure Pl_ugin"
 msgstr "Configurare _modul"
 
-#: ../pidgin/gtkplugin.c:599
+#: ../pidgin/gtkplugin.c:625
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Detalii modul</b>"
 
@@ -15929,95 +16173,95 @@
 msgstr "Selectaţi un fişier"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:532
+#: ../pidgin/gtkpounce.c:547
 msgid "Pounce on Whom"
 msgstr "Întâmpinare pentru"
 
-#: ../pidgin/gtkpounce.c:559
+#: ../pidgin/gtkpounce.c:574
 msgid "_Buddy name:"
 msgstr "Nu_me contact:"
 
-#: ../pidgin/gtkpounce.c:593
+#: ../pidgin/gtkpounce.c:608
 msgid "Si_gns on"
 msgstr "_Autentificare"
 
-#: ../pidgin/gtkpounce.c:595
+#: ../pidgin/gtkpounce.c:610
 msgid "Signs o_ff"
 msgstr "_Deconectare"
 
-#: ../pidgin/gtkpounce.c:597
+#: ../pidgin/gtkpounce.c:612
 msgid "Goes a_way"
 msgstr "Intrarea în a_bsenţă"
 
-#: ../pidgin/gtkpounce.c:599
+#: ../pidgin/gtkpounce.c:614
 msgid "Ret_urns from away"
 msgstr "Întoarcerea din abs_enţă"
 
-#: ../pidgin/gtkpounce.c:601
+#: ../pidgin/gtkpounce.c:616
 msgid "Becomes _idle"
 msgstr "Intrarea în inacti_vitate"
 
-#: ../pidgin/gtkpounce.c:603
+#: ../pidgin/gtkpounce.c:618
 msgid "Is no longer i_dle"
 msgstr "Revenirea din inac_tivitate"
 
-#: ../pidgin/gtkpounce.c:605
+#: ../pidgin/gtkpounce.c:620
 msgid "Starts _typing"
 msgstr "Tastarea unui mesaj _nou"
 
-#: ../pidgin/gtkpounce.c:607
+#: ../pidgin/gtkpounce.c:622
 msgid "P_auses while typing"
 msgstr "Pau_ză în timpul tastării"
 
-#: ../pidgin/gtkpounce.c:609
+#: ../pidgin/gtkpounce.c:624
 msgid "Stops t_yping"
 msgstr "O_prirea din tastare"
 
-#: ../pidgin/gtkpounce.c:611
+#: ../pidgin/gtkpounce.c:626
 msgid "Sends a _message"
 msgstr "Trimiterea unui _mesaj"
 
-#: ../pidgin/gtkpounce.c:654
+#: ../pidgin/gtkpounce.c:669
 msgid "Ope_n an IM window"
 msgstr "Desc_hide o discuţie"
 
-#: ../pidgin/gtkpounce.c:656
+#: ../pidgin/gtkpounce.c:671
 msgid "_Pop up a notification"
 msgstr "Deschide _o fereastră de notificare"
 
-#: ../pidgin/gtkpounce.c:658
+#: ../pidgin/gtkpounce.c:673
 msgid "Send a _message"
 msgstr "Trimite un mesa_j"
 
-#: ../pidgin/gtkpounce.c:660
+#: ../pidgin/gtkpounce.c:675
 msgid "E_xecute a command"
 msgstr "E_xecută o comandă"
 
-#: ../pidgin/gtkpounce.c:662
+#: ../pidgin/gtkpounce.c:677
 msgid "P_lay a sound"
 msgstr "Redă _un sunet"
 
-#: ../pidgin/gtkpounce.c:668
+#: ../pidgin/gtkpounce.c:683
 msgid "Brows_e..."
 msgstr "Na_vigare..."
 
-#: ../pidgin/gtkpounce.c:670
+#: ../pidgin/gtkpounce.c:685
 msgid "Br_owse..."
 msgstr "Navi_gare..."
 
-#: ../pidgin/gtkpounce.c:671
+#: ../pidgin/gtkpounce.c:686
 msgid "Pre_view"
 msgstr "_Testare"
 
-#: ../pidgin/gtkpounce.c:798
+#: ../pidgin/gtkpounce.c:818
 msgid "P_ounce only when my status is not Available"
 msgstr "Întâmpinare doar în starea de _indisponibilitate"
 
-#: ../pidgin/gtkpounce.c:803
+#: ../pidgin/gtkpounce.c:823
 msgid "_Recurring"
 msgstr "Re_curentă"
 
-#: ../pidgin/gtkpounce.c:1246
+#: ../pidgin/gtkpounce.c:1266
 msgid "Pounce Target"
 msgstr "Ţintă întâmpinare"
 
@@ -16034,7 +16278,7 @@
 msgid "Install Theme"
 msgstr "Instalare temă"
 
-#: ../pidgin/gtkprefs.c:697
+#: ../pidgin/gtkprefs.c:698
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
@@ -16043,15 +16287,15 @@
 "utilizaţi. Prin tragere şi plasare cu mausul puteţi adăuga teme noi în "
 "această listă."
 
-#: ../pidgin/gtkprefs.c:732
+#: ../pidgin/gtkprefs.c:733
 msgid "Icon"
 msgstr "Iconiţă"
 
-#: ../pidgin/gtkprefs.c:894
+#: ../pidgin/gtkprefs.c:895
 msgid "System Tray Icon"
 msgstr "Iconiţă în zona de notificare"
 
-#: ../pidgin/gtkprefs.c:895
+#: ../pidgin/gtkprefs.c:896
 msgid "_Show system tray icon:"
 msgstr "Arată iconiţa din _zona de notificare:"
 
@@ -16059,117 +16303,120 @@
 msgid "On unread messages"
 msgstr "Pentru mesajele necitite"
 
-#: ../pidgin/gtkprefs.c:904
+#: ../pidgin/gtkprefs.c:905
 msgid "Conversation Window Hiding"
 msgstr "Ascundere ferestre de discuţii"
 
-#: ../pidgin/gtkprefs.c:905
+#: ../pidgin/gtkprefs.c:906
 msgid "_Hide new IM conversations:"
 msgstr "Ascunde discuţiile _noi:"
 
-#: ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1944
+#: ../pidgin/gtkprefs.c:909 ../pidgin/gtkprefs.c:2045
 msgid "When away"
 msgstr "În absenţă"
 
 #. All the tab options!
-#: ../pidgin/gtkprefs.c:916
+#: ../pidgin/gtkprefs.c:917
 msgid "Tabs"
 msgstr "Taburi"
 
-#: ../pidgin/gtkprefs.c:918
+#: ../pidgin/gtkprefs.c:919
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Arată _discuţiile şi chat-urile în taburi"
 
-#: ../pidgin/gtkprefs.c:932
+#: ../pidgin/gtkprefs.c:933
 msgid "Show close b_utton on tabs"
 msgstr "Arată _butoanele de închidere a taburilor"
 
-#: ../pidgin/gtkprefs.c:935
+#: ../pidgin/gtkprefs.c:936
 msgid "_Placement:"
 msgstr "_Plasament:"
 
-#: ../pidgin/gtkprefs.c:937
+#: ../pidgin/gtkprefs.c:938
 msgid "Top"
 msgstr "Sus"
 
-#: ../pidgin/gtkprefs.c:938
+#: ../pidgin/gtkprefs.c:939
 msgid "Bottom"
 msgstr "Jos"
 
-#: ../pidgin/gtkprefs.c:939
+#: ../pidgin/gtkprefs.c:940
 msgid "Left"
 msgstr "În stânga"
 
-#: ../pidgin/gtkprefs.c:940
+#: ../pidgin/gtkprefs.c:941
 msgid "Right"
 msgstr "În dreapta"
 
-#: ../pidgin/gtkprefs.c:942
+#: ../pidgin/gtkprefs.c:943
 msgid "Left Vertical"
 msgstr "Vertical în stânga"
 
-#: ../pidgin/gtkprefs.c:943
+#: ../pidgin/gtkprefs.c:944
 msgid "Right Vertical"
 msgstr "Vertical in dreapta"
 
-#: ../pidgin/gtkprefs.c:950
+#: ../pidgin/gtkprefs.c:951
 msgid "N_ew conversations:"
 msgstr "D_iscuţii noi:"
 
-#: ../pidgin/gtkprefs.c:995
+#: ../pidgin/gtkprefs.c:997
 msgid "Show _formatting on incoming messages"
 msgstr "Păstrează _formatarea mesajelor primite"
 
-#: ../pidgin/gtkprefs.c:998
-#, fuzzy
+#: ../pidgin/gtkprefs.c:999
+msgid "Close IMs immediately when the tab is closed"
+msgstr "Închide discuţiile imediat după închiderea tabului"
+
+#: ../pidgin/gtkprefs.c:1002
 msgid "Show _detailed information"
-msgstr "Arată informaţiile de autentificare"
-
-#: ../pidgin/gtkprefs.c:1000
+msgstr "Arată informaţii _detaliate"
+
+#: ../pidgin/gtkprefs.c:1004
 msgid "Enable buddy ic_on animation"
 msgstr "Activea_ză animaţiile avatarurilor"
 
-#: ../pidgin/gtkprefs.c:1007
+#: ../pidgin/gtkprefs.c:1011
 msgid "_Notify buddies that you are typing to them"
 msgstr "Notifică contactele când le scri_u"
 
-#: ../pidgin/gtkprefs.c:1010
+#: ../pidgin/gtkprefs.c:1014
 msgid "Highlight _misspelled words"
 msgstr "_Evidenţiază greşelile de ortografie"
 
-#: ../pidgin/gtkprefs.c:1014
+#: ../pidgin/gtkprefs.c:1018
 msgid "Use smooth-scrolling"
 msgstr "Derulare cu efect"
 
-#: ../pidgin/gtkprefs.c:1017
+#: ../pidgin/gtkprefs.c:1021
 msgid "F_lash window when IMs are received"
 msgstr "_Evidenţiază fereastra la primirea de mesaje"
 
-#: ../pidgin/gtkprefs.c:1019
+#: ../pidgin/gtkprefs.c:1023
 msgid "Minimi_ze new conversation windows"
 msgstr "Minimi_zează noile ferestre de discuţii"
 
-#: ../pidgin/gtkprefs.c:1023
-msgid "Font"
-msgstr "Font"
-
-#: ../pidgin/gtkprefs.c:1025
-msgid "Use document font from _theme"
-msgstr "Utilizează fontul precizat în _temă pentru documente"
-
 #: ../pidgin/gtkprefs.c:1027
+msgid "Font"
+msgstr "Font"
+
+#: ../pidgin/gtkprefs.c:1029
+msgid "Use document font from _theme"
+msgstr "Utilizează fontul precizat în _temă pentru documente"
+
+#: ../pidgin/gtkprefs.c:1031
 msgid "Use font from _theme"
 msgstr "Utilizează fontul din _temă"
 
-#: ../pidgin/gtkprefs.c:1029
+#: ../pidgin/gtkprefs.c:1033
 msgid "Conversation _font:"
 msgstr "_Font discuţii:"
 
-#: ../pidgin/gtkprefs.c:1043
+#: ../pidgin/gtkprefs.c:1047
 msgid "Default Formatting"
 msgstr "Formatare implicită"
 
-#: ../pidgin/gtkprefs.c:1062
+#: ../pidgin/gtkprefs.c:1066
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
@@ -16177,119 +16424,155 @@
 "Aşa vor arăta mesajele trimise utilizând protocoalele ce suportă formatarea "
 "mesajelor."
 
-#: ../pidgin/gtkprefs.c:1128
+#: ../pidgin/gtkprefs.c:1126
+msgid "Cannot start proxy configuration program."
+msgstr "Nu s-a putut porni programul de configurare a unui proxy."
+
+#: ../pidgin/gtkprefs.c:1138
+msgid "Cannot start browser configuration program."
+msgstr "Nu s-a putut porni programul de configurare a unui navigator."
+
+#: ../pidgin/gtkprefs.c:1158
 msgid "ST_UN server:"
 msgstr "Server ST_UN:"
 
-#: ../pidgin/gtkprefs.c:1140
+#: ../pidgin/gtkprefs.c:1170
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Exemplu: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1144
+#: ../pidgin/gtkprefs.c:1174
 msgid "_Autodetect IP address"
 msgstr "_Autodetectare adresă IP"
 
-#: ../pidgin/gtkprefs.c:1153
+#: ../pidgin/gtkprefs.c:1183
 msgid "Public _IP:"
 msgstr "_IP public:"
 
-#: ../pidgin/gtkprefs.c:1182
+#: ../pidgin/gtkprefs.c:1214
 msgid "Ports"
 msgstr "Porturi"
 
-#: ../pidgin/gtkprefs.c:1185
+#: ../pidgin/gtkprefs.c:1217
 msgid "_Manually specify range of ports to listen on"
 msgstr "P_orturi de utilizat"
 
-#: ../pidgin/gtkprefs.c:1188
+#: ../pidgin/gtkprefs.c:1220
 msgid "_Start port:"
 msgstr "_De la:"
 
-#: ../pidgin/gtkprefs.c:1195
+#: ../pidgin/gtkprefs.c:1227
 msgid "_End port:"
 msgstr "_Până la:"
 
-#: ../pidgin/gtkprefs.c:1203
-msgid "Proxy Server"
-msgstr "Server proxy"
-
-#: ../pidgin/gtkprefs.c:1207
-msgid "No proxy"
-msgstr "Fără proxy"
+#: ../pidgin/gtkprefs.c:1235
+msgid "Proxy Server &amp; Browser"
+msgstr "Server proxy &amp; navigator"
+
+#: ../pidgin/gtkprefs.c:1243
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>Nu s-a găsit programul de configurare a unui proxy</b>"
+
+#: ../pidgin/gtkprefs.c:1251
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>Nu s-a găsit programul de configurare a unui navigator</b>"
+
+#: ../pidgin/gtkprefs.c:1256
+msgid ""
+"Proxy & Browser preferences are configured\n"
+"in GNOME Preferences"
+msgstr ""
+"Opţiunile pentru proxy şi navigator pot fi\n"
+"schimbate în Preferinţele GNOME"
 
 #: ../pidgin/gtkprefs.c:1263
+msgid "Configure _Proxy"
+msgstr "Configurare _proxy"
+
+#: ../pidgin/gtkprefs.c:1268
+msgid "Configure _Browser"
+msgstr "Configurare _navigator"
+
+#: ../pidgin/gtkprefs.c:1274
+msgid "Proxy Server"
+msgstr "Server proxy"
+
+#: ../pidgin/gtkprefs.c:1279
+msgid "No proxy"
+msgstr "Fără proxy"
+
+#: ../pidgin/gtkprefs.c:1335
 msgid "_User:"
 msgstr "Utili_zator:"
 
-#: ../pidgin/gtkprefs.c:1328
+#: ../pidgin/gtkprefs.c:1423
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1329
+#: ../pidgin/gtkprefs.c:1424
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1330
+#: ../pidgin/gtkprefs.c:1425
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1331
+#: ../pidgin/gtkprefs.c:1426
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1332
+#: ../pidgin/gtkprefs.c:1427
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1333
+#: ../pidgin/gtkprefs.c:1428
 msgid "GNOME Default"
 msgstr "Navigatorul Gnome"
 
-#: ../pidgin/gtkprefs.c:1334
+#: ../pidgin/gtkprefs.c:1429
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1335
+#: ../pidgin/gtkprefs.c:1430
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1336
+#: ../pidgin/gtkprefs.c:1431
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1337
+#: ../pidgin/gtkprefs.c:1432
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1346
+#: ../pidgin/gtkprefs.c:1441
 msgid "Manual"
 msgstr "Manual"
 
-#: ../pidgin/gtkprefs.c:1399
+#: ../pidgin/gtkprefs.c:1494
 msgid "Browser Selection"
 msgstr "Navigator preferat"
 
-#: ../pidgin/gtkprefs.c:1403
+#: ../pidgin/gtkprefs.c:1498
 msgid "_Browser:"
 msgstr "_Navigator:"
 
-#: ../pidgin/gtkprefs.c:1411
+#: ../pidgin/gtkprefs.c:1506
 msgid "_Open link in:"
 msgstr "_Deschide adresa:"
 
-#: ../pidgin/gtkprefs.c:1413
+#: ../pidgin/gtkprefs.c:1508
 msgid "Browser default"
 msgstr "După cum e setat navigatorul"
 
-#: ../pidgin/gtkprefs.c:1414
+#: ../pidgin/gtkprefs.c:1509
 msgid "Existing window"
 msgstr "Într-o fereastră existentă"
 
-#: ../pidgin/gtkprefs.c:1416
+#: ../pidgin/gtkprefs.c:1511
 msgid "New tab"
 msgstr "Într-un tab nou"
 
-#: ../pidgin/gtkprefs.c:1430
+#: ../pidgin/gtkprefs.c:1525
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -16298,69 +16581,63 @@
 "_Manual:\n"
 "(%s pentru adresă)"
 
-#: ../pidgin/gtkprefs.c:1470
+#: ../pidgin/gtkprefs.c:1566
 msgid "Log _format:"
 msgstr "_Format înregistrări:"
 
-#: ../pidgin/gtkprefs.c:1475
+#: ../pidgin/gtkprefs.c:1571
 msgid "Log all _instant messages"
 msgstr "Înregistrează toate _mesajele"
 
-#: ../pidgin/gtkprefs.c:1477
+#: ../pidgin/gtkprefs.c:1573
 msgid "Log all c_hats"
 msgstr "Înregistrează _toate chat-urile"
 
-#: ../pidgin/gtkprefs.c:1479
+#: ../pidgin/gtkprefs.c:1575
 msgid "Log all _status changes to system log"
 msgstr "Înregistrează toate schimbările de _status în înregistrările sistem"
 
-#: ../pidgin/gtkprefs.c:1625
+#: ../pidgin/gtkprefs.c:1725
 msgid "Sound Selection"
 msgstr "Selectaţi un sunet"
 
-#: ../pidgin/gtkprefs.c:1635
-#, c-format
+#: ../pidgin/gtkprefs.c:1735
 msgid "Quietest"
 msgstr "Foarte încet"
 
-#: ../pidgin/gtkprefs.c:1637
-#, c-format
+#: ../pidgin/gtkprefs.c:1737
 msgid "Quieter"
 msgstr "Mai încet"
 
-#: ../pidgin/gtkprefs.c:1639
-#, c-format
+#: ../pidgin/gtkprefs.c:1739
 msgid "Quiet"
 msgstr "Încet"
 
-#: ../pidgin/gtkprefs.c:1643
-#, c-format
+#: ../pidgin/gtkprefs.c:1743
 msgid "Loud"
 msgstr "Tare"
 
-#: ../pidgin/gtkprefs.c:1645
-#, c-format
+#: ../pidgin/gtkprefs.c:1745
 msgid "Louder"
 msgstr "Mai tare"
 
-#: ../pidgin/gtkprefs.c:1647
-#, c-format
+#: ../pidgin/gtkprefs.c:1747
 msgid "Loudest"
 msgstr "Foarte tare"
 
-#: ../pidgin/gtkprefs.c:1713
+#: ../pidgin/gtkprefs.c:1813
 msgid "_Method:"
 msgstr "_Sistem:"
 
-#: ../pidgin/gtkprefs.c:1715
+#: ../pidgin/gtkprefs.c:1815
 msgid "Console beep"
 msgstr "Bip"
 
-#: ../pidgin/gtkprefs.c:1722
+#: ../pidgin/gtkprefs.c:1822
 msgid "No sounds"
 msgstr "Fără sunete"
 
-#: ../pidgin/gtkprefs.c:1730
+#: ../pidgin/gtkprefs.c:1830
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -16369,82 +16646,81 @@
 "Comandă de _redare sunet\n"
 "(%s pentru numele fişierului)"
 
-#: ../pidgin/gtkprefs.c:1757
+#: ../pidgin/gtkprefs.c:1857
 msgid "Sounds when conversation has _focus"
 msgstr "Utilizează sunete când fereastra de discuţii are _focus"
 
-#: ../pidgin/gtkprefs.c:1759
+#: ../pidgin/gtkprefs.c:1859
 msgid "Enable sounds:"
 msgstr "Activare sunete:"
 
-#: ../pidgin/gtkprefs.c:1770
+#: ../pidgin/gtkprefs.c:1870
 msgid "Volume:"
 msgstr "Volum:"
 
-#: ../pidgin/gtkprefs.c:1850
+#: ../pidgin/gtkprefs.c:1950
 msgid "Play"
 msgstr "Redare"
 
-#: ../pidgin/gtkprefs.c:1927
+#: ../pidgin/gtkprefs.c:2028
 msgid "_Report idle time:"
 msgstr "_Raportează inactivitatea:"
 
-#: ../pidgin/gtkprefs.c:1932
+#: ../pidgin/gtkprefs.c:2033
 msgid "Based on keyboard or mouse use"
 msgstr "În funcţie de activitatea utilizatorului"
 
-#: ../pidgin/gtkprefs.c:1941
+#: ../pidgin/gtkprefs.c:2042
 msgid "_Auto-reply:"
 msgstr "Răspunsuri _automate:"
 
-#: ../pidgin/gtkprefs.c:1945
+#: ../pidgin/gtkprefs.c:2046
 msgid "When both away and idle"
 msgstr "În absenţă şi inactivitate"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1951
+#: ../pidgin/gtkprefs.c:2052
 msgid "Auto-away"
 msgstr "Absenţe automate"
 
-#: ../pidgin/gtkprefs.c:1953
+#: ../pidgin/gtkprefs.c:2054
 msgid "Change status when _idle"
 msgstr "Schimbă statusul în _inactivitate"
 
-#: ../pidgin/gtkprefs.c:1957
-#, fuzzy
+#: ../pidgin/gtkprefs.c:2058
 msgid "_Minutes before becoming idle:"
-msgstr "_Minute înaintea schimbării statusului:"
-
-#: ../pidgin/gtkprefs.c:1965
+msgstr "_Minute înaintea intrării în inactivitate:"
+
+#: ../pidgin/gtkprefs.c:2066
 msgid "Change _status to:"
 msgstr "Schimbă _statusul în:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1986
+#: ../pidgin/gtkprefs.c:2087
 msgid "Status at Startup"
 msgstr "Status la pornire"
 
-#: ../pidgin/gtkprefs.c:1988
+#: ../pidgin/gtkprefs.c:2089
 msgid "Use status from last _exit at startup"
 msgstr "Utilizează _ultimul status"
 
-#: ../pidgin/gtkprefs.c:1994
+#: ../pidgin/gtkprefs.c:2095
 msgid "Status to a_pply at startup:"
 msgstr "Status de setat la _pornire:"
 
-#: ../pidgin/gtkprefs.c:2032
+#: ../pidgin/gtkprefs.c:2134
 msgid "Interface"
 msgstr "Interfaţă"
 
-#: ../pidgin/gtkprefs.c:2034
+#: ../pidgin/gtkprefs.c:2136
 msgid "Smiley Themes"
 msgstr "Teme iconiţe"
 
-#: ../pidgin/gtkprefs.c:2041
+#: ../pidgin/gtkprefs.c:2143
 msgid "Browser"
 msgstr "Navigator"
 
-#: ../pidgin/gtkprefs.c:2045
+#: ../pidgin/gtkprefs.c:2147
 msgid "Status / Idle"
 msgstr "Statusuri"
 
@@ -16468,103 +16744,103 @@
 msgid "Block only the users below"
 msgstr "Blochează doar utilizatorii de mai jos"
 
-#: ../pidgin/gtkprivacy.c:370
+#: ../pidgin/gtkprivacy.c:372
 msgid "Privacy"
 msgstr "Securitate"
 
-#: ../pidgin/gtkprivacy.c:382
+#: ../pidgin/gtkprivacy.c:384
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Setările de securitate intră în acţiune instantaneu."
 
 #. "Set privacy for:" label
-#: ../pidgin/gtkprivacy.c:394
+#: ../pidgin/gtkprivacy.c:396
 msgid "Set privacy for:"
 msgstr "Setări de securitate pentru:"
 
-#: ../pidgin/gtkprivacy.c:557 ../pidgin/gtkprivacy.c:574
+#: ../pidgin/gtkprivacy.c:559 ../pidgin/gtkprivacy.c:576
 msgid "Permit User"
 msgstr "Permite utilizatorul"
 
-#: ../pidgin/gtkprivacy.c:558
+#: ../pidgin/gtkprivacy.c:560
 msgid "Type a user you permit to contact you."
 msgstr "Introduceţi un utilizator care să vă poată contacta."
 
-#: ../pidgin/gtkprivacy.c:559
+#: ../pidgin/gtkprivacy.c:561
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "Introduceţi numele utilizatorului care doriţi să vă poată contacta."
 
-#: ../pidgin/gtkprivacy.c:562 ../pidgin/gtkprivacy.c:578
+#: ../pidgin/gtkprivacy.c:564 ../pidgin/gtkprivacy.c:580
 msgid "_Permit"
 msgstr "_Permite"
 
-#: ../pidgin/gtkprivacy.c:568
+#: ../pidgin/gtkprivacy.c:570
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Are voie %s să vă contacteze?"
 
-#: ../pidgin/gtkprivacy.c:570
+#: ../pidgin/gtkprivacy.c:572
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Sigur doriţi ca %s să vă poată contacta?"
 
-#: ../pidgin/gtkprivacy.c:599 ../pidgin/gtkprivacy.c:613
+#: ../pidgin/gtkprivacy.c:601 ../pidgin/gtkprivacy.c:615
 msgid "Block User"
 msgstr "Blocare utilizator"
 
-#: ../pidgin/gtkprivacy.c:600
+#: ../pidgin/gtkprivacy.c:602
 msgid "Type a user to block."
 msgstr "Introduceţi un utilizator pe care să-l blocaţi."
 
-#: ../pidgin/gtkprivacy.c:601
+#: ../pidgin/gtkprivacy.c:603
 msgid "Please enter the name of the user you wish to block."
 msgstr "Introduceţi numele utilizatorului pe care doriţi să-l blocaţi."
 
-#: ../pidgin/gtkprivacy.c:609
+#: ../pidgin/gtkprivacy.c:611
 #, c-format
 msgid "Block %s?"
 msgstr "Doriţi să blocaţi utilizatorul %s?"
 
-#: ../pidgin/gtkprivacy.c:611
+#: ../pidgin/gtkprivacy.c:613
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Sigur doriţi ca %s să nu vă poată contacta?"
 
-#: ../pidgin/gtkrequest.c:272
+#: ../pidgin/gtkrequest.c:322
 msgid "Apply"
 msgstr "Aplică"
 
-#: ../pidgin/gtkrequest.c:1507
+#: ../pidgin/gtkrequest.c:1651
 msgid "That file already exists"
 msgstr "Acest fişier există deja."
 
-#: ../pidgin/gtkrequest.c:1508
+#: ../pidgin/gtkrequest.c:1652
 msgid "Would you like to overwrite it?"
 msgstr "Doriţi să îl suprascrieţi?"
 
-#: ../pidgin/gtkrequest.c:1511
+#: ../pidgin/gtkrequest.c:1655
 msgid "Overwrite"
 msgstr "Suprascriere"
 
-#: ../pidgin/gtkrequest.c:1512
+#: ../pidgin/gtkrequest.c:1656
 msgid "Choose New Name"
 msgstr "Nume nou"
 
-#: ../pidgin/gtkrequest.c:1650 ../pidgin/gtkrequest.c:1664
+#: ../pidgin/gtkrequest.c:1797 ../pidgin/gtkrequest.c:1811
 msgid "Select Folder..."
 msgstr "Alegeţi un director..."
 
 #. Create the window.
-#: ../pidgin/gtkroomlist.c:375
+#: ../pidgin/gtkroomlist.c:518 ../pidgin/gtkroomlist.c:688
 msgid "Room List"
 msgstr "Listă camere de chat"
 
 #. list button
-#: ../pidgin/gtkroomlist.c:443
+#: ../pidgin/gtkroomlist.c:756
 msgid "_Get List"
 msgstr "_Obţine lista"
 
 #. add button
-#: ../pidgin/gtkroomlist.c:451
+#: ../pidgin/gtkroomlist.c:764
 msgid "_Add Chat"
 msgstr "_Adaugă un chat"
 
@@ -16573,7 +16849,7 @@
 msgstr "Sigur doriţi să ştergeţi întâmpinarea la %s pentru %s?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:620 ../pidgin/gtksavedstatuses.c:1266
+#: ../pidgin/gtksavedstatuses.c:620 ../pidgin/gtksavedstatuses.c:1273
 msgid "_Use"
 msgstr "_Utilizează"
 
@@ -16581,29 +16857,29 @@
 msgid "Title already in use.  You must choose a unique title."
 msgstr "Titlu utilizat deja. E necesară alegerea unui titlu unic."
 
-#: ../pidgin/gtksavedstatuses.c:970
+#: ../pidgin/gtksavedstatuses.c:976
 msgid "Different"
 msgstr "Diferit"
 
-#: ../pidgin/gtksavedstatuses.c:1159
+#: ../pidgin/gtksavedstatuses.c:1165
 msgid "_Title:"
 msgstr "_Titlu:"
 
-#: ../pidgin/gtksavedstatuses.c:1178 ../pidgin/gtksavedstatuses.c:1497
+#: ../pidgin/gtksavedstatuses.c:1184 ../pidgin/gtksavedstatuses.c:1505
 msgid "_Status:"
 msgstr "St_atus:"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1210
+#: ../pidgin/gtksavedstatuses.c:1217
 msgid "Use a _different status for some accounts"
 msgstr "Utilizează un status _diferit pentru unele conturi"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1274
+#: ../pidgin/gtksavedstatuses.c:1281
 msgid "Sa_ve & Use"
 msgstr "Sal_vează şi utilizează"
 
-#: ../pidgin/gtksavedstatuses.c:1480
+#: ../pidgin/gtksavedstatuses.c:1488
 #, c-format
 msgid "Status for %s"
 msgstr "Status pentru %s"
@@ -16612,25 +16888,33 @@
 msgid "Waiting for network connection"
 msgstr "Se aşteaptă revenirea conexiunii de reţea"
 
-#: ../pidgin/gtkutils.c:632
+#: ../pidgin/gtkstatusbox.c:1072
+msgid "New status..."
+msgstr "Status nou..."
+
+#: ../pidgin/gtkstatusbox.c:1073
+msgid "Saved statuses..."
+msgstr "Statusuri salvate..."
+
+#: ../pidgin/gtkutils.c:634
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1399 ../pidgin/gtkutils.c:1422
+#: ../pidgin/gtkutils.c:1401 ../pidgin/gtkutils.c:1424
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "Următoarea eroare a apărut la încărcarea %s: %s"
 
-#: ../pidgin/gtkutils.c:1402 ../pidgin/gtkutils.c:1424
+#: ../pidgin/gtkutils.c:1404 ../pidgin/gtkutils.c:1426
 msgid "Failed to load image"
 msgstr "Încărcarea imaginii a eşuat"
 
-#: ../pidgin/gtkutils.c:1498
+#: ../pidgin/gtkutils.c:1500
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Nu se poate trimite directorul %s."
 
-#: ../pidgin/gtkutils.c:1499
+#: ../pidgin/gtkutils.c:1501
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
@@ -16639,12 +16923,12 @@
 "În %s nu se pot transfera directoare. Va trebui să trimiteţi fişierele "
 "individual."
 
-#: ../pidgin/gtkutils.c:1531 ../pidgin/gtkutils.c:1543
-#: ../pidgin/gtkutils.c:1550
+#: ../pidgin/gtkutils.c:1535 ../pidgin/gtkutils.c:1547
+#: ../pidgin/gtkutils.c:1554
 msgid "You have dragged an image"
 msgstr "Aţi tras şi plasat o imagine"
 
-#: ../pidgin/gtkutils.c:1532
+#: ../pidgin/gtkutils.c:1536
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
@@ -16652,23 +16936,23 @@
 "Puteţi trimite această imagine printr-un transfer de fişiere, o puteţi "
 "insera în acest mesaj sau o puteţi seta ca avatar pentru acest contact."
 
-#: ../pidgin/gtkutils.c:1538 ../pidgin/gtkutils.c:1558
+#: ../pidgin/gtkutils.c:1542 ../pidgin/gtkutils.c:1562
 msgid "Set as buddy icon"
 msgstr "Setează ca avatar"
 
-#: ../pidgin/gtkutils.c:1539 ../pidgin/gtkutils.c:1559
+#: ../pidgin/gtkutils.c:1543 ../pidgin/gtkutils.c:1563
 msgid "Send image file"
 msgstr "Transferă fişierul"
 
-#: ../pidgin/gtkutils.c:1540 ../pidgin/gtkutils.c:1559
+#: ../pidgin/gtkutils.c:1544 ../pidgin/gtkutils.c:1563
 msgid "Insert in message"
 msgstr "Inserează în mesaj"
 
-#: ../pidgin/gtkutils.c:1544
+#: ../pidgin/gtkutils.c:1548
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Doriţi să o setaţi ca avatar pentru acest contact?"
 
-#: ../pidgin/gtkutils.c:1551
+#: ../pidgin/gtkutils.c:1555
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
@@ -16676,7 +16960,7 @@
 "Puteţi trimite această imagine printr-un transfer de fişiere sau o puteţi "
 "seta ca avatar pentru acest contact."
 
-#: ../pidgin/gtkutils.c:1552
+#: ../pidgin/gtkutils.c:1556
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -16689,11 +16973,11 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1610
+#: ../pidgin/gtkutils.c:1615
 msgid "Cannot send launcher"
 msgstr "Lansatorul nu a putut fi trimis"
 
-#: ../pidgin/gtkutils.c:1610
+#: ../pidgin/gtkutils.c:1615
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -16701,7 +16985,7 @@
 "Aţi tras şi plasat un lansator pentru desktop. Probabil doriţi sa trimiteţi "
 "nu lansatorul în sine, ci fişierul la care face referire."
 
-#: ../pidgin/gtkutils.c:2345
+#: ../pidgin/gtkutils.c:2350
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -16712,25 +16996,25 @@
 "<b>Mărime fişier:</b> %s\n"
 "<b>Mărime imagine:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2641
+#: ../pidgin/gtkutils.c:2646
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr "Fişierul „%s” este prea mare pentru %s. Încercaţi un fişier mai mic.\n"
 
-#: ../pidgin/gtkutils.c:2643
+#: ../pidgin/gtkutils.c:2648
 msgid "Icon Error"
 msgstr "Eroare iconiţă"
 
-#: ../pidgin/gtkutils.c:2644
+#: ../pidgin/gtkutils.c:2649
 msgid "Could not set icon"
 msgstr "Nu s-a putut utiliza iconiţa"
 
-#: ../pidgin/gtkutils.c:2744
+#: ../pidgin/gtkutils.c:2749
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Nu s-a putut deschide fişierul „%s”: %s"
 
-#: ../pidgin/gtkutils.c:2793
+#: ../pidgin/gtkutils.c:2798
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -16756,7 +17040,7 @@
 
 #: ../pidgin/pidginstock.c:91
 msgid "_Get Info"
-msgstr "Caută _detalii"
+msgstr "_Detalii"
 
 #: ../pidgin/pidginstock.c:92
 msgid "_Invite"
@@ -16786,35 +17070,35 @@
 msgid "none"
 msgstr "nimic"
 
-#: ../pidgin/plugins/cap/cap.c:450
+#: ../pidgin/plugins/cap/cap.c:451
 msgid "Display Statistics"
 msgstr "Afişare statistici"
 
-#: ../pidgin/plugins/cap/cap.c:462 ../pidgin/plugins/cap/cap.c:465
+#: ../pidgin/plugins/cap/cap.c:464 ../pidgin/plugins/cap/cap.c:467
 msgid "Response Probability:"
 msgstr "Probabilitate răspunsuri:"
 
-#: ../pidgin/plugins/cap/cap.c:811
+#: ../pidgin/plugins/cap/cap.c:813
 msgid "Statistics Configuration"
 msgstr "Configurare statistici"
 
 #. msg_difference spinner
-#: ../pidgin/plugins/cap/cap.c:814
+#: ../pidgin/plugins/cap/cap.c:816
 msgid "Maximum response timeout:"
 msgstr "Timp maxim de răspuns:"
 
-#: ../pidgin/plugins/cap/cap.c:817 ../pidgin/plugins/cap/cap.c:824
-#: ../pidgin/plugins/cap/cap.c:831 ../pidgin/plugins/timestamp.c:150
+#: ../pidgin/plugins/cap/cap.c:819 ../pidgin/plugins/cap/cap.c:826
+#: ../pidgin/plugins/cap/cap.c:833 ../pidgin/plugins/timestamp.c:150
 msgid "minutes"
 msgstr "minute"
 
 #. last_seen spinner
-#: ../pidgin/plugins/cap/cap.c:821
+#: ../pidgin/plugins/cap/cap.c:823
 msgid "Maximum last-seen difference:"
 msgstr "Diferenţa maximă înregistrată:"
 
 #. threshold spinner
-#: ../pidgin/plugins/cap/cap.c:828
+#: ../pidgin/plugins/cap/cap.c:830
 msgid "Threshold:"
 msgstr "Prag:"
 
@@ -16824,18 +17108,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/cap/cap.c:936
+#: ../pidgin/plugins/cap/cap.c:938
 msgid "Contact Availability Prediction"
 msgstr "Predicţii pentru disponibilitatea contactelor"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/cap/cap.c:938
+#: ../pidgin/plugins/cap/cap.c:940
 msgid "Contact Availability Prediction plugin."
 msgstr "Modul pentru disponibilitatea contactelor"
 
 #. *  summary
-#: ../pidgin/plugins/cap/cap.c:939
+#: ../pidgin/plugins/cap/cap.c:941
 msgid ""
 "The contact availability plugin (cap) is used to display statistical "
 "information about buddies in a users contact list."
@@ -16889,21 +17173,21 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/contact_priority.c:187
+#: ../pidgin/plugins/contact_priority.c:188
 msgid "Contact Priority"
 msgstr "Prioritate contact"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../pidgin/plugins/contact_priority.c:190
+#: ../pidgin/plugins/contact_priority.c:191
 msgid ""
 "Allows for controlling the values associated with different buddy states."
 msgstr ""
 "Permite controlul valorilor asociate cu diferitele stări ale contactelor."
 
 #. *< description
-#: ../pidgin/plugins/contact_priority.c:192
+#: ../pidgin/plugins/contact_priority.c:193
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
@@ -16939,7 +17223,7 @@
 msgid "Received Messages"
 msgstr "Mesaje primite"
 
-#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:251
+#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:245
 #, c-format
 msgid "Select Color for %s"
 msgstr "Alegeţi culoarea pentru %s"
@@ -17208,13 +17492,15 @@
 "corectă."
 
 #: ../pidgin/plugins/gtkbuddynote.c:36
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "<b>Buddy Note</b>: %s"
-msgstr "Notiţe asociate contactelor"
-
-#: ../pidgin/plugins/history.c:188
+msgstr ""
+"\n"
+"<b>Notiţe contact</b>: %s"
+
+#: ../pidgin/plugins/history.c:195
 msgid "History"
 msgstr "Istoric"
 
@@ -17448,7 +17734,7 @@
 "Acesta este un modul trăsnit care:\n"
 "- Vă spune la autentificare cine a scris acest program\n"
 "- Inversează textul mesajelor primite\n"
-"- Trimite la autentificare un mesaj contactelor din listă."
+"- Trimite un mesaj contactelor din listă atunci când se autentifică."
 
 #: ../pidgin/plugins/pidginrc.c:41
 msgid "Cursor Color"
@@ -17466,45 +17752,36 @@
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Separare orizontală GtkTreeView"
 
-#: ../pidgin/plugins/pidginrc.c:73
+#: ../pidgin/plugins/pidginrc.c:69
 msgid "Conversation Entry"
 msgstr "Introducere text"
 
-#: ../pidgin/plugins/pidginrc.c:74
-msgid "Conversation History"
-msgstr "Istoric discuţii"
-
-#: ../pidgin/plugins/pidginrc.c:75
-msgid "Log Viewer"
-msgstr "Vizualizare înregistrări"
-
-#: ../pidgin/plugins/pidginrc.c:76
+#: ../pidgin/plugins/pidginrc.c:70
 msgid "Request Dialog"
 msgstr "Dialog cerere"
 
-#: ../pidgin/plugins/pidginrc.c:77
+#: ../pidgin/plugins/pidginrc.c:71
 msgid "Notify Dialog"
 msgstr "Dialog notificare"
 
-#: ../pidgin/plugins/pidginrc.c:253
+#: ../pidgin/plugins/pidginrc.c:247
 msgid "Select Color"
 msgstr "Alegeţi o culoare"
 
-#: ../pidgin/plugins/pidginrc.c:300
-#, c-format
+#: ../pidgin/plugins/pidginrc.c:294
 msgid "Select Interface Font"
 msgstr "Alegeţi fontul interfeţei"
 
-#: ../pidgin/plugins/pidginrc.c:303
+#: ../pidgin/plugins/pidginrc.c:297
 #, c-format
 msgid "Select Font for %s"
 msgstr "Alegeţi un font pentru %s"
 
-#: ../pidgin/plugins/pidginrc.c:371
+#: ../pidgin/plugins/pidginrc.c:365
 msgid "GTK+ Interface Font"
 msgstr "Font interfaţă GTK+"
 
-#: ../pidgin/plugins/pidginrc.c:391
+#: ../pidgin/plugins/pidginrc.c:385
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Temă combinaţii de taste GTK+ Text"
 
@@ -17528,36 +17805,36 @@
 #. widget_bool_widgets[i]);
 #. }
 #.
-#: ../pidgin/plugins/pidginrc.c:428
+#: ../pidgin/plugins/pidginrc.c:422
 msgid "Interface colors"
 msgstr "Culori interfaţă"
 
-#: ../pidgin/plugins/pidginrc.c:452
+#: ../pidgin/plugins/pidginrc.c:446
 msgid "Widget Sizes"
 msgstr "Mărimi widget-uri"
 
-#: ../pidgin/plugins/pidginrc.c:473
+#: ../pidgin/plugins/pidginrc.c:467
 msgid "Fonts"
 msgstr "Fonturi"
 
-#: ../pidgin/plugins/pidginrc.c:497
+#: ../pidgin/plugins/pidginrc.c:491
 msgid "Gtkrc File Tools"
 msgstr "Unelte fişiere Gtkrc"
 
-#: ../pidgin/plugins/pidginrc.c:502
+#: ../pidgin/plugins/pidginrc.c:496
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "Scrie setările în %s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:511
+#: ../pidgin/plugins/pidginrc.c:505
 msgid "Re-read gtkrc files"
 msgstr "Reciteşte fişierele gtkrc"
 
-#: ../pidgin/plugins/pidginrc.c:544
+#: ../pidgin/plugins/pidginrc.c:543
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Control temă GTK+ Pidgin"
 
-#: ../pidgin/plugins/pidginrc.c:546 ../pidgin/plugins/pidginrc.c:547
+#: ../pidgin/plugins/pidginrc.c:545 ../pidgin/plugins/pidginrc.c:546
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "Permite accesul la cele mai uzuale setări gtkrc."
 
@@ -17679,11 +17956,11 @@
 msgid "Enable replacement of last word on send"
 msgstr "Activează corectarea ultimului cuvânt la trimitere"
 
-#: ../pidgin/plugins/spellchk.c:2370
+#: ../pidgin/plugins/spellchk.c:2372
 msgid "Text replacement"
 msgstr "Corecturi text"
 
-#: ../pidgin/plugins/spellchk.c:2372 ../pidgin/plugins/spellchk.c:2373
+#: ../pidgin/plugins/spellchk.c:2374 ../pidgin/plugins/spellchk.c:2375
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Schimbă mesajele trimise după reguli predefinite de utilizator."
 
@@ -17693,7 +17970,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/ticker/ticker.c:74 ../pidgin/plugins/ticker/ticker.c:354
+#: ../pidgin/plugins/ticker/ticker.c:74 ../pidgin/plugins/ticker/ticker.c:356
 msgid "Buddy Ticker"
 msgstr "Listă glisantă de contacte"
 
@@ -17701,7 +17978,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/ticker/ticker.c:357 ../pidgin/plugins/ticker/ticker.c:359
+#: ../pidgin/plugins/ticker/ticker.c:359 ../pidgin/plugins/ticker/ticker.c:361
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "O versiune glisantă pe orizontală a listei de contacte."
 
@@ -17736,7 +18013,6 @@
 msgstr "Opţiuni de formatare a marcajelor de timp"
 
 #: ../pidgin/plugins/timestamp_format.c:26
-#, c-format
 msgid "_Force 24-hour time format"
 msgstr "_Marcaje de timp tip „24 de ore”"
 
@@ -17906,7 +18182,7 @@
 "Permite alegerea unor opţiuni Pidgin pentru Windows, precum ataşarea listei "
 "de contacte."
 
-#: ../pidgin/plugins/xmppconsole.c:667
+#: ../pidgin/plugins/xmppconsole.c:670
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<font color='#777777'>Deconectat(ă).</font>"
 
@@ -17916,530 +18192,41 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/xmppconsole.c:746 ../pidgin/plugins/xmppconsole.c:841
-#: ../pidgin/plugins/xmppconsole.c:860
+#: ../pidgin/plugins/xmppconsole.c:749 ../pidgin/plugins/xmppconsole.c:844
+#: ../pidgin/plugins/xmppconsole.c:863
 msgid "XMPP Console"
 msgstr "Consolă XMPP"
 
-#: ../pidgin/plugins/xmppconsole.c:753
+#: ../pidgin/plugins/xmppconsole.c:756
 msgid "Account: "
 msgstr "Cont: "
 
-#: ../pidgin/plugins/xmppconsole.c:780
+#: ../pidgin/plugins/xmppconsole.c:783
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>Neconectat(ă) la XMPP</font>"
 
-#: ../pidgin/plugins/xmppconsole.c:790
+#: ../pidgin/plugins/xmppconsole.c:793
 msgid "Insert an <iq/> stanza."
 msgstr "Inserează un bloc brut <iq/>."
 
-#: ../pidgin/plugins/xmppconsole.c:799
+#: ../pidgin/plugins/xmppconsole.c:802
 msgid "Insert a <presence/> stanza."
 msgstr "Inserează un bloc brut <presence/>."
 
-#: ../pidgin/plugins/xmppconsole.c:808
+#: ../pidgin/plugins/xmppconsole.c:811
 msgid "Insert a <message/> stanza."
 msgstr "Inserează un bloc brut <message/>."
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/xmppconsole.c:863
+#: ../pidgin/plugins/xmppconsole.c:866
 msgid "Send and receive raw XMPP stanzas."
 msgstr "Trimitere şi primire blocuri XMPP brute"
 
 #. *  description
-#: ../pidgin/plugins/xmppconsole.c:865
+#: ../pidgin/plugins/xmppconsole.c:868
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 "Acest modul poate fi utilizat pentru depanarea serverelor şi clienţilor XMPP."
 
-#, fuzzy
-#~ msgid "Offline buddies"
-#~ msgstr "Arată contactele deconectate"
-
-#, fuzzy
-#~ msgid "Sort"
-#~ msgstr "Port"
-
-#, fuzzy
-#~ msgid "By Status"
-#~ msgstr "După status"
-
-#, fuzzy
-#~ msgid "By Log Size"
-#~ msgstr "După mărimea înregistrărilor"
-
-#, fuzzy
-#~ msgid "Unable to connect to contact server"
-#~ msgstr "Conectarea la server a eşuat."
-
-#, fuzzy
-#~ msgid "Unable to retrieve MSN Address Book"
-#~ msgstr "Selectaţi agenda Notes"
-
-#, fuzzy
-#~ msgid "Current media"
-#~ msgstr "Verificare curentă"
-
-#, fuzzy
-#~ msgid "Windows Live Messenger Protocol Plugin"
-#~ msgstr "Modul de protocol Novell GroupWise Messenger"
-
-#, fuzzy
-#~ msgid "Windows Live ID authentication Failed"
-#~ msgstr "Autentificarea obişnuită a eşuat!"
-
-#~ msgid "%s just sent you a Nudge!"
-#~ msgstr "%s vă sâcâie cu un „nudge”!"
-
-#, fuzzy
-#~ msgid "Unknown error (%d)"
-#~ msgstr "Eroare necunoscută"
-
-#, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "Conectarea la server a eşuat."
-
-#, fuzzy
-#~ msgid "%s (%s) changed status from %s to %s"
-#~ msgstr "%s şi-a schimbat statusul din %s în %s"
-
-#, fuzzy
-#~ msgid "%s (%s) is now %s"
-#~ msgstr "%s este acum %s"
-
-#, fuzzy
-#~ msgid "%s (%s) is no longer %s"
-#~ msgstr "%s nu mai este %s"
-
-#, fuzzy
-#~ msgid "_Merge"
-#~ msgstr "_Mesaj:"
-
-#, fuzzy
-#~ msgid "_Send File..."
-#~ msgstr "_Trimitere fişier"
-
-#, fuzzy
-#~ msgid "Add Buddy _Pounce..."
-#~ msgstr "Adăugare întâmpinare..."
-
-#, fuzzy
-#~ msgid "Hide when offline"
-#~ msgstr "Permis doar la autentificare"
-
-#, fuzzy
-#~ msgid "Show when offline"
-#~ msgstr "Permis doar la autentificare"
-
-#, fuzzy
-#~ msgid "Add _Buddy..."
-#~ msgstr "Adaugă contact"
-
-#, fuzzy
-#~ msgid "Add C_hat..."
-#~ msgstr "Adaugă un chat"
-
-#, fuzzy
-#~ msgid "Persistent"
-#~ msgstr "Persană"
-
-#, fuzzy
-#~ msgid "/Accounts/Manage"
-#~ msgstr "/Conturi"
-
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "Cont:"
-
-#, fuzzy
-#~ msgid "S_end To"
-#~ msgstr "Trimite către"
-
-#, fuzzy
-#~ msgid "_Smile!"
-#~ msgstr "Iconiţe simbolice"
-
-#~ msgid "You have just sent a Nudge!"
-#~ msgstr "Tocmai aţi trimis o alertă!"
-
-#~ msgid "Are you sure to exit this Qun?"
-#~ msgstr "Sigur doriţi ieşirea din Qun?"
-
-#~ msgid "Go ahead"
-#~ msgstr "Continuă"
-
-#~ msgid "Server ACK"
-#~ msgstr "Server ACK"
-
-#~ msgid "Keep alive error, seems connection lost!"
-#~ msgstr ""
-#~ "Eroare la menţinerea conexiunii active, se pare că s-a întrerupt "
-#~ "conexiunea!"
-
-#~ msgid "Request login token error!"
-#~ msgstr "Eroare la cererea de autentificare!"
-
-#~ msgid "%s Address"
-#~ msgstr "Adresă %s"
-
-#~ msgid "QQ: Available"
-#~ msgstr "QQ: Disponibil(ă)"
-
-#~ msgid "QQ: Away"
-#~ msgstr "QQ: Absent(ă)"
-
-#~ msgid "QQ: Invisible"
-#~ msgstr "QQ: Invizibil(ă)"
-
-#~ msgid "QQ: Offline"
-#~ msgstr "QQ: Deconectat(ă)"
-
-#~ msgid "Modify My Information"
-#~ msgstr "Modifică informaţiile despre mine"
-
-#~ msgid "Login in TCP"
-#~ msgstr "Autentificare TCP"
-
-#~ msgid "Login Hidden"
-#~ msgstr "Autentificare invizibilă"
-
-#~ msgid "Socket send error"
-#~ msgstr "Eroare de trimitere către socket"
-
-#~ msgid "Connection refused"
-#~ msgstr "Conexiune refuzată"
-
-#~ msgid "Would like to add him?"
-#~ msgstr "Doriţi să îl adăugaţi?"
-
-#~ msgid "%s just sent you a Buzz!"
-#~ msgstr "%s tocmai v-a trimis un „buzz”!"
-
-#~ msgid "You have just sent a Buzz!"
-#~ msgstr "Tocmai aţi trimis o „buzz”!"
-
-#~ msgid "/Options/Show Buddy _Icon"
-#~ msgstr "/Opţiuni/Arată _avatarul contactului"
-
-#~ msgid "/Options/Show Buddy Icon"
-#~ msgstr "/Opţiuni/Arată avatarul contactului"
-
-#~ msgid "Norwegian"
-#~ msgstr "Norvegiană"
-
-#~ msgid "_Bold"
-#~ msgstr "_Aldin"
-
-#~ msgid "_Larger"
-#~ msgstr "_Mărit"
-
-#~ msgid "_Smaller"
-#~ msgstr "M_icşorat"
-
-#~ msgid "_Reset font"
-#~ msgstr "Fără f_ormatare"
-
-#~ msgid "Show Buddy _Details"
-#~ msgstr "Arată _detaliile contactelor"
-
-#~ msgid "Commands are not supported yet. Message was NOT sent."
-#~ msgstr "Comenzile nu au fost încă implementate. Mesajul NU a fost trimis."
-
-#~ msgid "User information for %s unavailable:"
-#~ msgstr "Detaliile utilizatorului %s nu sunt disponibile:"
-
-#~ msgid "You have been signed off for an unknown reason."
-#~ msgstr "Aţi fost deconectat(ă) din motive necunoscute."
-
-#~ msgid ""
-#~ "Could not add the buddy %s for an unknown reason.  The most common reason "
-#~ "for this is that you have the maximum number of allowed buddies in your "
-#~ "buddy list."
-#~ msgstr ""
-#~ "Nu s-a putut adăuga contactul %s dintr-un motiv necunoscut. Cel mai "
-#~ "probabil aţi atins numărul maxim permis de contacte în lista de contacte."
-
-#~ msgid "_Connect"
-#~ msgstr "_Conectare"
-
-#~ msgid "Send IM fail\n"
-#~ msgstr "Trimiterea mesajului a eşuat\n"
-
-#~ msgid "Reject watching by other users"
-#~ msgstr "Nu permite altor utilizatori să urmărească discuţiile"
-
-#~ msgid "Block invites"
-#~ msgstr "Blochează invitaţiile"
-
-#~ msgid "Reject online status attribute requests"
-#~ msgstr "Refuză cererile pentru atributul stării de conectare"
-
-#~ msgid "Unavailable"
-#~ msgstr "Indisponibil(ă)"
-
-#~ msgid "/Buddies/_About Pidgin"
-#~ msgstr "/Contacte/_Despre Pidgin"
-
-#~ msgid "Show buddy _icons"
-#~ msgstr "Arată avatarurile c_ontactelor"
-
-#~ msgid "Tools"
-#~ msgstr "Unelte"
-
-#~ msgid "Gaim Internet Messenger"
-#~ msgstr "Mesagerul Gaim"
-
-#~ msgid "Toggle offline buddies"
-#~ msgstr "Arată/ascunde contactele deconectate"
-
-#~ msgid ""
-#~ "%s was disconnected due to the following error:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "%s a fost deconectat(ă) din cauza următoarei erori:\n"
-#~ "%s"
-
-#~ msgid "Timestamps"
-#~ msgstr "Marcaje de timp"
-
-#~ msgid "..."
-#~ msgstr "..."
-
-#~ msgid "Still need to do something about this."
-#~ msgstr "Este încă nevoie să se facă ceva cu asta."
-
-#~ msgid "Alias..."
-#~ msgstr "Alias..."
-
-#~ msgid "/Tools/Buddy Pounces"
-#~ msgstr "/Unelte/Întâmpinare contacte"
-
-#~ msgid "Jabber developer"
-#~ msgstr "programator Jabber"
-
-#~ msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
-#~ msgstr "<FONT SIZE=\"4\">IRC:</FONT> #wingaim pe irc.freenode.net<BR><BR>"
-
-#~ msgid "Smaller font size"
-#~ msgstr "Font mai mic"
-
-#~ msgid "Insert link"
-#~ msgstr "Inserare adresă"
-
-#~ msgid "Insert image"
-#~ msgstr "Inserare imagine"
-
-#~ msgid "Gaim %s. Try `%s -h' for more information.\n"
-#~ msgstr "Gaim %s. Încercaţi „%s -h” pentru mai multe informaţii.\n"
-
-#~ msgid ""
-#~ "You can send this image as a file transfer or embed it into this message, "
-#~ "or use it as the buddy icon for this user."
-#~ msgstr ""
-#~ "Puteţi trimite această imagine printr-un transfer de fişiere, o puteţi "
-#~ "insera în acest mesaj sau o puteţi seta ca avatar pentru acest contact."
-
-#~ msgid "GtkTreeView Expander Size"
-#~ msgstr "Mărime expandare GtkTreeView"
-
-#~ msgid "GtkTreeView Indent Expanders"
-#~ msgstr "Elemente de expandare a indentării GtkTreeView"
-
-#~ msgid ""
-#~ "You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
-#~ "\">http://gaim.sourceforge.net</a>."
-#~ msgstr ""
-#~ "Puteţi obţine versiunea %s de la: <br><a href=\"http://gaim.sourceforge."
-#~ "net/\">http://gaim.sourceforge.net</a>. "
-
-#~ msgid "WinGaim Options"
-#~ msgstr "Opţiuni WinGaim"
-
-#~ msgid ""
-#~ "%d buddy from group %s was not removed because it belongs to an account "
-#~ "which is disabled or offline.  This buddy and the group were not "
-#~ "removed.\n"
-#~ msgid_plural ""
-#~ "%d buddies from group %s were not removed because they belong to accounts "
-#~ "which are currently disabled or offline.  These buddies and the group "
-#~ "were not removed.\n"
-#~ msgstr[0] ""
-#~ "%d contact din grupul %s nu a fost şters deoarece aparţine unui cont "
-#~ "dezactivat sau deconectat. Acest contact şi grupul său nu a fost şterse.\n"
-#~ msgstr[1] ""
-#~ "%d contacte din grupul %s nu au fost şterse deoarece aparţine unui cont "
-#~ "dezactivat sau deconectat. Acest contact şi grupul său nu au fost "
-#~ "şterse.\n"
-#~ msgstr[2] ""
-#~ "%d de contacte din grupul %s nu au fost şterse deoarece aparţin unui cont "
-#~ "dezactivat sau deconectat. Acest contact şi grupul său nu au fost "
-#~ "şterse.\n"
-
-#~ msgid "Group not removed"
-#~ msgstr "Grupul nu a fost şters"
-
-#~ msgid "Old Gaim"
-#~ msgstr "Gaim vechi"
-
-#~ msgid "Gaim encountered errors loading the plugin."
-#~ msgstr "Au apărut erori la încărcarea modulului."
-
-#~ msgid "Autoreply"
-#~ msgstr "Răspunsuri automate"
-
-#~ msgid "Autoreply for all the protocols"
-#~ msgstr "Răspunsuri automate pentru orice cont"
-
-#~ msgid ""
-#~ "This plugin lets you set autoreply message for any protocol. You can set "
-#~ "the global autoreply message from the Plugin-options dialog. To set some "
-#~ "specific autoreply message for a particular buddy, right click on the "
-#~ "buddy in the buddy-list window. To set autoreply messages for some "
-#~ "account, go to the `Advanced' tab of the Account-edit dialog."
-#~ msgstr ""
-#~ "Acest modul vă permite să alegeţi mesaje de răspuns automat pentru orice "
-#~ "cont şi protocol. Puteţi opta pentru un răspuns automat unic în opţiunile "
-#~ "modulului. Pentru a alege un răspuns specific pentru un anumit contact, "
-#~ "faceţi clic dreapta pe acel contact în lista de contacte. Pentru a asocia "
-#~ "răspunsuri automate pentru un anumit cont utilizaţi tabul „Avansate” la "
-#~ "editarea respectivului cont."
-
-#~ msgid "Set autoreply message for %s"
-#~ msgstr "Alegere răspuns automat pentru %s"
-
-#~ msgid "Set Autoreply Message"
-#~ msgstr "Alegere răspuns automat"
-
-#~ msgid ""
-#~ "The following message will be sent to the buddy when the buddy sends you "
-#~ "a message and autoreply is enabled."
-#~ msgstr ""
-#~ "Următorul mesaj va fi trimis contactului când acesta vă trimite un mesaj "
-#~ "şi aveţi activate răspunsurile automate."
-
-#~ msgid "Set _Autoreply Message"
-#~ msgstr "Salvare răspuns _automat"
-
-#~ msgid "Autoreply message"
-#~ msgstr "Mesaj de răspuns automat"
-
-#~ msgid "Send autoreply messages when"
-#~ msgstr "Trimite răspunsuri automate când:"
-
-#~ msgid "When my account is _away"
-#~ msgstr "Sunt _absent(ă)"
-
-#~ msgid "When my account is _idle"
-#~ msgstr "Sunt _inactiv(ă)"
-
-#~ msgid "_Default reply"
-#~ msgstr "Răspuns i_mplicit"
-
-#~ msgid "Status message"
-#~ msgstr "Mesaj de status"
-
-#~ msgid "Autoreply with status message"
-#~ msgstr "Răspunde cu mesajul de status"
-
-#~ msgid "Always when there is a status message"
-#~ msgstr "Dacă există un mesaj de status"
-
-#~ msgid "Only when there's no autoreply message"
-#~ msgstr "Dacă nu există un răspuns automat"
-
-#~ msgid "Delay between autoreplies"
-#~ msgstr "Întârziere între răspunsuri automate"
-
-#~ msgid "_Minimum delay (mins)"
-#~ msgstr "Întârziere _minimă (minute)"
-
-#~ msgid "Times to send autoreplies"
-#~ msgstr "Contor răspunsuri automate"
-
-#~ msgid "Ma_ximum count"
-#~ msgstr "Număr ma_xim"
-
-#~ msgid ""
-#~ "I am currently not available. Please leave your message, and I will get "
-#~ "back to you as soon as possible."
-#~ msgstr ""
-#~ "Lipsesc momentan... Lăsaţi-mi un mesaj şi am să vă contactez cât mai "
-#~ "repede cu putinţă."
-
-#~ msgid "Gaim User"
-#~ msgstr "Utilizator Gaim"
-
-#~ msgid "Jabber Account"
-#~ msgstr "Cont Jabber"
-
-#~ msgid "Cannot join %s:"
-#~ msgstr "Nu s-a putut intra în %s:"
-
-#~ msgid "Server couldn't authenticate you without a password"
-#~ msgstr "Serverul nu v-a putut autentifica fără o parolă"
-
-#~ msgid "Search for Jabber users"
-#~ msgstr "Caută utilizatori Jabber"
-
-#~ msgid "Invalid Jabber ID"
-#~ msgstr "Identitate Jabber invalidă"
-
-#~ msgid "Change Jabber Password"
-#~ msgstr "Schimbare parolă Jabber"
-
-#~ msgid "Jabber Protocol Plugin"
-#~ msgstr "Modul de protocol Jabber"
-
-#~ msgid ""
-#~ "Always use AIM/ICQ proxy server for file transfers\n"
-#~ "(slower, but does not reveal your IP address)"
-#~ msgstr ""
-#~ "Utilizează un server proxy AIM/ICQ pentru transferul\n"
-#~ "de fişiere (mai încet, dar nu se dezvăluie adresa IP)"
-
-#~ msgid "SNAC threw error: %s\n"
-#~ msgstr "SNAC a dat eroarea: %s\n"
-
-#~ msgid "Rate limiting error."
-#~ msgstr "Eroare produsă de rata de limitare."
-
-#~ msgid ""
-#~ "Your screen name is currently formatted as follows:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Numele de identificare vă este formatat după cum urmează:\n"
-#~ "%s"
-
-#~ msgid "New screen name formatting:"
-#~ msgstr "Noua formatare a numelui de identificare:"
-
-#~ msgid "Format Screen Name..."
-#~ msgstr "Formatare nume de identificare..."
-
-#~ msgid "TOC has sent a PAUSE command."
-#~ msgstr "TOC a trimis o comandă PAUSE."
-
-#~ msgid ""
-#~ "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."
-#~ msgstr ""
-#~ "Când se întâmplă aşa ceva, TOC ignoră orice mesaj trimis şi chiar vă "
-#~ "poate deconecta când trimiteţi un mesaj. Se va preveni automat trimiterea "
-#~ "oricărui mesaj. Situaţia aceasta este temporară, vă rugăm să aşteptaţi."
-
-#~ msgid "Gaim - Save As..."
-#~ msgstr "Gaim - Salvează ca..."
-
-#~ msgid ""
-#~ "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."
-#~ msgstr ""
-#~ "Metoda obişnuită de autentificare a eşuat. Aceasta înseamnă că parola a "
-#~ "fost incorectă sau schema de autentificare Yahoo! s-a schimbat. Gaim va "
-#~ "reîncerca să vă autentifice utilizând autentificarea de tip „Web "
-#~ "Messenger”, ceea ce implică o funcţionalitate redusă a acestui cont."
--- a/po/te.po	Sat Nov 17 18:26:03 2007 +0000
+++ b/po/te.po	Sat Nov 17 19:41:05 2007 +0000
@@ -1,29 +1,31 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: GAIM Telugu\n"
+"Project-Id-Version: Pidgin Telugu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-28 15:32-0500\n"
-"PO-Revision-Date: 2005-09-07 14:57+0530\n"
-"Last-Translator: Mr. Subbaramaih <info.gist@cdac.in>\n"
-"Language-Team: GIST CDAC Pune <info.gist@cdac.in>\n"
+"POT-Creation-Date: 2007-11-13 03:22-0500\n"
+"PO-Revision-Date: 2007-11-14 14:05+0530\n"
+"Last-Translator: RKVS Raman <raman@cdacbangalore.in>\n"
+"Language-Team: GIST CDAC Pune / BharateeyaOO.o <info.gist@cdac.in / bharateeyaoo@ncb.ernet.in>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Translate Toolkit 0.10\n"
 "X-Poedit-Language: Telugu\n"
+"X-Poedit-SourceCharset: utf-8\n"
 "X-Poedit-Country: India\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-
-#: ../finch/finch.c:64 ../finch/finch.c:301 ../finch/finch.c:330
+
+#: ../finch/finch.c:64
+#: ../finch/finch.c:301
+#: ../finch/finch.c:330
 #: ../finch/finch.c:418
 #, fuzzy
 msgid "Finch"
 msgstr "ఫ్రెంచ్ "
 
 #: ../finch/finch.c:206
-#, fuzzy, c-format
+#, c-format
 msgid "%s. Try `%s -h' for more information.\n"
-msgstr "Gaim %s. ఇంకా వివరములకు `%s -h' ప్రయత్నించండి.\n"
+msgstr "మరింత సమాచారం కోసం %s. ను `%s -h'అడుగుతున్నారు.\n"
 
 #: ../finch/finch.c:208
 #, c-format
@@ -37,47 +39,57 @@
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
 msgstr ""
-
-#: ../finch/finch.c:328 ../pidgin/gtkmain.c:711
-#, c-format
-msgid ""
-"%s encountered errors migrating your settings from %s to %s. Please "
-"investigate and complete the migration by hand. Please report this error at "
-"http://developer.pidgin.im"
-msgstr ""
-
-#: ../finch/gntaccount.c:124 ../finch/gntaccount.c:484 ../finch/gntblist.c:300
-#: ../finch/gntblist.c:433 ../finch/gntblist.c:446 ../finch/gntplugin.c:186
-#: ../finch/gntplugin.c:234 ../finch/gntstatus.c:301 ../finch/gntstatus.c:310
-#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
+"%s\n"
+"వినియోగం: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    \n"
+" డైరెక్టరీని కన్ఫిగర్ చేయడానికి DIR ను ఉపయోగించండి\n"
+
+#: ../finch/finch.c:328
+#: ../pidgin/gtkmain.c:730
+#, c-format
+msgid "%s encountered errors migrating your settings from %s to %s. Please investigate and complete the migration by hand. Please report this error at http://developer.pidgin.im"
+msgstr ""
+
+#: ../finch/gntaccount.c:124
+#: ../finch/gntaccount.c:484
+#: ../finch/gntblist.c:300
+#: ../finch/gntblist.c:433
+#: ../finch/gntblist.c:446
+#: ../finch/gntplugin.c:189
+#: ../finch/gntplugin.c:237
+#: ../finch/gntstatus.c:301
+#: ../finch/gntstatus.c:310
+#: ../finch/plugins/gntclipboard.c:115
+#: ../finch/plugins/gntclipboard.c:121
 #: ../finch/plugins/gntclipboard.c:128
-#: ../libpurple/protocols/jabber/buddy.c:2029
+#: ../libpurple/protocols/jabber/buddy.c:2032
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1515
+#: ../libpurple/protocols/jabber/jabber.c:1553
 #: ../libpurple/protocols/qq/group_join.c:328
-#: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:57
-#: ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/qq/im.c:576
+#: ../libpurple/protocols/silc/ops.c:57
+#: ../libpurple/protocols/silc/ops.c:1460
 #: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "పొరపాటు "
 
 #: ../finch/gntaccount.c:124
-#, fuzzy
 msgid "Account was not added"
-msgstr "ఎకౌంట్ డిజేబుల్ అయినది. "
+msgstr "అకౌంటు చేర్చబడలేదు"
 
 #: ../finch/gntaccount.c:125
 msgid "Screenname of an account must be non-empty."
-msgstr ""
+msgstr "అకౌంటుకు సంబంధించిన స్క్రీన్ నేమ్ ఖాళీగా ఉండకూడదు."
 
 #: ../finch/gntaccount.c:437
 msgid "New mail notifications"
-msgstr "న్యూ మెయిల్ నోటిఫికేషన్లు "
+msgstr "కొత్త మెయిల్ నోటిఫికేషన్లు "
 
 #: ../finch/gntaccount.c:447
 msgid "Remember password"
-msgstr "పాస్‌వర్డ్‌ను గుర్తుంచుకోండి. "
+msgstr "పాస్‌వర్డ్‌ను గుర్తుంచుకోండి "
 
 #: ../finch/gntaccount.c:485
 msgid "There's no protocol plugins installed."
@@ -87,19 +99,20 @@
 msgid "(You probably forgot to 'make install'.)"
 msgstr ""
 
-#  And now for the buttons
-#: ../finch/gntaccount.c:496 ../finch/gntconn.c:136
-#: ../pidgin/gtkaccount.c:1473 ../pidgin/gtkblist.c:4040
+# And now for the buttons
+#: ../finch/gntaccount.c:496
+#: ../finch/gntconn.c:137
+#: ../pidgin/gtkaccount.c:1478
+#: ../pidgin/gtkblist.c:4501
 msgid "Modify Account"
-msgstr "ఖాతాను సవరించండి "
-
-#  And now for the buttons
+msgstr "అకౌంటును సవరించండి "
+
 #: ../finch/gntaccount.c:496
-#, fuzzy
 msgid "New Account"
-msgstr "ఖాతా "
-
-#: ../finch/gntaccount.c:521 ../pidgin/gtkft.c:696
+msgstr "కొత్త అకౌంటు"
+
+#: ../finch/gntaccount.c:521
+#: ../pidgin/gtkft.c:696
 msgid "Protocol:"
 msgstr "ప్రొటోకాల్:"
 
@@ -115,7 +128,7 @@
 
 #: ../finch/gntaccount.c:552
 msgid "Alias:"
-msgstr "ఉపనామం:"
+msgstr "మారు పేరు:"
 
 # #-#-#-#-#  anjuta.ANJUTA_1_2_0.hi.po (anjuta2 VERSION)  #-#-#-#-#
 # #-#-#-#-#  gnome-session.HEAD.hi.po (gnome-session VERSION)  #-#-#-#-#
@@ -123,35 +136,59 @@
 #  Cancel button.
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:575 ../finch/gntaccount.c:638
-#: ../finch/gntaccount.c:889 ../finch/gntblist.c:344 ../finch/gntblist.c:421
-#: ../finch/gntblist.c:456 ../finch/gntblist.c:803 ../finch/gntblist.c:1005
-#: ../finch/gntblist.c:1101 ../finch/gntblist.c:2222 ../finch/gntcertmgr.c:91
-#: ../finch/gntplugin.c:379 ../finch/gntpounce.c:459 ../finch/gntpounce.c:667
-#: ../finch/gntprefs.c:265 ../finch/gntsound.c:1058 ../finch/gntstatus.c:145
-#: ../finch/gntstatus.c:485 ../finch/gntstatus.c:610
-#: ../libpurple/account.c:1013 ../libpurple/account.c:1263
-#: ../libpurple/account.c:1298 ../libpurple/conversation.c:1215
-#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:507
-#: ../libpurple/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803
-#: ../libpurple/protocols/gg/gg.c:884
+#: ../finch/gntaccount.c:575
+#: ../finch/gntaccount.c:638
+#: ../finch/gntaccount.c:889
+#: ../finch/gntblist.c:344
+#: ../finch/gntblist.c:421
+#: ../finch/gntblist.c:456
+#: ../finch/gntblist.c:803
+#: ../finch/gntblist.c:1005
+#: ../finch/gntblist.c:1101
+#: ../finch/gntblist.c:2226
+#: ../finch/gntblist.c:2289
+#: ../finch/gntcertmgr.c:91
+#: ../finch/gntplugin.c:475
+#: ../finch/gntpounce.c:472
+#: ../finch/gntpounce.c:680
+#: ../finch/gntprefs.c:265
+#: ../finch/gntsound.c:1058
+#: ../finch/gntstatus.c:145
+#: ../finch/gntstatus.c:485
+#: ../finch/gntstatus.c:610
+#: ../libpurple/account.c:1105
+#: ../libpurple/account.c:1394
+#: ../libpurple/account.c:1429
+#: ../libpurple/conversation.c:1215
+#: ../libpurple/plugins/buddynote.c:51
+#: ../libpurple/protocols/gg/gg.c:508
+#: ../libpurple/protocols/gg/gg.c:667
+#: ../libpurple/protocols/gg/gg.c:804
+#: ../libpurple/protocols/gg/gg.c:886
 #: ../libpurple/protocols/jabber/buddy.c:728
-#: ../libpurple/protocols/jabber/buddy.c:2413
-#: ../libpurple/protocols/jabber/buddy.c:2449
+#: ../libpurple/protocols/jabber/buddy.c:2426
+#: ../libpurple/protocols/jabber/buddy.c:2462
 #: ../libpurple/protocols/jabber/chat.c:786
-#: ../libpurple/protocols/jabber/jabber.c:1008
-#: ../libpurple/protocols/jabber/jabber.c:1017
-#: ../libpurple/protocols/jabber/jabber.c:1737
+#: ../libpurple/protocols/jabber/jabber.c:1035
+#: ../libpurple/protocols/jabber/jabber.c:1044
+#: ../libpurple/protocols/jabber/jabber.c:1746
 #: ../libpurple/protocols/jabber/si.c:874
-#: ../libpurple/protocols/jabber/usermood.c:184
+#: ../libpurple/protocols/jabber/usermood.c:202
 #: ../libpurple/protocols/jabber/usernick.c:78
 #: ../libpurple/protocols/jabber/xdata.c:400
-#: ../libpurple/protocols/msn/msn.c:287 ../libpurple/protocols/msn/msn.c:304
-#: ../libpurple/protocols/msn/msn.c:321 ../libpurple/protocols/msn/msn.c:338
-#: ../libpurple/protocols/msn/msn.c:359
-#: ../libpurple/protocols/oscar/oscar.c:6094
-#: ../libpurple/protocols/oscar/peer.c:1046
-#: ../libpurple/protocols/qq/buddy_info.c:484
+#: ../libpurple/protocols/msn/msn.c:291
+#: ../libpurple/protocols/msn/msn.c:308
+#: ../libpurple/protocols/msn/msn.c:325
+#: ../libpurple/protocols/msn/msn.c:342
+#: ../libpurple/protocols/msn/msn.c:363
+#: ../libpurple/protocols/msnp9/msn.c:287
+#: ../libpurple/protocols/msnp9/msn.c:304
+#: ../libpurple/protocols/msnp9/msn.c:321
+#: ../libpurple/protocols/msnp9/msn.c:338
+#: ../libpurple/protocols/msnp9/msn.c:359
+#: ../libpurple/protocols/oscar/oscar.c:6144
+#: ../libpurple/protocols/oscar/peer.c:1048
+#: ../libpurple/protocols/qq/buddy_info.c:525
 #: ../libpurple/protocols/qq/buddy_opt.c:214
 #: ../libpurple/protocols/qq/buddy_opt.c:411
 #: ../libpurple/protocols/qq/group.c:124
@@ -162,307 +199,375 @@
 #: ../libpurple/protocols/qq/sys_msg.c:113
 #: ../libpurple/protocols/qq/sys_msg.c:172
 #: ../libpurple/protocols/qq/sys_msg.c:266
-#: ../libpurple/protocols/sametime/sametime.c:3388
-#: ../libpurple/protocols/sametime/sametime.c:3474
-#: ../libpurple/protocols/sametime/sametime.c:3645
-#: ../libpurple/protocols/sametime/sametime.c:5397
-#: ../libpurple/protocols/sametime/sametime.c:5487
-#: ../libpurple/protocols/sametime/sametime.c:5612
+#: ../libpurple/protocols/sametime/sametime.c:3430
+#: ../libpurple/protocols/sametime/sametime.c:3516
+#: ../libpurple/protocols/sametime/sametime.c:3690
+#: ../libpurple/protocols/sametime/sametime.c:5443
+#: ../libpurple/protocols/sametime/sametime.c:5533
+#: ../libpurple/protocols/sametime/sametime.c:5658
 #: ../libpurple/protocols/silc/buddy.c:455
-#: ../libpurple/protocols/silc/buddy.c:1076
-#: ../libpurple/protocols/silc/buddy.c:1191
-#: ../libpurple/protocols/silc/chat.c:616
-#: ../libpurple/protocols/silc/chat.c:746
-#: ../libpurple/protocols/silc/ops.c:1816
-#: ../libpurple/protocols/silc/silc.c:823
-#: ../libpurple/protocols/silc/silc.c:1031
+#: ../libpurple/protocols/silc/buddy.c:1079
+#: ../libpurple/protocols/silc/buddy.c:1194
+#: ../libpurple/protocols/silc/chat.c:620
+#: ../libpurple/protocols/silc/chat.c:750
+#: ../libpurple/protocols/silc/ops.c:1820
+#: ../libpurple/protocols/silc/silc.c:966
+#: ../libpurple/protocols/silc/silc.c:1174
 #: ../libpurple/protocols/silc10/buddy.c:468
-#: ../libpurple/protocols/silc10/buddy.c:1084
-#: ../libpurple/protocols/silc10/buddy.c:1189
+#: ../libpurple/protocols/silc10/buddy.c:1087
+#: ../libpurple/protocols/silc10/buddy.c:1192
 #: ../libpurple/protocols/silc10/chat.c:600
 #: ../libpurple/protocols/silc10/chat.c:730
 #: ../libpurple/protocols/silc10/ops.c:1904
 #: ../libpurple/protocols/silc10/silc.c:736
-#: ../libpurple/protocols/silc10/silc.c:942
-#: ../libpurple/protocols/yahoo/yahoo.c:1032
-#: ../libpurple/protocols/yahoo/yahoo.c:3498
-#: ../libpurple/protocols/yahoo/yahoo.c:3509 ../pidgin/gtkaccount.c:1908
-#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:5967
-#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:773
-#: ../pidgin/gtkdialogs.c:912 ../pidgin/gtkdialogs.c:1004
-#: ../pidgin/gtkdialogs.c:1024 ../pidgin/gtkdialogs.c:1048
-#: ../pidgin/gtkdialogs.c:1070 ../pidgin/gtkdialogs.c:1118
-#: ../pidgin/gtkdialogs.c:1159 ../pidgin/gtkdialogs.c:1215
-#: ../pidgin/gtkdialogs.c:1254 ../pidgin/gtkdialogs.c:1281
-#: ../pidgin/gtkimhtmltoolbar.c:435 ../pidgin/gtklog.c:328
-#: ../pidgin/gtkplugin.c:289 ../pidgin/gtkpounce.c:1101
-#: ../pidgin/gtkprivacy.c:563 ../pidgin/gtkprivacy.c:579
-#: ../pidgin/gtkprivacy.c:604 ../pidgin/gtkprivacy.c:618
-#: ../pidgin/gtkrequest.c:271 ../pidgin/gtksavedstatuses.c:345
-#: ../pidgin/gtkstatusbox.c:1574
+#: ../libpurple/protocols/silc10/silc.c:943
+#: ../libpurple/protocols/yahoo/yahoo.c:1034
+#: ../libpurple/protocols/yahoo/yahoo.c:3509
+#: ../libpurple/protocols/yahoo/yahoo.c:3520
+#: ../pidgin/gtkaccount.c:1913
+#: ../pidgin/gtkaccount.c:2501
+#: ../pidgin/gtkblist.c:6668
+#: ../pidgin/gtkcertmgr.c:197
+#: ../pidgin/gtkdialogs.c:787
+#: ../pidgin/gtkdialogs.c:926
+#: ../pidgin/gtkdialogs.c:1018
+#: ../pidgin/gtkdialogs.c:1038
+#: ../pidgin/gtkdialogs.c:1062
+#: ../pidgin/gtkdialogs.c:1084
+#: ../pidgin/gtkdialogs.c:1132
+#: ../pidgin/gtkdialogs.c:1173
+#: ../pidgin/gtkdialogs.c:1229
+#: ../pidgin/gtkdialogs.c:1268
+#: ../pidgin/gtkdialogs.c:1295
+#: ../pidgin/gtkimhtmltoolbar.c:437
+#: ../pidgin/gtklog.c:328
+#: ../pidgin/gtkplugin.c:289
+#: ../pidgin/gtkpounce.c:1121
+#: ../pidgin/gtkprivacy.c:565
+#: ../pidgin/gtkprivacy.c:581
+#: ../pidgin/gtkprivacy.c:606
+#: ../pidgin/gtkprivacy.c:620
+#: ../pidgin/gtkrequest.c:321
+#: ../pidgin/gtksavedstatuses.c:345
+#: ../pidgin/gtkstatusbox.c:1593
 msgid "Cancel"
-msgstr "క్యాన్సెల్ "
+msgstr "వద్దు"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:311
-#: ../finch/gntplugin.c:379 ../finch/gntpounce.c:465 ../finch/gntprefs.c:265
-#: ../finch/gntsound.c:1055 ../finch/gntstatus.c:488 ../finch/gntstatus.c:598
-#: ../libpurple/account.c:1297 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:727 ../pidgin/gtkdebug.c:749
-#: ../pidgin/gtkrequest.c:277
+#: ../finch/gntaccount.c:579
+#: ../finch/gntcertmgr.c:311
+#: ../finch/gntdebug.c:297
+#: ../finch/gntplugin.c:475
+#: ../finch/gntpounce.c:478
+#: ../finch/gntprefs.c:265
+#: ../finch/gntsound.c:1055
+#: ../finch/gntstatus.c:488
+#: ../finch/gntstatus.c:598
+#: ../libpurple/account.c:1428
+#: ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:727
+#: ../pidgin/gtkdebug.c:754
+#: ../pidgin/gtkrequest.c:327
 msgid "Save"
-msgstr "సేవ్ "
-
-#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1900
-#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1568
+msgstr "సేవ్ చేయి "
+
+#: ../finch/gntaccount.c:632
+#: ../pidgin/gtkaccount.c:1905
+#: ../pidgin/gtksavedstatuses.c:333
+#: ../pidgin/gtkstatusbox.c:1587
 #, c-format
 msgid "Are you sure you want to delete %s?"
-msgstr "మీరు %sను తప్పకుండా తొలగించదల్చుకున్నారా?"
-
-#  And now for the buttons
+msgstr " %sను కచ్చితంగా  తొలగించదలచుకున్నారా?"
+
 #: ../finch/gntaccount.c:635
-#, fuzzy
 msgid "Delete Account"
-msgstr "ఖాతా "
+msgstr "అకౌంటును తీసివేయండి"
 
 #. Delete button
-#: ../finch/gntaccount.c:637 ../finch/gntaccount.c:707
-#: ../finch/gntcertmgr.c:319 ../finch/gntpounce.c:666 ../finch/gntpounce.c:729
-#: ../finch/gntstatus.c:144 ../finch/gntstatus.c:210
-#: ../pidgin/gtkaccount.c:1907 ../pidgin/gtklog.c:327
-#: ../pidgin/gtkpounce.c:1100 ../pidgin/gtkrequest.c:274
-#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1573
+#: ../finch/gntaccount.c:637
+#: ../finch/gntaccount.c:707
+#: ../finch/gntcertmgr.c:319
+#: ../finch/gntpounce.c:679
+#: ../finch/gntpounce.c:742
+#: ../finch/gntstatus.c:144
+#: ../finch/gntstatus.c:210
+#: ../pidgin/gtkaccount.c:1912
+#: ../pidgin/gtklog.c:327
+#: ../pidgin/gtkpounce.c:1120
+#: ../pidgin/gtkrequest.c:324
+#: ../pidgin/gtksavedstatuses.c:344
+#: ../pidgin/gtkstatusbox.c:1592
 msgid "Delete"
-msgstr "తొలగింపు "
-
-#  And now for the buttons
-#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2119 ../finch/gntui.c:82
-#: ../pidgin/gtkaccount.c:2325 ../pidgin/gtkdocklet.c:522
+msgstr "తొలగించు"
+
+# And now for the buttons
+#: ../finch/gntaccount.c:669
+#: ../finch/gntblist.c:2123
+#: ../finch/gntui.c:82
+#: ../pidgin/gtkaccount.c:2331
+#: ../pidgin/gtkdocklet.c:715
 msgid "Accounts"
-msgstr "ఖాతాలు"
+msgstr "అకౌంట్లు"
 
 #: ../finch/gntaccount.c:675
-#, fuzzy
 msgid "You can enable/disable accounts from the following list."
-msgstr "ఈ క్రింది మిత్రులనుండి మీరు ఆథరైజేషన్‌కోసం ఎదురు చూస్తున్నారు."
+msgstr "ఈ క్రింది జాబితానుండి అకౌంటును ఎనేబుల్/డిజేబుల్ చేయవచ్చు."
 
 #. Add button
-#: ../finch/gntaccount.c:698 ../finch/gntaccount.c:888 ../finch/gntblist.c:343
-#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntcertmgr.c:306
-#: ../finch/gntnotify.c:380 ../finch/gntpounce.c:713 ../finch/gntstatus.c:199
-#: ../libpurple/protocols/gg/gg.c:883 ../libpurple/protocols/qq/sys_msg.c:114
+#: ../finch/gntaccount.c:698
+#: ../finch/gntaccount.c:888
+#: ../finch/gntblist.c:343
+#: ../finch/gntblist.c:421
+#: ../finch/gntblist.c:456
+#: ../finch/gntblist.c:2381
+#: ../finch/gntcertmgr.c:306
+#: ../finch/gntnotify.c:385
+#: ../finch/gntpounce.c:726
+#: ../finch/gntstatus.c:199
+#: ../libpurple/protocols/gg/gg.c:885
+#: ../libpurple/protocols/qq/sys_msg.c:114
 #: ../libpurple/protocols/qq/sys_msg.c:173
 #: ../libpurple/protocols/qq/sys_msg.c:267
-#: ../libpurple/protocols/sametime/sametime.c:5486
-#: ../libpurple/protocols/silc/chat.c:615
-#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2494
-#: ../pidgin/gtkblist.c:5966 ../pidgin/gtkconv.c:1659
-#: ../pidgin/gtkrequest.c:275
+#: ../libpurple/protocols/sametime/sametime.c:5532
+#: ../libpurple/protocols/silc/chat.c:619
+#: ../libpurple/protocols/silc10/chat.c:599
+#: ../pidgin/gtkaccount.c:2500
+#: ../pidgin/gtkblist.c:6667
+#: ../pidgin/gtkconv.c:1713
+#: ../pidgin/gtkrequest.c:325
 msgid "Add"
 msgstr "చేర్చు "
 
 #. Modify button
-#: ../finch/gntaccount.c:703 ../finch/gntpounce.c:721
-#, fuzzy
+#: ../finch/gntaccount.c:703
+#: ../finch/gntpounce.c:734
 msgid "Modify"
-msgstr "_మార్పుచేర్పులు చేయు"
-
-#: ../finch/gntaccount.c:811 ../pidgin/gtkaccount.c:2441
-#, fuzzy, c-format
+msgstr "సవరించు"
+
+#: ../finch/gntaccount.c:811
+#: ../pidgin/gtkaccount.c:2447
+#, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
-msgstr "%s%s%s%s has made %s his or her buddy%s%s%s"
-
-#: ../finch/gntaccount.c:884 ../pidgin/gtkaccount.c:2493
+msgstr " %s%s%s తన మిత్రుడు లేదా స్నేహితురాలు %s%s  గా  %s ను  చేర్చుకున్నారు "
+
+#: ../finch/gntaccount.c:884
+#: ../pidgin/gtkaccount.c:2499
 msgid "Add buddy to your list?"
-msgstr "మీ లిస్టులో మిత్రుని చేర్చమంటారా?"
-
-#: ../finch/gntaccount.c:944 ../pidgin/gtkaccount.c:2551
-#, fuzzy, c-format
+msgstr "మీ జాబితాలో మిత్రుని చేర్చమంటారా?"
+
+#: ../finch/gntaccount.c:944
+#: ../pidgin/gtkaccount.c:2557
+#, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
-msgstr "వినియోగదారుడు/రాలు %s %sను తన మిత్రుల జాబితాలో చేర్చదల్చుకున్నాడు/న్నది."
-
-#: ../finch/gntaccount.c:969 ../finch/gntaccount.c:972
-#: ../finch/gntaccount.c:999 ../pidgin/gtkaccount.c:2574
+msgstr "తన మిత్రుని లేదా స్నేహితురాలి జాబితా%s %s లో %s ను  చేర్చాలని %s%s%s%s  కోరుతున్నారు "
+
+#: ../finch/gntaccount.c:969
+#: ../finch/gntaccount.c:972
+#: ../finch/gntaccount.c:999
 #: ../pidgin/gtkaccount.c:2580
-#, fuzzy
+#: ../pidgin/gtkaccount.c:2586
 msgid "Authorize buddy?"
-msgstr "అనుమతి నిచ్చు "
-
-#: ../finch/gntaccount.c:976 ../finch/gntaccount.c:1003
-#: ../pidgin/gtkaccount.c:2575 ../pidgin/gtkaccount.c:2581
+msgstr "మిత్రుణ్ని ప్రమాణీకరించాలా?"
+
+#: ../finch/gntaccount.c:976
+#: ../finch/gntaccount.c:1003
+#: ../pidgin/gtkaccount.c:2581
+#: ../pidgin/gtkaccount.c:2587
 msgid "Authorize"
 msgstr "అనుమతి నిచ్చు "
 
-#: ../finch/gntaccount.c:977 ../finch/gntaccount.c:1004
-#: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
+#: ../finch/gntaccount.c:977
+#: ../finch/gntaccount.c:1004
+#: ../pidgin/gtkaccount.c:2582
+#: ../pidgin/gtkaccount.c:2588
 msgid "Deny"
-msgstr "కాదను "
+msgstr "నిరాకరించు "
 
 #: ../finch/gntblist.c:289
 msgid "You must provide a screename for the buddy."
-msgstr ""
+msgstr "మిత్రునికోసం ఒక స్క్రీన్ పేరును తప్పనిసరిగా ఏర్పాటుచేయాలి."
 
 #: ../finch/gntblist.c:291
 msgid "You must provide a group."
-msgstr ""
+msgstr "ఒక గ్రూపును తప్పనిసరిగా ఏర్పాటు చేయాలి."
 
 #: ../finch/gntblist.c:293
-#, fuzzy
 msgid "You must select an account."
-msgstr "మీరు విధిగా ఉపనామాన్ని స్పష్టం చేయాలి. "
+msgstr "మీరు తప్పనిసరిగా ఒక అకౌంటును ఎంపిక చేసుకోవాలి."
 
 #: ../finch/gntblist.c:295
 msgid "The selected account is not online."
 msgstr ""
 
 #: ../finch/gntblist.c:300
-#, fuzzy
 msgid "Error adding buddy"
-msgstr ""
-"చదవడంలో పొరపాటు %s: \n"
-"%s.\n"
-
-#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2888
-#: ../pidgin/gtkaccount.c:1981 ../pidgin/gtksavedstatuses.c:980
+msgstr "మిత్రుని చేర్చడంలో లోపం"
+
+#: ../finch/gntblist.c:325
+#: ../libpurple/protocols/oscar/oscar.c:2898
+#: ../pidgin/gtkaccount.c:1986
+#: ../pidgin/gtksavedstatuses.c:986
 msgid "Screen Name"
 msgstr "స్క్రీన్ పేరు "
 
-#: ../finch/gntblist.c:328 ../finch/gntblist.c:410 ../finch/gntblist.c:1250
-#: ../libpurple/protocols/msn/msn.c:1395
-#: ../libpurple/protocols/silc/chat.c:606
+#: ../finch/gntblist.c:328
+#: ../finch/gntblist.c:410
+#: ../finch/gntblist.c:1250
+#: ../libpurple/protocols/msn/msn.c:1551
+#: ../libpurple/protocols/msnp9/msn.c:1402
+#: ../libpurple/protocols/silc/chat.c:610
 #: ../libpurple/protocols/silc10/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:704
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1023
-#: ../pidgin/gtkdialogs.c:1047 ../pidgin/gtkdialogs.c:1069
-#: ../pidgin/gtkrequest.c:278
+#: ../libpurple/protocols/zephyr/zephyr.c:1207
+#: ../pidgin/gtkdialogs.c:1037
+#: ../pidgin/gtkdialogs.c:1061
+#: ../pidgin/gtkdialogs.c:1083
+#: ../pidgin/gtkrequest.c:328
 msgid "Alias"
-msgstr "ఉపనామం"
-
-#: ../finch/gntblist.c:331 ../finch/gntblist.c:413
-#, fuzzy
+msgstr "మారుపేరు"
+
+#: ../finch/gntblist.c:331
+#: ../finch/gntblist.c:413
 msgid "Group"
-msgstr "గ్రూప్:"
-
-#  And now for the buttons
-#: ../finch/gntblist.c:335 ../finch/gntblist.c:401 ../finch/gntblist.c:1305
-#: ../finch/gntnotify.c:174 ../finch/gntstatus.c:576
-#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:3008 ../pidgin/gtknotify.c:506
-#: ../pidgin/gtkpounce.c:1268 ../pidgin/plugins/gevolution/gevolution.c:445
+msgstr "గ్రూపు:"
+
+# And now for the buttons
+#: ../finch/gntblist.c:335
+#: ../finch/gntblist.c:401
+#: ../finch/gntblist.c:1305
+#: ../finch/gntblist.c:2212
+#: ../finch/gntblist.c:2276
+#: ../finch/gntnotify.c:174
+#: ../finch/gntstatus.c:576
+#: ../libpurple/plugins/idle.c:153
+#: ../libpurple/plugins/idle.c:190
+#: ../pidgin/gtkblist.c:3242
+#: ../pidgin/gtknotify.c:512
+#: ../pidgin/gtkpounce.c:1288
+#: ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
-msgstr "ఖాతా "
-
-#: ../finch/gntblist.c:341 ../finch/gntblist.c:852
+msgstr "అకౌంటు"
+
+#: ../finch/gntblist.c:341
+#: ../finch/gntblist.c:852
 #: ../libpurple/protocols/silc/buddy.c:725
-#: ../libpurple/protocols/silc/buddy.c:1027
-#: ../libpurple/protocols/silc/buddy.c:1072
-#: ../libpurple/protocols/silc/buddy.c:1182
+#: ../libpurple/protocols/silc/buddy.c:1030
+#: ../libpurple/protocols/silc/buddy.c:1075
+#: ../libpurple/protocols/silc/buddy.c:1185
 #: ../libpurple/protocols/silc10/buddy.c:737
-#: ../libpurple/protocols/silc10/buddy.c:1033
-#: ../libpurple/protocols/silc10/buddy.c:1080
-#: ../libpurple/protocols/silc10/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3343 ../pidgin/gtkblist.c:5483
+#: ../libpurple/protocols/silc10/buddy.c:1036
+#: ../libpurple/protocols/silc10/buddy.c:1083
+#: ../libpurple/protocols/silc10/buddy.c:1183
+#: ../libpurple/protocols/yahoo/yahoo.c:3354
+#: ../pidgin/gtkblist.c:6169
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "మిత్రుని చేర్చుము "
 
 #: ../finch/gntblist.c:341
-#, fuzzy
 msgid "Please enter buddy information."
-msgstr "మీదకు దుమకడానికి ఒక మిత్రుని ఎంటర్ చేయుము."
-
-#: ../finch/gntblist.c:370 ../libpurple/blist.c:1209
+msgstr "మిత్రుని వివరాలను దయచేసి నమోదుచేయండి."
+
+#: ../finch/gntblist.c:370
+#: ../libpurple/blist.c:1210
 msgid "Chats"
 msgstr "సంభాషణలు "
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:407 ../libpurple/protocols/jabber/jabber.c:924
-#: ../libpurple/protocols/jabber/jabber.c:927
-#: ../libpurple/protocols/msn/msn.c:1584 ../libpurple/protocols/msn/msn.c:1649
-#: ../libpurple/protocols/msn/msn.c:1676
-#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:582
-#: ../pidgin/gtkroomlist.c:618
+#: ../finch/gntblist.c:407
+#: ../finch/gntblist.c:2207
+#: ../libpurple/protocols/jabber/jabber.c:951
+#: ../libpurple/protocols/jabber/jabber.c:954
+#: ../libpurple/protocols/msn/msn.c:1732
+#: ../libpurple/protocols/msn/msn.c:1797
+#: ../libpurple/protocols/msn/msn.c:1824
+#: ../libpurple/protocols/msnp9/msn.c:1585
+#: ../libpurple/protocols/msnp9/msn.c:1650
+#: ../libpurple/protocols/msnp9/msn.c:1677
+#: ../libpurple/protocols/qq/buddy_info.c:44
+#: ../pidgin/gtkplugin.c:608
+#: ../pidgin/gtkroomlist.c:931
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "పేరు"
 
-#: ../finch/gntblist.c:416 ../finch/gntblist.c:819
-#, fuzzy
+#: ../finch/gntblist.c:416
+#: ../finch/gntblist.c:819
 msgid "Auto-join"
-msgstr "ఆటో జాయిన్"
-
-#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:5859
+msgstr "ఆటో-జాయిన్"
+
+#: ../finch/gntblist.c:419
+#: ../finch/gntblist.c:854
+#: ../pidgin/gtkblist.c:6553
 msgid "Add Chat"
-msgstr "సంభాషణ చేర్చండి."
+msgstr "సంభాషణ చేర్చండి"
 
 #: ../finch/gntblist.c:420
 msgid "You can edit more information from the context menu later."
-msgstr ""
-
-#: ../finch/gntblist.c:433 ../finch/gntblist.c:446
-#, fuzzy
+msgstr "కంటెస్ట్ మెనూ నుంచి అధిక వివరాలను తరువాత ఎడిట్ చేయవచ్చు."
+
+#: ../finch/gntblist.c:433
+#: ../finch/gntblist.c:446
 msgid "Error adding group"
-msgstr ""
-"చదవడంలో పొరపాటు %s: \n"
-"%s.\n"
+msgstr "గ్రూపును చేర్చడంలో లోపం"
 
 #: ../finch/gntblist.c:434
-#, fuzzy
 msgid "You must give a name for the group to add."
-msgstr "చేర్చదలచుకున్న గ్రూప్ పేరును ఎంటర్ చేయండి."
+msgstr "ఒక గ్రూపును చేర్చేముందు గ్రూపునకు ఒక పేరును తప్పనిసరిగా ఇవ్వాలి."
 
 #: ../finch/gntblist.c:447
-#, fuzzy
 msgid "A group with the name already exists."
-msgstr "ఆ పేరుతో ఫోల్డర్ అస్తిత్వంలో ఉంది. "
-
-#: ../finch/gntblist.c:454 ../finch/gntblist.c:856
-#: ../libpurple/protocols/sametime/sametime.c:5396
-#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5963
-msgid "Add Group"
-msgstr "గ్రూపును చేర్చండి."
+msgstr "ఆ పేరుతో గ్రూపు ఇంతకు ముందునుంచే ఉంది. "
 
 #: ../finch/gntblist.c:454
-#, fuzzy
+#: ../finch/gntblist.c:856
+#: ../libpurple/protocols/sametime/sametime.c:5442
+#: ../libpurple/protocols/sametime/sametime.c:5530
+#: ../pidgin/gtkblist.c:6664
+msgid "Add Group"
+msgstr "గ్రూపును చేర్చండి"
+
+#: ../finch/gntblist.c:454
 msgid "Enter the name of the group"
-msgstr "చేర్చదలచుకున్న గ్రూప్ పేరును ఎంటర్ చేయండి."
+msgstr "గ్రూపు పేరును నమోదుచేయండి"
 
 #: ../finch/gntblist.c:802
-#, fuzzy
 msgid "Edit Chat"
-msgstr "సంభాషణ చేర్చండి."
+msgstr "చాట్ ను ఎడిట్ చేయండి"
 
 #: ../finch/gntblist.c:802
 msgid "Please Update the necessary fields."
-msgstr ""
-
-#: ../finch/gntblist.c:803 ../finch/gntstatus.c:205
+msgstr "అవసరమైన ఫీల్డ్ లను దయచేసి అప్ డేట్ చేయండి."
+
+#: ../finch/gntblist.c:803
+#: ../finch/gntstatus.c:205
 #, fuzzy
 msgid "Edit"
 msgstr "_ఎడిట్ "
 
 #: ../finch/gntblist.c:828
-#, fuzzy
 msgid "Edit Settings"
-msgstr "ఎన్వైరాన్‌మెంటల్ సెట్టింగ్స్‌ను ఉపయోగించుము. "
-
-#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
+msgstr "సెట్టింగులను ఎడిట్ చేయండి"
+
+#: ../finch/gntblist.c:864
+#: ../pidgin/gtkutils.c:931
 msgid "Information"
-msgstr "సమాచారం "
-
-#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
-#, fuzzy
+msgstr ""
+
+#: ../finch/gntblist.c:864
+#: ../pidgin/gtkutils.c:931
 msgid "Retrieving..."
-msgstr "కనెక్షన్ ఇస్తున్నది ..."
-
-#: ../finch/gntblist.c:904 ../finch/gntconv.c:507
-#: ../libpurple/protocols/silc/chat.c:899
+msgstr ""
+
+#: ../finch/gntblist.c:904
+#: ../finch/gntconv.c:528
+#: ../libpurple/protocols/silc/chat.c:903
 #: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
-msgstr "సమాచారం తీసుకురండి."
+msgstr "సమాచారం పొందండి"
 
 #: ../finch/gntblist.c:908
 #, fuzzy
@@ -470,12 +575,14 @@
 msgstr "Buddy _Pounceను చేర్చండి."
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:915 ../finch/gntconv.c:519
+#: ../finch/gntblist.c:915
+#: ../finch/gntconv.c:540
 #: ../libpurple/protocols/jabber/si.c:874
-#: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:587
-#: ../pidgin/gtkconv.c:1607
+#: ../libpurple/protocols/oscar/oscar.c:654
+#: ../libpurple/protocols/qq/qq.c:588
+#: ../pidgin/gtkconv.c:1661
 msgid "Send File"
-msgstr "ఫైలును పంపుము."
+msgstr "ఫైలును పంపు"
 
 #: ../finch/gntblist.c:919
 #, fuzzy
@@ -483,112 +590,130 @@
 msgstr "View _Log"
 
 #: ../finch/gntblist.c:1000
-#, fuzzy, c-format
+#, c-format
 msgid "Please enter the new name for %s"
-msgstr "సెలక్ట్ చేసిన గ్రూపుకు కొత్త పేరిమ్ము "
-
-#: ../finch/gntblist.c:1002 ../finch/gntblist.c:1250
-#, fuzzy
-msgid "Rename"
-msgstr "_కొత్తపేరు"
+msgstr "%s కోసం ఒక కొత్త పేరును దయచేసి నమోదుచేయండి"
 
 #: ../finch/gntblist.c:1002
-#, fuzzy
+#: ../finch/gntblist.c:1250
+msgid "Rename"
+msgstr "వేరే  పేరు పెట్టు"
+
+#: ../finch/gntblist.c:1002
 msgid "Set Alias"
-msgstr "ఉపనామం"
+msgstr ""
 
 #: ../finch/gntblist.c:1003
 msgid "Enter empty string to reset the name."
-msgstr ""
+msgstr "పేరును రీసెట్ చేయడానికి ఖాళీ స్ట్రింగ్ ను ఎంటర్ చేయండి."
 
 #: ../finch/gntblist.c:1079
 msgid "Removing this contact will also remove all the buddies in the contact"
-msgstr ""
+msgstr "ఈ కాంటాక్టును తొలగిస్తే ఈ కాంటాక్టులోని మిత్రులందరిని కూడా తొలగిస్తుంది"
 
 #: ../finch/gntblist.c:1087
 msgid "Removing this group will also remove all the buddies in the group"
-msgstr ""
+msgstr "ఈ గ్రూపును తొలగిస్తే గ్రూపులోని మిత్రులందరిని కూడా తొలగిస్తుంది"
 
 #: ../finch/gntblist.c:1092
-#, fuzzy, c-format
+#, c-format
 msgid "Are you sure you want to remove %s?"
-msgstr "మీరు %sను తప్పకుండా తొలగించదల్చుకున్నారా?"
-
-#  And now for the buttons
+msgstr " %sను కచ్చితంగా తొలగించదల్చుకున్నారా?"
+
 #. XXX: anything to do with the returned ui-handle?
 #: ../finch/gntblist.c:1095
-#, fuzzy
 msgid "Confirm Remove"
-msgstr "ఎకౌంట్‌ను నిర్ధారించండి. "
-
-#: ../finch/gntblist.c:1100 ../finch/gntblist.c:1252 ../finch/gntft.c:227
-#: ../pidgin/gtkconv.c:1656 ../pidgin/gtkrequest.c:276
+msgstr "నిజంగా తొలగించాలా?"
+
+#: ../finch/gntblist.c:1100
+#: ../finch/gntblist.c:1252
+#: ../finch/gntft.c:227
+#: ../pidgin/gtkconv.c:1710
+#: ../pidgin/gtkrequest.c:326
 #: ../pidgin/gtkstatusbox.c:264
 msgid "Remove"
-msgstr "తొలగించుము"
-
-#  Buddy List
+msgstr "తొలగించు"
+
+# Buddy List
 #. Buddy List
-#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2307 ../finch/gntprefs.c:258
-#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2688 ../pidgin/gtkblist.c:4284
+#: ../finch/gntblist.c:1226
+#: ../finch/gntblist.c:2434
+#: ../finch/gntprefs.c:258
+#: ../finch/gntui.c:83
+#: ../pidgin/gtkblist.c:2908
+#: ../pidgin/gtkblist.c:4927
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
-msgstr "మిత్రుల లిస్ట్ "
+msgstr "మిత్రుల జాబితా "
 
 #: ../finch/gntblist.c:1257
 msgid "Place tagged"
-msgstr ""
+msgstr "ప్రదేశం టాగ్ అయిఉంది"
 
 #: ../finch/gntblist.c:1262
 msgid "Toggle Tag"
-msgstr ""
+msgstr "Toggle Tag"
 
 #. General
-#: ../finch/gntblist.c:1298 ../libpurple/protocols/gg/gg.c:637
-#: ../libpurple/protocols/gg/gg.c:1050 ../libpurple/protocols/gg/gg.c:1123
-#: ../libpurple/protocols/gg/gg.c:2207
+#: ../finch/gntblist.c:1298
+#: ../libpurple/protocols/gg/gg.c:638
+#: ../libpurple/protocols/gg/gg.c:1052
+#: ../libpurple/protocols/gg/gg.c:1125
+#: ../libpurple/protocols/gg/gg.c:2228
 #: ../libpurple/protocols/jabber/buddy.c:286
 #: ../libpurple/protocols/jabber/buddy.c:1247
-#: ../libpurple/protocols/jabber/buddy.c:2214
-#: ../libpurple/protocols/jabber/buddy.c:2396
-#: ../libpurple/protocols/jabber/jabber.c:937
-#: ../libpurple/protocols/jabber/jabber.c:1544
-#: ../libpurple/protocols/jabber/jabber.c:1567
-#: ../libpurple/protocols/jabber/jabber.c:1590
-#: ../libpurple/protocols/jabber/jabber.c:1613
-#: ../libpurple/protocols/jabber/jabber.c:1636
-#: ../libpurple/protocols/msn/msn.c:1403 ../libpurple/protocols/msn/msn.c:1587
+#: ../libpurple/protocols/jabber/buddy.c:2217
+#: ../libpurple/protocols/jabber/buddy.c:2409
+#: ../libpurple/protocols/jabber/jabber.c:964
+#: ../libpurple/protocols/jabber/jabber.c:1573
+#: ../libpurple/protocols/jabber/jabber.c:1587
+#: ../libpurple/protocols/jabber/jabber.c:1601
+#: ../libpurple/protocols/jabber/jabber.c:1615
+#: ../libpurple/protocols/jabber/jabber.c:1629
+#: ../libpurple/protocols/msn/msn.c:1559
+#: ../libpurple/protocols/msn/msn.c:1735
+#: ../libpurple/protocols/msnp9/msn.c:1410
+#: ../libpurple/protocols/msnp9/msn.c:1588
 #: ../libpurple/protocols/qq/buddy_info.c:43
-#: ../libpurple/protocols/silc/buddy.c:1535
+#: ../libpurple/protocols/silc/buddy.c:1538
 #: ../libpurple/protocols/silc/ops.c:1002
 #: ../libpurple/protocols/silc/ops.c:1186
-#: ../libpurple/protocols/silc/ops.c:1322
-#: ../libpurple/protocols/silc10/buddy.c:1535
+#: ../libpurple/protocols/silc/ops.c:1324
+#: ../libpurple/protocols/silc10/buddy.c:1538
 #: ../libpurple/protocols/silc10/ops.c:1036
 #: ../libpurple/protocols/silc10/ops.c:1179
 #: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3032
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066
+#: ../pidgin/gtkblist.c:3266
 msgid "Nickname"
-msgstr "ఉపనామం "
+msgstr "ముద్దుపేరు "
 
 #. Idle stuff
-#: ../finch/gntblist.c:1320 ../finch/gntprefs.c:261
-#: ../libpurple/protocols/bonjour/bonjour.c:340
+#: ../finch/gntblist.c:1320
+#: ../finch/gntprefs.c:261
+#: ../libpurple/protocols/bonjour/bonjour.c:359
 #: ../libpurple/protocols/jabber/buddy.c:787
 #: ../libpurple/protocols/jabber/buddy.c:951
-#: ../libpurple/protocols/msn/msn.c:544 ../libpurple/protocols/msn/state.c:32
-#: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2912
-#: ../libpurple/protocols/yahoo/yahoo.c:3097
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3060
-#: ../pidgin/gtkblist.c:3460 ../pidgin/gtkprefs.c:1925
+#: ../libpurple/protocols/msn/msn.c:611
+#: ../libpurple/protocols/msn/msn.c:629
+#: ../libpurple/protocols/msn/msn.c:637
+#: ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/msnp9/msn.c:544
+#: ../libpurple/protocols/msnp9/state.c:32
+#: ../libpurple/protocols/novell/novell.c:2842
+#: ../libpurple/protocols/oscar/oscar.c:2922
+#: ../libpurple/protocols/yahoo/yahoo.c:3108
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710
+#: ../pidgin/gtkblist.c:3294
+#: ../pidgin/gtkblist.c:3700
+#: ../pidgin/gtkprefs.c:2026
 msgid "Idle"
-msgstr " సోమరితనం"
+msgstr "ఖాళీగా ఉన్నారు"
 
 #: ../finch/gntblist.c:1334
 #, fuzzy
 msgid "On Mobile"
-msgstr "మొబైల్‌కు పంపండి."
+msgstr "మొబైల్"
 
 #: ../finch/gntblist.c:1415
 #, c-format
@@ -596,191 +721,248 @@
 "Online: %d\n"
 "Total: %d"
 msgstr ""
+"ఆన్ లైన్: %d\n"
+"మొత్తం: %d"
 
 #: ../finch/gntblist.c:1424
-#, fuzzy, c-format
+#, c-format
 msgid "Account: %s (%s)"
-msgstr " %s (%s) మీద %s "
+msgstr "%s (%s) : అకౌంటు"
 
 #: ../finch/gntblist.c:1436
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Last Seen: %s ago"
 msgstr ""
 "\n"
-"<b>%s:</b> %s"
-
-#: ../finch/gntblist.c:1702 ../pidgin/gtkdocklet.c:470
-#: ../pidgin/gtkstatusbox.c:1072
+"%s క్రితం చివరిసారిగా చూసినవి:"
+
+#: ../finch/gntblist.c:1706
+#: ../pidgin/gtkdocklet.c:582
 msgid "New..."
-msgstr "కొత్త..."
-
-#: ../finch/gntblist.c:1709 ../pidgin/gtkdocklet.c:471
-#: ../pidgin/gtkstatusbox.c:1073
-#, fuzzy
+msgstr "కొత్తది..."
+
+#: ../finch/gntblist.c:1713
+#: ../pidgin/gtkdocklet.c:583
 msgid "Saved..."
-msgstr "ఫైలును సేవ్ చేయుము..."
-
-#: ../finch/gntblist.c:2087 ../finch/gntplugin.c:255 ../finch/gntui.c:88
-#: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:531
+msgstr "సేవ్ చేయబడింది..."
+
+#: ../finch/gntblist.c:2091
+#: ../finch/gntplugin.c:345
+#: ../finch/gntui.c:88
+#: ../pidgin/gtkdocklet.c:716
+#: ../pidgin/gtkplugin.c:555
 msgid "Plugins"
 msgstr "ప్లగ్‌ఇన్స్ "
 
-#: ../finch/gntblist.c:2203 ../pidgin/gtkdialogs.c:754
-#: ../pidgin/gtkdialogs.c:893 ../pidgin/gtkdialogs.c:974
-#, fuzzy
-msgid "_Name"
-msgstr "పేరు"
-
-#  And now for the buttons
-#: ../finch/gntblist.c:2208 ../pidgin/gtkdialogs.c:759
-#: ../pidgin/gtkdialogs.c:898 ../pidgin/gtkdialogs.c:979
-msgid "_Account"
-msgstr "_ఖాతా "
-
-#: ../finch/gntblist.c:2216 ../pidgin/gtkdialogs.c:767
+#: ../finch/gntblist.c:2220
+#: ../pidgin/gtkdialogs.c:781
 msgid "New Instant Message"
-msgstr "కొత్త సత్వర సందేశం."
-
-#: ../finch/gntblist.c:2218 ../pidgin/gtkdialogs.c:769
-#, fuzzy
-msgid ""
-"Please enter the screen name or alias of the person you would like to IM."
-msgstr "మీరు సందేశాన్ని ఇవ్వదల్చుకున్నవారి స్క్రీన్‌పేరును ఎంటర్ చేయండి."
-
-#  *
+msgstr "కొత్త సత్వర సందేశం"
+
+#: ../finch/gntblist.c:2222
+#: ../pidgin/gtkdialogs.c:783
+msgid "Please enter the screen name or alias of the person you would like to IM."
+msgstr "మీరు సత్వర సందేశం (IM) పంపదలచిన వ్యక్తి స్క్రీన్ పేరును లేదా మారుపేరును దయచేసి  ఎంటర్ చేయండి"
+
+# *
 #  * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
+# * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #. Not multiline
 #. Not masked?
 #. No hints?
-#: ../finch/gntblist.c:2221 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:135
-#: ../finch/gntnotify.c:80 ../libpurple/account.c:1012
-#: ../libpurple/account.c:1262 ../libpurple/protocols/gg/gg.c:506
-#: ../libpurple/protocols/gg/gg.c:665 ../libpurple/protocols/gg/gg.c:802
-#: ../libpurple/protocols/jabber/jabber.c:1736
+#: ../finch/gntblist.c:2225
+#: ../finch/gntcertmgr.c:90
+#: ../finch/gntconn.c:136
+#: ../finch/gntnotify.c:80
+#: ../libpurple/account.c:1104
+#: ../libpurple/account.c:1393
+#: ../libpurple/protocols/gg/gg.c:507
+#: ../libpurple/protocols/gg/gg.c:666
+#: ../libpurple/protocols/gg/gg.c:803
+#: ../libpurple/protocols/jabber/jabber.c:1745
 #: ../libpurple/protocols/jabber/xdata.c:399
-#: ../libpurple/protocols/msn/msn.c:286 ../libpurple/protocols/msn/msn.c:303
-#: ../libpurple/protocols/msn/msn.c:320 ../libpurple/protocols/msn/msn.c:337
-#: ../libpurple/protocols/oscar/oscar.c:6093
+#: ../libpurple/protocols/msn/msn.c:290
+#: ../libpurple/protocols/msn/msn.c:307
+#: ../libpurple/protocols/msn/msn.c:324
+#: ../libpurple/protocols/msn/msn.c:341
+#: ../libpurple/protocols/msnp9/msn.c:286
+#: ../libpurple/protocols/msnp9/msn.c:303
+#: ../libpurple/protocols/msnp9/msn.c:320
+#: ../libpurple/protocols/msnp9/msn.c:337
+#: ../libpurple/protocols/oscar/oscar.c:6143
 #: ../libpurple/protocols/silc/buddy.c:454
-#: ../libpurple/protocols/silc/buddy.c:1190
-#: ../libpurple/protocols/silc/chat.c:447
-#: ../libpurple/protocols/silc/chat.c:482
-#: ../libpurple/protocols/silc/chat.c:745
-#: ../libpurple/protocols/silc/ops.c:1291
-#: ../libpurple/protocols/silc/ops.c:1815
-#: ../libpurple/protocols/silc/silc.c:822
+#: ../libpurple/protocols/silc/buddy.c:1193
+#: ../libpurple/protocols/silc/chat.c:449
+#: ../libpurple/protocols/silc/chat.c:486
+#: ../libpurple/protocols/silc/chat.c:749
+#: ../libpurple/protocols/silc/ops.c:1293
+#: ../libpurple/protocols/silc/ops.c:1819
+#: ../libpurple/protocols/silc/silc.c:965
 #: ../libpurple/protocols/silc10/buddy.c:467
-#: ../libpurple/protocols/silc10/buddy.c:1188
+#: ../libpurple/protocols/silc10/buddy.c:1191
 #: ../libpurple/protocols/silc10/chat.c:425
 #: ../libpurple/protocols/silc10/chat.c:464
 #: ../libpurple/protocols/silc10/chat.c:729
 #: ../libpurple/protocols/silc10/ops.c:1297
 #: ../libpurple/protocols/silc10/ops.c:1903
 #: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/yahoo/yahoo.c:1031
-#: ../libpurple/protocols/yahoo/yahoo.c:3497
-#: ../libpurple/protocols/yahoo/yahoo.c:3508 ../pidgin/gtkblist.c:4039
-#: ../pidgin/gtkcertmgr.c:195 ../pidgin/gtkdialogs.c:772
-#: ../pidgin/gtkdialogs.c:911 ../pidgin/gtkdialogs.c:1003
-#: ../pidgin/gtkrequest.c:270
+#: ../libpurple/protocols/yahoo/yahoo.c:1033
+#: ../libpurple/protocols/yahoo/yahoo.c:3508
+#: ../libpurple/protocols/yahoo/yahoo.c:3519
+#: ../pidgin/gtkcertmgr.c:195
+#: ../pidgin/gtkdialogs.c:786
+#: ../pidgin/gtkdialogs.c:925
+#: ../pidgin/gtkdialogs.c:1017
+#: ../pidgin/gtkrequest.c:320
 msgid "OK"
 msgstr "అలాగే"
 
+# #-#-#-#-#  anjuta.ANJUTA_1_2_0.hi.po (anjuta2 VERSION)  #-#-#-#-#
+# #-#-#-#-#  gnome-session.HEAD.hi.po (gnome-session VERSION)  #-#-#-#-#
+# gnome-session/session-properties.c:179
+#  Cancel button.
+#: ../finch/gntblist.c:2272
+#, fuzzy
+msgid "Channel"
+msgstr "_చానల్:"
+
+#: ../finch/gntblist.c:2284
+#: ../pidgin/gtkblist.c:940
+msgid "Join a Chat"
+msgstr "సంభాషణలో చేరండి."
+
+#: ../finch/gntblist.c:2286
+#, fuzzy
+msgid "Please enter the name of the chat you want to join."
+msgstr "మీరు చేర్చదల్చుకున్న లింక్‌యొక్క URL ను ఎంటర్ చేయండి. "
+
+# join button
+#: ../finch/gntblist.c:2288
+#: ../finch/gntnotify.c:394
+msgid "Join"
+msgstr "చేరు"
+
+# Options
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2241 ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:790
-#, fuzzy
+#: ../finch/gntblist.c:2326
+#: ../finch/gntpounce.c:460
+#: ../pidgin/gtkpounce.c:810
 msgid "Options"
-msgstr "/_ఆప్షన్స్ "
-
-#: ../finch/gntblist.c:2247
-#, fuzzy
+msgstr "ఆప్షన్లు"
+
+#: ../finch/gntblist.c:2332
 msgid "Send IM..."
-msgstr "ఫైలును సేవ్ చేయుము..."
-
-#: ../finch/gntblist.c:2251
-#, fuzzy
-msgid "Show empty groups"
+msgstr "IM పంపండి..."
+
+#: ../finch/gntblist.c:2337
+#, fuzzy
+msgid "Join Chat..."
+msgstr "సంభాషణలో పాల్గొనండి..."
+
+#: ../finch/gntblist.c:2342
+msgid "Show"
+msgstr ""
+
+#: ../finch/gntblist.c:2347
+#, fuzzy
+msgid "Empty groups"
 msgstr "గ్రూప్‌ చేత "
 
-#: ../finch/gntblist.c:2257
-#, fuzzy
-msgid "Show offline buddies"
-msgstr "/మిత్రులు/ఆఫ్‌లైన్‌ అయిన మిత్రులను చూపించండి. "
-
-#  Autostart
-#: ../finch/gntblist.c:2263
-#, fuzzy
-msgid "Sort by status"
-msgstr "స్టాటస్ "
-
-#: ../finch/gntblist.c:2267
-#, fuzzy
-msgid "Sort alphabetically"
-msgstr "వర్ణమాల క్రమంలో"
-
-#: ../finch/gntblist.c:2271
-#, fuzzy
-msgid "Sort by log size"
+#: ../finch/gntblist.c:2354
+#, fuzzy
+msgid "Offline buddies"
+msgstr "ఆఫ్ లైన్ లో ఉన్న మిత్రులను చూపించు"
+
+# Creating the options for the protocol
+#: ../finch/gntblist.c:2361
+#, fuzzy
+msgid "Sort"
+msgstr "పోర్ట్ "
+
+#: ../finch/gntblist.c:2366
+#, fuzzy
+msgid "By Status"
+msgstr "వస్తుస్థితి (స్టాటస్) చేత "
+
+#: ../finch/gntblist.c:2371
+#: ../pidgin/gtkblist.c:4191
+msgid "Alphabetically"
+msgstr "అక్షరక్రమంలో"
+
+#: ../finch/gntblist.c:2376
+#, fuzzy
+msgid "By Log Size"
 msgstr "లాగ్ సైజ్ వలన "
 
-#: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:188
+#: ../finch/gntcertmgr.c:86
+#: ../pidgin/gtkcertmgr.c:188
 #, fuzzy
 msgid "Certificate Import"
-msgstr "కనెక్ట్ "
-
-#: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:189
+msgstr "పోర్ట్ కు కనెక్ట్ చేయండి"
+
+#: ../finch/gntcertmgr.c:87
+#: ../pidgin/gtkcertmgr.c:189
 msgid "Specify a hostname"
 msgstr ""
 
-#: ../finch/gntcertmgr.c:88 ../pidgin/gtkcertmgr.c:190
+#: ../finch/gntcertmgr.c:88
+#: ../pidgin/gtkcertmgr.c:190
 msgid "Type the host name this certificate is for."
 msgstr ""
 
-#: ../finch/gntcertmgr.c:97 ../pidgin/gtkcertmgr.c:210
+#: ../finch/gntcertmgr.c:97
+#: ../pidgin/gtkcertmgr.c:210
 #, c-format
 msgid ""
 "File %s could not be imported.\n"
 "Make sure that the file is readable and in PEM format.\n"
 msgstr ""
 
-#: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:212
+#: ../finch/gntcertmgr.c:99
+#: ../pidgin/gtkcertmgr.c:212
 msgid "Certificate Import Error"
 msgstr ""
 
-#: ../finch/gntcertmgr.c:100 ../pidgin/gtkcertmgr.c:213
+#: ../finch/gntcertmgr.c:100
+#: ../pidgin/gtkcertmgr.c:213
 msgid "X.509 certificate import failed"
 msgstr ""
 
-#: ../finch/gntcertmgr.c:110 ../pidgin/gtkcertmgr.c:224
+#: ../finch/gntcertmgr.c:110
+#: ../pidgin/gtkcertmgr.c:224
 #, fuzzy
 msgid "Select a PEM certificate"
 msgstr "ఫైలును సెలక్ట్ చేయుము."
 
-#: ../finch/gntcertmgr.c:127 ../pidgin/gtkcertmgr.c:245
+#: ../finch/gntcertmgr.c:127
+#: ../pidgin/gtkcertmgr.c:245
 #, c-format
 msgid ""
 "Export to file %s failed.\n"
 "Check that you have write permission to the target path\n"
 msgstr ""
 
-#: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:247
+#: ../finch/gntcertmgr.c:129
+#: ../pidgin/gtkcertmgr.c:247
 msgid "Certificate Export Error"
 msgstr ""
 
-#: ../finch/gntcertmgr.c:130 ../pidgin/gtkcertmgr.c:248
+#: ../finch/gntcertmgr.c:130
+#: ../pidgin/gtkcertmgr.c:248
 msgid "X.509 certificate export failed"
 msgstr ""
 
-#: ../finch/gntcertmgr.c:159 ../pidgin/gtkcertmgr.c:299
+#: ../finch/gntcertmgr.c:159
+#: ../pidgin/gtkcertmgr.c:299
 msgid "PEM X.509 Certificate Export"
 msgstr ""
 
 #: ../finch/gntcertmgr.c:188
 #, c-format
 msgid "Certificate for %s"
-msgstr ""
+msgstr "%s కోసం స్థాయి "
 
 #: ../finch/gntcertmgr.c:195
 #, c-format
@@ -795,448 +977,509 @@
 msgid "SSL Host Certificate"
 msgstr ""
 
-#: ../finch/gntcertmgr.c:233 ../pidgin/gtkcertmgr.c:372
+#: ../finch/gntcertmgr.c:233
+#: ../pidgin/gtkcertmgr.c:372
 #, c-format
 msgid "Really delete certificate for %s?"
 msgstr ""
 
-#: ../finch/gntcertmgr.c:236 ../pidgin/gtkcertmgr.c:374
+#: ../finch/gntcertmgr.c:236
+#: ../pidgin/gtkcertmgr.c:374
 msgid "Confirm certificate delete"
 msgstr ""
 
-#: ../finch/gntcertmgr.c:293 ../pidgin/gtkcertmgr.c:602
+#: ../finch/gntcertmgr.c:293
+#: ../pidgin/gtkcertmgr.c:603
 msgid "Certificate Manager"
 msgstr ""
 
 #. Creating the user splits
-#: ../finch/gntcertmgr.c:298 ../libpurple/protocols/bonjour/bonjour.c:652
-#: ../libpurple/protocols/silc/silc.c:1007
+#: ../finch/gntcertmgr.c:298
+#: ../libpurple/protocols/bonjour/bonjour.c:671
+#: ../libpurple/protocols/silc/silc.c:1150
 #: ../libpurple/protocols/silc10/silc.c:918
-#, fuzzy
 msgid "Hostname"
-msgstr "చివరి పేరు:"
-
-#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:383 ../pidgin/gtkconv.c:1635
-#: ../pidgin/gtkdebug.c:835
+msgstr "హోస్ట్ పేరు"
+
+#: ../finch/gntcertmgr.c:315
+#: ../finch/gntnotify.c:388
+#: ../pidgin/gtkconv.c:1689
+#: ../pidgin/gtkdebug.c:840
 msgid "Info"
-msgstr "సూచన "
+msgstr "సమాచారం "
 
 #. Close button
-#: ../finch/gntcertmgr.c:324 ../finch/gntft.c:237 ../finch/gntnotify.c:182
-#: ../finch/gntplugin.c:210 ../finch/gntplugin.c:310 ../finch/gntpounce.c:738
-#: ../finch/gntstatus.c:216 ../libpurple/protocols/msn/msn.c:403
-#: ../libpurple/protocols/silc/util.c:382
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2468
-#: ../pidgin/gtkrequest.c:273
+#: ../finch/gntcertmgr.c:324
+#: ../finch/gntft.c:237
+#: ../finch/gntnotify.c:182
+#: ../finch/gntplugin.c:213
+#: ../finch/gntplugin.c:406
+#: ../finch/gntpounce.c:751
+#: ../finch/gntstatus.c:216
+#: ../libpurple/protocols/msn/msn.c:407
+#: ../libpurple/protocols/msnp9/msn.c:403
+#: ../libpurple/protocols/silc/util.c:388
+#: ../libpurple/protocols/silc10/util.c:377
+#: ../pidgin/gtkaccount.c:2474
+#: ../pidgin/gtkrequest.c:323
 msgid "Close"
-msgstr "క్లోజ్ "
-
-#: ../finch/gntconn.c:124
-#, fuzzy, c-format
+msgstr "ముగించు "
+
+#: ../finch/gntconn.c:125
+#, c-format
 msgid "%s (%s)"
-msgstr " %s (%s) మీద %s "
-
-#: ../finch/gntconn.c:127
-#, fuzzy, c-format
-msgid "%s disconnected."
-msgstr "డిస్‌కనెక్ట్ అయింది."
+msgstr "%s (%s)"
 
 #: ../finch/gntconn.c:128
 #, c-format
+msgid "%s disconnected."
+msgstr "%s డిస్‌కనెక్ట్ అయింది."
+
+#: ../finch/gntconn.c:129
+#, c-format
 msgid ""
 "%s\n"
 "\n"
-"Finch will not attempt to reconnect the account until you correct the error "
-"and re-enable the account."
-msgstr ""
-
-#: ../finch/gntconn.c:137 ../pidgin/gtkblist.c:4041
-#, fuzzy
+"Finch will not attempt to reconnect the account until you correct the error and re-enable the account."
+msgstr ""
+"%s\n"
+"\n"
+"%s లోపాన్ని సరిచేసి అకౌంటును తిరిగి క్రియాశీలం చేసేదాకా అకౌంటుకు మళ్ళీ కనెక్ట్ చేయడానికి ప్రయత్నించదు."
+
+#: ../finch/gntconn.c:138
 msgid "Re-enable Account"
-msgstr "కొత్త జాబర్ ఎకౌంట్‌ను రిజిస్టర్ చేయండి."
-
-#: ../finch/gntconv.c:139
+msgstr "తిరిగి సాధ్యపడే అకౌంటు"
+
+#: ../finch/gntconv.c:137
 msgid "No such command."
 msgstr "అలాంటి కమాండ్ లేదు."
 
-#: ../finch/gntconv.c:143 ../pidgin/gtkconv.c:489
+#: ../finch/gntconv.c:141
+#: ../pidgin/gtkconv.c:531
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
-msgstr "సింటాక్స్ పొరపాటు : మీరు కమాండ్‌కు తప్పు నెంబరు ఆర్గ్యుమెంట్లను టైప్ చేశారు."
-
-#: ../finch/gntconv.c:148 ../pidgin/gtkconv.c:495
+msgstr "వాక్య విన్యాసంలో పొరపాటు : మీరు ఆ కమాండ్‌కు తప్పుడు నెంబరు ఆర్గ్యుమెంట్లను టైప్ చేశారు."
+
+#: ../finch/gntconv.c:146
+#: ../pidgin/gtkconv.c:537
 msgid "Your command failed for an unknown reason."
 msgstr "అజ్ఞాత కారణంవల్ల మీ కమాండ్ విఫలమైనది."
 
-#: ../finch/gntconv.c:153 ../pidgin/gtkconv.c:502
-#, fuzzy
+#: ../finch/gntconv.c:151
+#: ../pidgin/gtkconv.c:544
 msgid "That command only works in chats, not IMs."
-msgstr "ఆ కమాండ్ Chats లో మాత్రమే పనిచేస్తుంది, IMs లో కాదు. "
-
-#: ../finch/gntconv.c:156 ../pidgin/gtkconv.c:505
-#, fuzzy
+msgstr "ఆ కమాండ్ సంభాషణల్లోనే పనిచేస్తుంది, IM ల విషయంలో కాదు."
+
+#: ../finch/gntconv.c:154
+#: ../pidgin/gtkconv.c:547
 msgid "That command only works in IMs, not chats."
-msgstr "ఆ కమాండ్ IMs లో పనిచేస్తుంది, Chats లో కాదు."
-
-#: ../finch/gntconv.c:160 ../pidgin/gtkconv.c:510
+msgstr "ఆ కమాండ్  IM లలోనే పనిచేస్తుంది, సంభాషణల విషయంలో కాదు."
+
+#: ../finch/gntconv.c:158
+#: ../pidgin/gtkconv.c:552
 msgid "That command doesn't work on this protocol."
-msgstr "ఈ ప్రొటోకాల్‌లో ఆ కమాండ్ పనిచేయదు."
-
-#: ../finch/gntconv.c:168
+msgstr "ఈ ప్రొటోకాల్‌ పై ఆ కమాండ్ పనిచేయదు."
+
+#: ../finch/gntconv.c:166
 #, fuzzy
 msgid "Message was not sent, because you are not signed on."
-msgstr "సందేశాన్ని పంపడం సాధ్యం కాదు, ఎందుకంటే వినియోగదారుడు ఆఫ్‌లైన్‌లో ఉన్నాడు. "
-
-#: ../finch/gntconv.c:251
-#, fuzzy, c-format
+msgstr "మేము అత్యంత వేగంగా పంపిస్తున్నాం కనుక సందేశాన్ని పంపలేకపోయాం:"
+
+#: ../finch/gntconv.c:245
+#, c-format
 msgid "%s (%s -- %s)"
-msgstr " %s (%s) మీద %s "
-
-#: ../finch/gntconv.c:274
+msgstr "%s (%s -- %s)"
+
+#: ../finch/gntconv.c:268
 #, c-format
 msgid "%s [%s]"
-msgstr ""
-
-#: ../finch/gntconv.c:279 ../finch/gntconv.c:773
-#, fuzzy, c-format
+msgstr "%s [%s]"
+
+#: ../finch/gntconv.c:273
+#: ../finch/gntconv.c:795
+#, c-format
 msgid ""
 "\n"
 "%s is typing..."
-msgstr "వినియోగదారుడు టైప్ చేస్తున్నాడు ... "
-
-#: ../finch/gntconv.c:298
+msgstr ""
+"\n"
+"%s టైప్ చేస్తున్నారు..."
+
+#: ../finch/gntconv.c:292
 #, fuzzy
 msgid "You have left this chat."
 msgstr "మీరు చాట్‌లో సంభాషిస్తున్నారు. "
 
-#: ../finch/gntconv.c:387 ../pidgin/gtkconv.c:1362
+#: ../finch/gntconv.c:408
+#: ../pidgin/gtkconv.c:1416
 msgid "Logging started. Future messages in this conversation will be logged."
-msgstr ""
-
-#: ../finch/gntconv.c:393 ../pidgin/gtkconv.c:1370
-msgid ""
-"Logging stopped. Future messages in this conversation will not be logged."
-msgstr ""
-
-#: ../finch/gntconv.c:442
+msgstr "లాగింగ్ ప్రారంభమైంది. ఈ సంభాషణలోని రాబోయే సందేశాలు లాగ్ అవుతాయి."
+
+#: ../finch/gntconv.c:414
+#: ../pidgin/gtkconv.c:1424
+msgid "Logging stopped. Future messages in this conversation will not be logged."
+msgstr "లాగింగ్ నిలిచిపోయింది. ఈ సంభాషణలో తదుపరి సందేశాలు లాగ్ కావు."
+
+#: ../finch/gntconv.c:463
 #, fuzzy
 msgid "Send To"
-msgstr "_పేరుతో పంపుము"
-
-#  Conversations
-#: ../finch/gntconv.c:486
+msgstr "_వీరికి పంపండి"
+
+# Conversations
+# Conversation menu
+#: ../finch/gntconv.c:507
 #, fuzzy
 msgid "Conversation"
-msgstr "సంభాషణలు "
-
-#: ../finch/gntconv.c:492
+msgstr "/సంభాషణ"
+
+#: ../finch/gntconv.c:513
+#, fuzzy
 msgid "Clear Scrollback"
-msgstr ""
-
-#: ../finch/gntconv.c:496 ../finch/gntprefs.c:191
-#, fuzzy
+msgstr "/సంభాషణ/క్లియర్_ స్క్రోల్ బ్యాక్"
+
+#: ../finch/gntconv.c:517
+#: ../finch/gntprefs.c:191
 msgid "Show Timestamps"
-msgstr "టైమ్‌స్టాంప్స్ "
-
-#: ../finch/gntconv.c:512
+msgstr "టైమ్ స్టాంప్ లను చూపించు"
+
+#: ../finch/gntconv.c:533
 #, fuzzy
 msgid "Add Buddy Pounce..."
 msgstr "Buddy _Pounceను చేర్చండి."
 
-#: ../finch/gntconv.c:527
+#: ../finch/gntconv.c:548
 #, fuzzy
 msgid "Enable Logging"
 msgstr "/ఆప్షన్స్/ఎనేబుల్ లాగింగ్ "
 
-#: ../finch/gntconv.c:533
+#: ../finch/gntconv.c:554
 #, fuzzy
 msgid "Enable Sounds"
-msgstr "/ఆప్షన్స్/ఎనేబుల్ సౌండ్స్ "
-
-#: ../finch/gntconv.c:739
-#, fuzzy
+msgstr "శబ్ధాలకు వీలుకల్పించు:"
+
+#: ../finch/gntconv.c:760
 msgid "<AUTO-REPLY> "
-msgstr "(%s) %s <ఆటో రిప్లై>: %s\n"
+msgstr "<ఆటో-రిప్లై> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:861
+#: ../finch/gntconv.c:883
 msgid "List of users:\n"
-msgstr ""
-
-#: ../finch/gntconv.c:1023 ../pidgin/gtkconv.c:331
+msgstr "వినియోగదారుల జాబితా:\n"
+
+#: ../finch/gntconv.c:1045
+#: ../pidgin/gtkconv.c:371
 msgid "Supported debug options are:  version"
-msgstr "సపోర్టు చేయబడిన డీబగ్ ఆప్షన్లు : వెర్షన్ "
-
-#: ../finch/gntconv.c:1059 ../pidgin/gtkconv.c:381
+msgstr "సపోర్టు చేసిన డీబగ్ ఆప్షన్లు : వెర్షన్ "
+
+#: ../finch/gntconv.c:1081
+#: ../pidgin/gtkconv.c:423
 msgid "No such command (in this context)."
-msgstr "(ఈ సందర్భంలో) అలాంటి కమాడ్ లేదు."
-
-#: ../finch/gntconv.c:1062 ../pidgin/gtkconv.c:384
+msgstr "(ఈ సందర్భంలో) అలాంటి కమాండ్ లేదు."
+
+#: ../finch/gntconv.c:1084
+#: ../pidgin/gtkconv.c:426
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
 msgstr ""
-"ఒకానొక కమాండ్ విషయంలో నిర్దిష్టమైన సహాయం కావలిస్తే  \"/help &lt;command&gt;\" ను వాడండి.\n"
-"ఈ సందర్భంలో ఈ క్రింది కమాండ్స్ లభిస్తున్నాయి:\n"
-
-#: ../finch/gntconv.c:1120 ../pidgin/gtkconv.c:7560
-msgid ""
-"say &lt;message&gt;:  Send a message normally as if you weren't using a "
-"command."
-msgstr "చెప్పండి &lt;సందేశం&gt;:  మీరు కమాండ్ వాడడం లేదనుకొని సందేశాన్ని పంపండి."
-
-#: ../finch/gntconv.c:1123 ../pidgin/gtkconv.c:7563
+" నిర్దిష్ట కమాండ్ \n"
+" పై సహాయం కోసం  \"/help &lt;command&gt;\" ను ఉపయోగించండి.\n"
+":ఈ సందర్భంలో ఈ కింది కమాండ్ లు అందుబాటులో ఉన్నాయి\n"
+
+#: ../finch/gntconv.c:1142
+#: ../pidgin/gtkconv.c:7755
+msgid "say &lt;message&gt;:  Send a message normally as if you weren't using a command."
+msgstr "  మీరు కమాండ్ ను వాడడం లేదన్నట్టు say lt;message&gt;:సందేశాన్ని పంపండి."
+
+#: ../finch/gntconv.c:1145
+#: ../pidgin/gtkconv.c:7758
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
-msgstr "నేను &lt;చర్య&gt;: ఒక మిత్రునికి గాని లేక కాలక్షేపంరాయుడికి గాని IRC style చర్యను పంపండి."
-
-#: ../finch/gntconv.c:1126 ../pidgin/gtkconv.c:7566
-msgid ""
-"debug &lt;option&gt;:  Send various debug information to the current "
-"conversation."
-msgstr "డీబగ్ &lt;ఆప్షన్&gt;: ప్రస్తుత సంభాషణలో వివిధ డీబగ్ సమాచారములను పంపుము."
-
-#  Remove on type button
-#: ../finch/gntconv.c:1129 ../pidgin/gtkconv.c:7569
-#, fuzzy
+msgstr " మిత్రునికి  లేదా సంభాషణ కోసం  IRC స్టైల్ యాక్షన్ me &lt;action&gt;:  పంపండి."
+
+#: ../finch/gntconv.c:1148
+#: ../pidgin/gtkconv.c:7761
+msgid "debug &lt;option&gt;:  Send various debug information to the current conversation."
+msgstr " ప్రస్తుత సంభాషణలో వివిధ డీబగ్ సమాచారం debug &lt;option&gt;: పంపండి."
+
+#: ../finch/gntconv.c:1151
+#: ../pidgin/gtkconv.c:7764
 msgid "clear: Clears the conversation scrollback."
-msgstr "సంభాషణ విండోను %s క్లోజ్ చేశారు."
-
-#: ../finch/gntconv.c:1132 ../pidgin/gtkconv.c:7575
+msgstr "క్లియర్: సంభాషణ స్క్రోల్ బ్యాక్ ను క్లియర్ చేస్తుంది."
+
+#: ../finch/gntconv.c:1154
+#: ../pidgin/gtkconv.c:7770
 msgid "help &lt;command&gt;:  Help on a specific command."
-msgstr "సహాయం &lt;కమాండ్&gt;: ఒకానొక నిర్దిష్ట కమాండ్‌కు సంబంధించి సహాయం."
-
-#: ../finch/gntconv.c:1135
+msgstr " నిర్దిష్ట కమాండ్‌ పై  సహాయం: help &lt;command&gt;."
+
+#: ../finch/gntconv.c:1157
+#, fuzzy
 msgid "users:  Show the list of users in the chat."
-msgstr ""
-
-#: ../finch/gntconv.c:1140
+msgstr "స్థాయులు: సేవ్ చేసిన స్థాయుల విండోను చూపించు."
+
+#: ../finch/gntconv.c:1162
 msgid "plugins: Show the plugins window."
-msgstr ""
-
-#: ../finch/gntconv.c:1143
+msgstr "ప్లగ్ ఇన్స్: ప్లగ్ ఇన్స్ విండోను చూపించు. "
+
+#: ../finch/gntconv.c:1165
 msgid "buddylist: Show the buddylist."
-msgstr ""
-
-#: ../finch/gntconv.c:1146
+msgstr "మిత్రుల జాబితా: మిత్రుల జాబితా చూపించు."
+
+#: ../finch/gntconv.c:1168
 msgid "accounts: Show the accounts window."
-msgstr ""
-
-#: ../finch/gntconv.c:1149
+msgstr "అకౌంట్లు: అకౌంట్ల విండోను చూపించు."
+
+#: ../finch/gntconv.c:1171
 msgid "debugwin: Show the debug window."
-msgstr ""
-
-#: ../finch/gntconv.c:1152
+msgstr "డిబగ్ విన్: డిబగ్ విండోను చూపించు. "
+
+#: ../finch/gntconv.c:1174
 msgid "prefs: Show the preference window."
-msgstr ""
-
-#: ../finch/gntconv.c:1155
+msgstr "ప్రాధాన్యాలు: ప్రాధాన్యాల విండోను చూపించు."
+
+#: ../finch/gntconv.c:1177
 msgid "statuses: Show the savedstatuses window."
-msgstr ""
-
-#: ../finch/gntdebug.c:235 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:695
+msgstr "స్థాయులు: సేవ్ చేసిన స్థాయుల విండోను చూపించు."
+
+#: ../finch/gntdebug.c:231
+#: ../pidgin/gtkconv.c:989
+#: ../pidgin/gtkconv.c:2663
+#: ../pidgin/gtkdebug.c:220
+#: ../pidgin/gtkft.c:543
+msgid "Unable to open file."
+msgstr "ఫైలు ఓపెన్ చేయ నలవి కాదు."
+
+#: ../finch/gntdebug.c:271
+#: ../finch/gntui.c:86
+#: ../pidgin/gtkdebug.c:700
 msgid "Debug Window"
-msgstr "విండోను డీ‌బగ్ చేయుము "
+msgstr "విండోను డీ‌బగ్ చేయు "
 
 #. XXX: Setting the GROW_Y for the following widgets don't make sense. But right now
 #. * it's necessary to make the width of the debug window resizable ... like I said,
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #.
-#: ../finch/gntdebug.c:256 ../pidgin/gtkdebug.c:754
-#, fuzzy
+#: ../finch/gntdebug.c:292
+#: ../pidgin/gtkdebug.c:759
 msgid "Clear"
-msgstr "క్లోజ్ "
-
-#: ../finch/gntdebug.c:262
-#, fuzzy
-msgid "Filter: "
-msgstr "విఫలమైనది "
-
-#: ../finch/gntdebug.c:266 ../pidgin/gtkdebug.c:763
+msgstr "క్లియర్ చేయు"
+
+#: ../finch/gntdebug.c:303
+#, fuzzy
+msgid "Filter:"
+msgstr "ఫిల్టర్"
+
+#: ../finch/gntdebug.c:309
+#: ../pidgin/gtkdebug.c:768
 msgid "Pause"
 msgstr "ఆగుము "
 
-#: ../finch/gntft.c:118 ../pidgin/gtkft.c:229
-#, fuzzy, c-format
+#: ../finch/gntft.c:118
+#: ../pidgin/gtkft.c:229
+#, c-format
 msgid "File Transfers - %d%% of %d files"
-msgstr "%s కు ఫైల్ ట్రాన్స్‌ఫర్ రద్దు అయినది.\n"
+msgstr "ఫైలు బదిలీ - %d%% of %d ఫైళ్ళు"
 
 #. Create the window.
-#: ../finch/gntft.c:123 ../finch/gntft.c:196 ../finch/gntui.c:87
-#: ../pidgin/gtkft.c:234 ../pidgin/gtkft.c:762
+#: ../finch/gntft.c:123
+#: ../finch/gntft.c:196
+#: ../finch/gntui.c:87
+#: ../pidgin/gtkft.c:234
+#: ../pidgin/gtkft.c:762
 msgid "File Transfers"
-msgstr "ఫైల్‌ ట్రాన్స్‌ఫర్స్ "
-
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:645
+msgstr "ఫైల్‌  బదిలీలు"
+
+#: ../finch/gntft.c:201
+#: ../pidgin/gtkft.c:645
 msgid "Progress"
 msgstr "ప్రగతి "
 
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:652
+#: ../finch/gntft.c:201
+#: ../pidgin/gtkft.c:652
 msgid "Filename"
 msgstr "ఫైల్ పేరు "
 
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:659
+#: ../finch/gntft.c:201
+#: ../pidgin/gtkft.c:659
 msgid "Size"
-msgstr "సైజ్ "
+msgstr "పరిమాణం "
+
+#: ../finch/gntft.c:201
+msgid "Speed"
+msgstr "వేగం"
 
 #: ../finch/gntft.c:201
-#, fuzzy
-msgid "Speed"
-msgstr "స్పీడ్:"
-
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:666
+#: ../pidgin/gtkft.c:666
 msgid "Remaining"
-msgstr "మిగిలిన "
-
-#  Autostart
+msgstr "మిగిలినది "
+
+# Autostart
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:201 ../finch/gntstatus.c:547 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:344
-#: ../libpurple/protocols/gg/gg.c:1039 ../libpurple/protocols/gg/gg.c:1576
+#: ../finch/gntft.c:201
+#: ../finch/gntstatus.c:547
+#: ../finch/gntstatus.c:576
+#: ../libpurple/protocols/bonjour/bonjour.c:363
+#: ../libpurple/protocols/gg/gg.c:1041
 #: ../libpurple/protocols/gg/gg.c:1584
+#: ../libpurple/protocols/gg/gg.c:1592
 #: ../libpurple/protocols/jabber/buddy.c:778
 #: ../libpurple/protocols/jabber/buddy.c:782
 #: ../libpurple/protocols/jabber/buddy.c:941
-#: ../libpurple/protocols/jabber/jabber.c:1500
-#: ../libpurple/protocols/msn/msn.c:543
-#: ../libpurple/protocols/novell/novell.c:2835
+#: ../libpurple/protocols/jabber/jabber.c:1538
+#: ../libpurple/protocols/msn/msn.c:621
+#: ../libpurple/protocols/msn/msn.c:631
+#: ../libpurple/protocols/msn/msn.c:636
+#: ../libpurple/protocols/msn/msn.c:639
+#: ../libpurple/protocols/msnp9/msn.c:543
+#: ../libpurple/protocols/novell/novell.c:2852
 #: ../libpurple/protocols/oscar/oscar.c:821
 #: ../libpurple/protocols/oscar/oscar.c:826
 #: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:2700
-#: ../libpurple/protocols/oscar/oscar.c:3780
-#: ../libpurple/protocols/sametime/sametime.c:3263
-#: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3248 ../pidgin/gtkblist.c:3104
-#: ../pidgin/gtkblist.c:3118 ../pidgin/gtkblist.c:3120
-#: ../pidgin/gtksavedstatuses.c:999 ../pidgin/gtksavedstatuses.c:1144
+#: ../libpurple/protocols/oscar/oscar.c:2710
+#: ../libpurple/protocols/oscar/oscar.c:3790
+#: ../libpurple/protocols/sametime/sametime.c:3305
+#: ../libpurple/protocols/sametime/sametime.c:4196
+#: ../libpurple/protocols/yahoo/yahoo.c:3259
+#: ../pidgin/gtkblist.c:3338
+#: ../pidgin/gtkblist.c:3352
+#: ../pidgin/gtkblist.c:3354
+#: ../pidgin/gtksavedstatuses.c:1005
+#: ../pidgin/gtksavedstatuses.c:1150
 msgid "Status"
-msgstr "స్టాటస్ "
+msgstr "స్థాయి "
 
 #: ../finch/gntft.c:211
 msgid "Close this window when all transfers finish"
-msgstr ""
+msgstr "బదిలీలన్నీ పూర్తయ్యాక ఈ విండోను మూసివేయు"
 
 #: ../finch/gntft.c:218
-#, fuzzy
 msgid "Clear finished transfers"
-msgstr "_సమాప్తం చేసిన ట్రాన్స్‌ఫర్లను తీసివేయండి."
+msgstr "పూర్తయిన బదిలీలను క్లియర్ చేయు"
 
 #: ../finch/gntft.c:232
-#, fuzzy
 msgid "Stop"
-msgstr "హిప్‌టాప్ "
-
-#: ../finch/gntft.c:305 ../pidgin/gtkft.c:169 ../pidgin/gtkft.c:973
+msgstr "ఆపు"
+
+#: ../finch/gntft.c:305
+#: ../pidgin/gtkft.c:169
+#: ../pidgin/gtkft.c:973
 msgid "Waiting for transfer to begin"
-msgstr "ట్రాన్స్‌ఫర్ అగుటకు ప్రతీక్షించుచున్నది."
+msgstr "ప్రారంభించడానికి బదిలీ కోసం నిరీక్షణ "
 
 # #-#-#-#-#  anjuta.ANJUTA_1_2_0.hi.po (anjuta2 VERSION)  #-#-#-#-#
 # #-#-#-#-#  gnome-session.HEAD.hi.po (gnome-session VERSION)  #-#-#-#-#
 # gnome-session/session-properties.c:179
 #  Cancel button.
-#: ../finch/gntft.c:372 ../pidgin/gtkft.c:166 ../pidgin/gtkft.c:1054
+#: ../finch/gntft.c:372
+#: ../pidgin/gtkft.c:166
+#: ../pidgin/gtkft.c:1054
 msgid "Canceled"
-msgstr "కాన్సెల్ అయినది."
-
-#: ../finch/gntft.c:374 ../pidgin/gtkft.c:1056
+msgstr "రద్దయినది"
+
+#: ../finch/gntft.c:374
+#: ../pidgin/gtkft.c:1056
 msgid "Failed"
 msgstr "విఫలమైనది "
 
-#: ../finch/gntft.c:420 ../pidgin/gtkft.c:134
-#, fuzzy, c-format
+#: ../finch/gntft.c:420
+#: ../pidgin/gtkft.c:134
+#, c-format
 msgid "%.2f KiB/s"
-msgstr "%.2f ప్రతి సెకండుకు కిలోబైట్స్ "
+msgstr "%.2f KB/s"
 
 #: ../finch/gntft.c:431
 #, c-format
 msgid "The file was saved as %s."
 msgstr ""
 
-#: ../finch/gntft.c:432 ../finch/gntft.c:433 ../pidgin/gtkft.c:163
+#: ../finch/gntft.c:432
+#: ../finch/gntft.c:433
+#: ../pidgin/gtkft.c:163
 #: ../pidgin/gtkft.c:1116
 msgid "Finished"
-msgstr "సమాప్తం."
-
-#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:347
+msgstr "ముగిసినది"
+
+#: ../finch/gntft.c:437
+#: ../libpurple/protocols/msn/session.c:404
+#: ../libpurple/protocols/msnp9/session.c:357
 msgid "Transferring"
-msgstr "ట్రాన్స్‌ఫర్ జరుగుచున్నది. "
+msgstr "బదిలీ జరుగుచున్నది "
 
 #: ../finch/gntnotify.c:165
-#, fuzzy
 msgid "Emails"
-msgstr "ఇ-మెయిల్ "
-
-#: ../finch/gntnotify.c:171 ../finch/gntnotify.c:225
+msgstr "ఇ-మెయిళ్లు "
+
+#: ../finch/gntnotify.c:171
+#: ../finch/gntnotify.c:226
 msgid "You have mail!"
-msgstr ""
-
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:513
-#, fuzzy
+msgstr "మీకు మెయిలు వచ్చింది!"
+
+#: ../finch/gntnotify.c:174
+#: ../pidgin/gtknotify.c:519
 msgid "Sender"
-msgstr "లింగము"
-
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:520
+msgstr "పంపినవారు"
+
+#: ../finch/gntnotify.c:174
+#: ../pidgin/gtknotify.c:526
 msgid "Subject"
-msgstr ""
-
-#: ../finch/gntnotify.c:201
-#, fuzzy, c-format
+msgstr "విషయం"
+
+# Descriptive label
+#: ../finch/gntnotify.c:202
+#, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s has %d new message."
 msgstr[1] "%s के %d लिए नये संदेश हैं।"
 
-#: ../finch/gntnotify.c:225 ../pidgin/gtknotify.c:341
-#, fuzzy
+#: ../finch/gntnotify.c:226
+#: ../pidgin/gtknotify.c:342
 msgid "New Mail"
-msgstr "ఇ-మెయిల్ "
-
-#: ../finch/gntnotify.c:290 ../pidgin/gtknotify.c:940
+msgstr "కొత్త మెయిలు"
+
+#: ../finch/gntnotify.c:291
+#: ../pidgin/gtknotify.c:949
 #, c-format
 msgid "Info for %s"
-msgstr "%s కు వివరణ."
-
-#: ../finch/gntnotify.c:291 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:941
+msgstr "%s కోసం సమాచారం"
+
+#: ../finch/gntnotify.c:292
+#: ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:950
 msgid "Buddy Information"
-msgstr "మిత్రుని సమాచారం. "
-
-#: ../finch/gntnotify.c:377 ../libpurple/protocols/qq/group_join.c:367
-#, fuzzy
+msgstr "మిత్రుని సమాచారం "
+
+#: ../finch/gntnotify.c:382
+#: ../libpurple/protocols/qq/group_join.c:367
 msgid "Continue"
-msgstr "కనెక్ట్ చేస్తున్నది."
-
-#: ../finch/gntnotify.c:386 ../pidgin/gtkconv.c:1596
+msgstr "కొనసాగించు"
+
+#: ../finch/gntnotify.c:391
+#: ../pidgin/gtkconv.c:1650
 msgid "IM"
 msgstr "IM"
 
-#: ../finch/gntnotify.c:389
-#, fuzzy
-msgid "Join"
-msgstr "_జాయిన్ అగు"
-
-#: ../finch/gntnotify.c:392 ../libpurple/protocols/sametime/sametime.c:3473
+#: ../finch/gntnotify.c:397
+#: ../libpurple/protocols/sametime/sametime.c:3515
 msgid "Invite"
-msgstr "ఆహ్వానించుము "
-
-#: ../finch/gntnotify.c:395
-#, fuzzy
+msgstr "ఆహ్వానించు "
+
+#: ../finch/gntnotify.c:400
 msgid "(none)"
-msgstr "(పేరు లేదు)"
-
-#: ../finch/gntplugin.c:75 ../finch/gntplugin.c:84
+msgstr "(ఏమీ లేదు)"
+
+#: ../finch/gntplugin.c:77
+#: ../finch/gntplugin.c:86
 msgid "ERROR"
 msgstr ""
 
-#: ../finch/gntplugin.c:75
-#, fuzzy
+#: ../finch/gntplugin.c:77
 msgid "loading plugin failed"
-msgstr "పింగ్ వైఫల్యం "
-
-#: ../finch/gntplugin.c:84
+msgstr ""
+
+#: ../finch/gntplugin.c:86
 msgid "unloading plugin failed"
 msgstr ""
 
-#: ../finch/gntplugin.c:129
+#: ../finch/gntplugin.c:132
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1246,265 +1489,303 @@
 "Website: %s\n"
 "Filename: %s\n"
 msgstr ""
-
-#: ../finch/gntplugin.c:187
+"పేరు: %s\n"
+"వెర్షన్: %s\n"
+"అభివర్ణన: %s\n"
+"రాసినవారు: %s\n"
+"వెబ్ సైటు: %s\n"
+"ఫైలు పేరు: %s\n"
+
+#: ../finch/gntplugin.c:190
 msgid "Plugin need to be loaded before you can configure it."
-msgstr ""
-
-#: ../finch/gntplugin.c:235
+msgstr "మీరు కన్ఫిగర్ చేయడానికి ముందు ప్లగ్ ఇన్ ను లోడ్ చేయల్సిన అవసరం ఉంది."
+
+#: ../finch/gntplugin.c:238
 msgid "No configuration options for this plugin."
-msgstr ""
+msgstr "ఈ ప్లగ్ ఇన్ కోసం కన్ఫిగరేషన్ ఆప్షన్లులేవు."
+
+#: ../finch/gntplugin.c:259
+#, fuzzy
+msgid "Error loading plugin"
+msgstr "మిత్రుని చేర్చడంలో లోపం"
 
 #: ../finch/gntplugin.c:260
-#, fuzzy
+msgid "The selected file is not a valid plugin."
+msgstr ""
+
+#: ../finch/gntplugin.c:261
+msgid "Please open the debug window and try again to see the exact error message."
+msgstr ""
+
+#: ../finch/gntplugin.c:324
+msgid "Select plugin to install"
+msgstr ""
+
+#: ../finch/gntplugin.c:350
 msgid "You can (un)load plugins from the following list."
-msgstr "ఈ క్రింది మిత్రులనుండి మీరు ఆథరైజేషన్‌కోసం ఎదురు చూస్తున్నారు."
-
-#: ../finch/gntplugin.c:315
-#, fuzzy
+msgstr "ఈ కింది జాబితాలోంచి మీరు ప్లగ్ ఇన్ లను (అన్) లోడ్ చేయవచ్చు."
+
+#: ../finch/gntplugin.c:401
+#, fuzzy
+msgid "Install Plugin..."
+msgstr "చివరిలాగ్ ప్లగ్ ఇన్"
+
+#: ../finch/gntplugin.c:411
 msgid "Configure Plugin"
-msgstr "Configure Room"
+msgstr " ప్లగ్ఇన్ ను కన్ఫిగర్ చేయు"
 
 #. copy the preferences to tmp values...
 #. * I liked "take affect immediately" Oh well :-(
 #. (that should have been "effect," right?)
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
-#: ../finch/gntplugin.c:371 ../finch/gntplugin.c:378 ../finch/gntprefs.c:264
-#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2067
+#: ../finch/gntplugin.c:467
+#: ../finch/gntplugin.c:474
+#: ../finch/gntprefs.c:264
+#: ../finch/gntui.c:90
+#: ../pidgin/gtkdocklet.c:717
+#: ../pidgin/gtkprefs.c:2169
 msgid "Preferences"
-msgstr "అభిరుచులు "
-
-#: ../finch/gntpounce.c:183 ../pidgin/gtkpounce.c:256
+msgstr "ప్రాధాన్యాలు "
+
+#: ../finch/gntpounce.c:194
+#: ../pidgin/gtkpounce.c:256
 msgid "Please enter a buddy to pounce."
-msgstr "మీదకు దుమకడానికి ఒక మిత్రుని ఎంటర్ చేయుము."
-
-#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:517
+msgstr "మిత్రుడు దూసుకొస్తున్నాడు దయచేసి ఎంటర్ చేయండి. "
+
+# "New Buddy Pounce"
+#: ../finch/gntpounce.c:339
+#: ../pidgin/gtkpounce.c:531
 msgid "New Buddy Pounce"
-msgstr "కొత్తమిత్రుని దూకుడు"
-
-#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:517
+msgstr "కొత్తమిత్రుడు దూసుకొస్తున్నాడు"
+
+#: ../finch/gntpounce.c:339
+#: ../pidgin/gtkpounce.c:531
 msgid "Edit Buddy Pounce"
-msgstr "మిత్రుని దూకుడును ఎడిట్ చేయండి. "
-
-#: ../finch/gntpounce.c:333
+msgstr "మిత్రుడు దూసుకొస్తున్నాడు ఎడిట్ చేయండి "
+
+# Create the "Pounce Who" frame.
+#: ../finch/gntpounce.c:344
 msgid "Pounce Who"
-msgstr "ఎవర్ని దూకించాలి"
-
-#  And now for the buttons
+msgstr "ఎవరు దూసుకొస్తున్నారు"
+
+# And now for the buttons
+# Set up stuff for the account box
 #. Account:
-#: ../finch/gntpounce.c:336 ../finch/gntstatus.c:456
+#: ../finch/gntpounce.c:347
+#: ../finch/gntstatus.c:456
 msgid "Account:"
-msgstr "ఖాతా:"
-
-#: ../finch/gntpounce.c:358
+msgstr "అకౌంటు:"
+
+#: ../finch/gntpounce.c:369
 #, fuzzy
 msgid "Buddy name:"
 msgstr "_మిత్రుని పేరు:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:374 ../pidgin/gtkpounce.c:585
-#, fuzzy
+#: ../finch/gntpounce.c:387
+#: ../pidgin/gtkpounce.c:600
 msgid "Pounce When Buddy..."
-msgstr "ఎప్పుడు దూకాలి"
-
-#: ../finch/gntpounce.c:376
-#, fuzzy
+msgstr "మిత్రుడు అయినప్పుడు దూసుకు రానీయండి..."
+
+#: ../finch/gntpounce.c:389
 msgid "Signs on"
-msgstr "సైన్ ఆన్ "
-
-#: ../finch/gntpounce.c:377
+msgstr "సైన్ ఆన్"
+
+#: ../finch/gntpounce.c:390
 #, fuzzy
 msgid "Signs off"
-msgstr "సైన్ ఆఫ్ "
-
-#: ../finch/gntpounce.c:378
-#, fuzzy
+msgstr "సైన్‌ఆఫ్ "
+
+#: ../finch/gntpounce.c:391
 msgid "Goes away"
-msgstr "దూరంగా ఉన్నప్పుడు "
-
-#: ../finch/gntpounce.c:379
-#, fuzzy
+msgstr "దూరం వెళ్తున్నారు"
+
+#: ../finch/gntpounce.c:392
 msgid "Returns from away"
-msgstr "_దూరంనుండి తిరిగిరండి "
-
-#: ../finch/gntpounce.c:380
-#, fuzzy
+msgstr "తిరిగివచ్చారు"
+
+#: ../finch/gntpounce.c:393
 msgid "Becomes idle"
-msgstr "%s సోమరిగా తయారైనారు."
-
-#: ../finch/gntpounce.c:381
-#, fuzzy
+msgstr "ఖాళీగా ఉన్నారు"
+
+#: ../finch/gntpounce.c:394
 msgid "Is no longer idle"
-msgstr "ఇప్పుడు %s సోమరిగా లేరు."
-
-#: ../finch/gntpounce.c:382
-#, fuzzy
+msgstr "ఇప్పుడు  ఖాళీగా లేరు"
+
+#: ../finch/gntpounce.c:395
 msgid "Starts typing"
-msgstr "మిత్రుడు _టైపుచేయడం మొదలుపెట్టాడు"
-
-#: ../finch/gntpounce.c:383
-#, fuzzy
+msgstr "టైప్ చేస్తున్నారు"
+
+#: ../finch/gntpounce.c:396
 msgid "Pauses while typing"
-msgstr "వినియోగదారుడు టైప్ చేస్తున్నాడు ... "
-
-#  Buddy List trans options
-#: ../finch/gntpounce.c:384
-#, fuzzy
+msgstr "టైప్ చేస్తుండగా దూసుకు రానీయండి"
+
+#: ../finch/gntpounce.c:397
 msgid "Stops typing"
-msgstr "మిత్రుడు _టైపుచేయడం ఆపుచేశాడు "
-
-#: ../finch/gntpounce.c:385
-#, fuzzy
+msgstr "టైప్ చేయడం ఆపేశారు"
+
+#: ../finch/gntpounce.c:398
 msgid "Sends a message"
-msgstr "సందేశమును పంపుము"
+msgstr "సందేశాన్ని పంపండి"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:414 ../pidgin/gtkpounce.c:646
-#, fuzzy
+#: ../finch/gntpounce.c:427
+#: ../pidgin/gtkpounce.c:661
 msgid "Action"
-msgstr "ప్రదేశం"
-
-#: ../finch/gntpounce.c:416
-#, fuzzy
+msgstr "చర్య"
+
+#: ../finch/gntpounce.c:429
 msgid "Open an IM window"
-msgstr "ఒక సత్వరసందేశ విండోను ఓపెన్ చేయుము "
-
-#: ../finch/gntpounce.c:417
+msgstr "IM విండోను తెరవండి"
+
+#: ../finch/gntpounce.c:430
 #, fuzzy
 msgid "Pop up a notification"
 msgstr "_Popup notification"
 
-#: ../finch/gntpounce.c:418
-#, fuzzy
+#: ../finch/gntpounce.c:431
 msgid "Send a message"
-msgstr "సందేశమును పంపుము"
-
-#: ../finch/gntpounce.c:419
-#, fuzzy
+msgstr "సందేశాన్ని పంపండి"
+
+#: ../finch/gntpounce.c:432
 msgid "Execute a command"
-msgstr "కమాండ్‌ను నెరవేర్చుము."
-
-#: ../finch/gntpounce.c:420
-#, fuzzy
+msgstr "కమాండ్‌ను అమలుచేయండి"
+
+#: ../finch/gntpounce.c:433
 msgid "Play a sound"
-msgstr "శబ్దమును పలికించుము. "
-
-#: ../finch/gntpounce.c:448
+msgstr "శబ్దాన్ని పలికించండి"
+
+#: ../finch/gntpounce.c:461
 msgid "Pounce only when my status is not available"
-msgstr ""
-
-#: ../finch/gntpounce.c:450 ../pidgin/gtkpounce.c:1281
+msgstr "నా స్థాయి అందుబాటులో లేనప్పుడే దూసుకు రండి"
+
+#: ../finch/gntpounce.c:463
+#: ../pidgin/gtkpounce.c:1301
 msgid "Recurring"
-msgstr ""
-
-#: ../finch/gntpounce.c:618
+msgstr "రికరింగ్"
+
+#: ../finch/gntpounce.c:631
 #, fuzzy
 msgid "Cannot create pounce"
-msgstr "ఉపనామమును మార్చలేము."
-
-#: ../finch/gntpounce.c:619
+msgstr "నిక్ ను మార్చజాలదు"
+
+#: ../finch/gntpounce.c:632
+#, fuzzy
 msgid "You do not have any accounts."
-msgstr ""
-
-#: ../finch/gntpounce.c:620
+msgstr "మీరు తప్పనిసరిగా ఒక అకౌంటును ఎంపిక చేసుకోవాలి."
+
+#: ../finch/gntpounce.c:633
 msgid "You must create an account first before you can create a pounce."
 msgstr ""
 
-#: ../finch/gntpounce.c:662 ../pidgin/gtkpounce.c:1096
-#, fuzzy, c-format
+#: ../finch/gntpounce.c:675
+#: ../pidgin/gtkpounce.c:1116
+#, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
-msgstr "మీరు %sను తప్పకుండా తొలగించదల్చుకున్నారా?"
-
-#: ../finch/gntpounce.c:696 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1325
-#, fuzzy
+msgstr "%s కోసం %s పైకి దూసుకు రావడానికి కచ్చితంగా తొలగించాలనుకుంటున్నారా?"
+
+#: ../finch/gntpounce.c:709
+#: ../finch/gntui.c:84
+#: ../pidgin/gtkpounce.c:1352
 msgid "Buddy Pounces"
-msgstr "కొత్తమిత్రుని దూకుడు"
-
-#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1452
+msgstr "మిత్రుడు దూసుకువస్తున్నాడు"
+
+#: ../finch/gntpounce.c:823
+#: ../pidgin/gtkpounce.c:1480
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s మీకోసం టైప్‌చేయడం మొదలుపెట్టినారు (%s)."
 
-#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1454
-#, fuzzy, c-format
+#: ../finch/gntpounce.c:825
+#: ../pidgin/gtkpounce.c:1482
+#, c-format
 msgid "%s has paused while typing to you (%s)"
-msgstr "%s మీకోసం టైప్‌చేయడం మొదలుపెట్టినారు (%s)."
-
-#: ../finch/gntpounce.c:814 ../pidgin/gtkpounce.c:1456
+msgstr "మీకు (%s) టైప్ చేస్తుండగా %s దూసుకువచ్చారు"
+
+#: ../finch/gntpounce.c:827
+#: ../pidgin/gtkpounce.c:1484
 #, c-format
 msgid "%s has signed on (%s)"
-msgstr "%s ఖాతాను ఓపెన్ చేశారు. (%s) "
-
-#: ../finch/gntpounce.c:816 ../pidgin/gtkpounce.c:1458
+msgstr "%s సైన్ ఆన్ చేశారు (%s) "
+
+#: ../finch/gntpounce.c:829
+#: ../pidgin/gtkpounce.c:1486
 #, c-format
 msgid "%s has returned from being idle (%s)"
-msgstr "%s సోమరితనం విడిచిపెట్టి తిరిగి వచ్చారు. (%s)"
-
-#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1460
+msgstr " (%s) ఖాళీగా ఉన్న %s  తిరిగి వచ్చారు"
+
+#: ../finch/gntpounce.c:831
+#: ../pidgin/gtkpounce.c:1488
 #, c-format
 msgid "%s has returned from being away (%s)"
-msgstr "%s దూరంగా ఉండడం మానుకున్నారు. (%s)"
-
-#: ../finch/gntpounce.c:820 ../pidgin/gtkpounce.c:1462
+msgstr "(%s) దూరంనుంచి %s తిరిగి వచ్చారు "
+
+#: ../finch/gntpounce.c:833
+#: ../pidgin/gtkpounce.c:1490
 #, c-format
 msgid "%s has stopped typing to you (%s)"
-msgstr "%s మీకు టైప్ చేయడం ఆపినారు. (%s)"
-
-#: ../finch/gntpounce.c:822 ../pidgin/gtkpounce.c:1464
+msgstr "(%s) మీకు టైప్ చేయడం%s  మానుకున్నారు"
+
+#: ../finch/gntpounce.c:835
+#: ../pidgin/gtkpounce.c:1492
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s సైన్డ్ ఆఫ్ చేశారు. (%s)"
 
-#: ../finch/gntpounce.c:824 ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:837
+#: ../pidgin/gtkpounce.c:1494
 #, c-format
 msgid "%s has become idle (%s)"
-msgstr "%s సోమరిగా మారినారు. (%s)"
-
-#: ../finch/gntpounce.c:826 ../pidgin/gtkpounce.c:1468
+msgstr "%s ఖాళీగా ఉన్నారు (%s)"
+
+#: ../finch/gntpounce.c:839
+#: ../pidgin/gtkpounce.c:1496
 #, c-format
 msgid "%s has gone away. (%s)"
-msgstr "%s వెళ్లిపోయినారు. (%s)"
-
-#: ../finch/gntpounce.c:828 ../pidgin/gtkpounce.c:1470
-#, fuzzy, c-format
+msgstr "%s వెళ్లిపోయారు. (%s)"
+
+#: ../finch/gntpounce.c:841
+#: ../pidgin/gtkpounce.c:1498
+#, c-format
 msgid "%s has sent you a message. (%s)"
-msgstr "%s మీకు పంపించా లనుకుంటున్నాడు %s (%s)"
-
-#: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1471
-#, c-format
+msgstr "%s మీకు ఓ సందేశం పంపారు.(%s)"
+
+#: ../finch/gntpounce.c:842
+#: ../pidgin/gtkpounce.c:1499
 msgid "Unknown pounce event. Please report this!"
-msgstr "తెలియని దూకుడు సంఘటన. దయచేసి రిపోర్టు చేయండి."
+msgstr "తెలియని వారెవరో దూసుకొచ్చారు. దయచేసి రిపోర్టు చేయండి!"
 
 #: ../finch/gntprefs.c:92
+#, fuzzy
 msgid "Based on keyboard use"
-msgstr ""
-
-#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1930
-#, fuzzy
+msgstr "కీబోర్డ్ లేదా మౌస్ ను ఉపయోగాన్ని అనుసరించి"
+
+#: ../finch/gntprefs.c:94
+#: ../pidgin/gtkprefs.c:2031
 msgid "From last sent message"
-msgstr "కంట్రోల్-ఎంటర్ సందేశములను పంపును."
-
-#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:907
-#: ../pidgin/gtkprefs.c:1929 ../pidgin/gtkprefs.c:1943
+msgstr "ఇంతకు మునుపు పంపిన సందేశం నుంచి"
+
+#: ../finch/gntprefs.c:96
+#: ../pidgin/gtkprefs.c:900
+#: ../pidgin/gtkprefs.c:908
+#: ../pidgin/gtkprefs.c:2030
+#: ../pidgin/gtkprefs.c:2044
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
-msgstr "ఎప్పుడూ కాదు. "
+msgstr "ఎప్పుడూ కాదు"
 
 #: ../finch/gntprefs.c:184
-#, fuzzy
 msgid "Show Idle Time"
-msgstr "ఖాతా ఉపయోగించని సమయాన్ని సెట్ చేయండి."
+msgstr "ఖాళీ సమయాన్ని చూపించు"
 
 #: ../finch/gntprefs.c:185
-#, fuzzy
 msgid "Show Offline Buddies"
-msgstr "/మిత్రులు/ఆఫ్‌లైన్‌ అయిన మిత్రులను చూపించండి. "
+msgstr "ఆఫ్ లైన్ లో ఉన్న మిత్రులను చూపించు"
 
 #: ../finch/gntprefs.c:192
-#, fuzzy
 msgid "Notify buddies when you are typing"
-msgstr "మీ మిత్రులకు టైప్ చేస్తున్నట్లు వారికి _సూచించండి. "
+msgstr "మీరు టైపు చేస్తున్నప్పుడు మిత్రులు ఎవరో తెలియజేయండి"
 
 #: ../finch/gntprefs.c:198
 #, fuzzy
@@ -1513,16 +1794,15 @@
 
 #: ../finch/gntprefs.c:199
 msgid "Log IMs"
-msgstr ""
+msgstr " IMలను లాగ్ చేయు"
 
 #: ../finch/gntprefs.c:200
-#, fuzzy
 msgid "Log chats"
-msgstr "చార్టుల నన్నింటిని లాగ్ చేయండి."
+msgstr "సంభాషణలను లాగ్ చేయు"
 
 #: ../finch/gntprefs.c:201
 msgid "Log status change events"
-msgstr ""
+msgstr "స్థాయి మార్పు సంఘటనలను లాగ్ చేయు"
 
 #: ../finch/gntprefs.c:207
 #, fuzzy
@@ -1532,97 +1812,116 @@
 #: ../finch/gntprefs.c:208
 #, fuzzy
 msgid "Change status when idle"
-msgstr "_సోమరిగా నున్నప్పుడు దూరంగా ఉండుము."
+msgstr "_ఖాళీగా ఉన్నప్పుడు స్థాయిని మార్చు"
 
 #: ../finch/gntprefs.c:209
 #, fuzzy
 msgid "Minutes before changing status"
-msgstr "_దూరంగా పోవడానికి ముందుగా:"
+msgstr "స్థాయిమార్చడానికి _నిమిషాల ముందు:"
 
 #: ../finch/gntprefs.c:210
 #, fuzzy
 msgid "Change status to"
-msgstr "అడ్రసును మార్చండి:"
-
-#  Conversations
+msgstr " _స్థాయిని కు మార్చు:"
+
+# Conversations
 #. Conversations
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:993 ../pidgin/gtkprefs.c:2033
+#: ../finch/gntprefs.c:259
+#: ../pidgin/gtkprefs.c:995
+#: ../pidgin/gtkprefs.c:2135
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "సంభాషణలు "
 
-#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1467 ../pidgin/gtkprefs.c:2044
+#: ../finch/gntprefs.c:260
+#: ../pidgin/gtkprefs.c:1563
+#: ../pidgin/gtkprefs.c:2146
 msgid "Logging"
 msgstr "లాగింగ్ "
 
-#: ../finch/gntrequest.c:583
-#, fuzzy
+#: ../finch/gntrequest.c:585
 msgid "Not implemented yet."
-msgstr "ఫీచర్‌ను అమలుపర్చలేదు. "
-
-#: ../finch/gntrequest.c:659 ../pidgin/gtkrequest.c:1555
-#: ../pidgin/gtkrequest.c:1601
+msgstr "ఇంకా అమలుకాలేదు."
+
+#: ../finch/gntrequest.c:661
+#: ../pidgin/gtkrequest.c:1699
+#: ../pidgin/gtkrequest.c:1745
 msgid "Save File..."
-msgstr "ఫైలును సేవ్ చేయుము..."
-
-#: ../finch/gntrequest.c:659 ../pidgin/gtkrequest.c:1556
-#: ../pidgin/gtkrequest.c:1602
+msgstr "ఫైలును సేవ్ చేయు..."
+
+#: ../finch/gntrequest.c:661
+#: ../pidgin/gtkrequest.c:1700
+#: ../pidgin/gtkrequest.c:1746
 msgid "Open File..."
-msgstr "ఫైలును ఓపెన్ చేయుము..."
-
-#  Buddy List trans options
-#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:64
+msgstr "ఫైలును ఓపెన్ చేయు..."
+
+# Buddy List trans options
+#: ../finch/gntsound.c:97
+#: ../pidgin/gtksound.c:62
 msgid "Buddy logs in"
-msgstr "మిత్రుడు లాగ్‌ఇన్ చేసినాడు "
-
-#  Buddy List
-#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:65
+msgstr "మిత్రుడు లాగ్‌ఇన్ చేసాడు "
+
+# Buddy List
+#: ../finch/gntsound.c:98
+#: ../pidgin/gtksound.c:63
 msgid "Buddy logs out"
-msgstr "బడ్డీ లాగ్‌ ఔట్ చేసినాడు "
-
-#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:66
+msgstr "మిత్రుడు లాగ్‌ ఔట్ చేసాడు "
+
+#: ../finch/gntsound.c:99
+#: ../pidgin/gtksound.c:64
 msgid "Message received"
-msgstr "సందేశం అందినది."
-
-#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:67
+msgstr "సందేశం అందినది"
+
+#: ../finch/gntsound.c:100
+#: ../pidgin/gtksound.c:65
 msgid "Message received begins conversation"
 msgstr "అందిన సందేశం సంభాషణ ప్రారంభించును "
 
-#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:68
+#: ../finch/gntsound.c:101
+#: ../pidgin/gtksound.c:66
 msgid "Message sent"
-msgstr "సందేశం పంపబడినది. "
-
-#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:69
+msgstr "సందేశం పంపబడినది"
+
+#: ../finch/gntsound.c:102
+#: ../pidgin/gtksound.c:67
 msgid "Person enters chat"
-msgstr "వ్యక్తి సంభాషణను ప్రారంభించినాడు. "
-
-#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:70
+msgstr "వ్యక్తి సంభాషణను ప్రారంభించారు. "
+
+#: ../finch/gntsound.c:103
+#: ../pidgin/gtksound.c:68
 msgid "Person leaves chat"
-msgstr "వ్యక్తి సంభాషణను ముగించినాడు. "
-
-#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:71
+msgstr "వ్యక్తి సంభాషణను ముగించారు. "
+
+#: ../finch/gntsound.c:104
+#: ../pidgin/gtksound.c:69
 msgid "You talk in chat"
 msgstr "మీరు చాట్‌లో సంభాషిస్తున్నారు. "
 
-#: ../finch/gntsound.c:105 ../pidgin/gtksound.c:72
+#: ../finch/gntsound.c:105
+#: ../pidgin/gtksound.c:70
 msgid "Others talk in chat"
 msgstr "ఇతరులు చాట్‌లో సంభాషిస్తున్నారు. "
 
-#: ../finch/gntsound.c:107 ../pidgin/gtksound.c:75
-#, fuzzy
+#: ../finch/gntsound.c:107
+#: ../pidgin/gtksound.c:73
 msgid "Someone says your screen name in chat"
-msgstr "సంభాషణలో మీ పేరును ఒకానొకరు చెప్పినారు. "
-
-#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:311
+msgstr "సంభాషణలో మీ స్క్రీన్  పేరు ఉందని ఎవరో అంటున్నారు "
+
+#: ../finch/gntsound.c:361
+#: ../pidgin/gtksound.c:306
 msgid "GStreamer Failure"
-msgstr ""
-
-#: ../finch/gntsound.c:362 ../pidgin/gtksound.c:312
+msgstr "Gస్ట్రీమర్ వైఫల్యం"
+
+#: ../finch/gntsound.c:362
+#: ../pidgin/gtksound.c:307
 msgid "GStreamer failed to initialize."
-msgstr ""
-
-#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1587
-#: ../pidgin/gtkprefs.c:1676 ../pidgin/gtkprefs.c:1872
+msgstr "ప్రారంభించడంలో G స్ట్రీమర్ వైఫల్యం."
+
+#: ../finch/gntsound.c:716
+#: ../finch/gntsound.c:802
+#: ../pidgin/gtkprefs.c:1687
+#: ../pidgin/gtkprefs.c:1776
+#: ../pidgin/gtkprefs.c:1972
 #, fuzzy
 msgid "(default)"
 msgstr "గ్నోమ్ డిఫాల్ట్ "
@@ -1630,19 +1929,20 @@
 #: ../finch/gntsound.c:729
 #, fuzzy
 msgid "Select Sound File ..."
-msgstr "ఫైలును సెలక్ట్ చేయుము."
+msgstr "ఫోల్డర్ ను ఎంపికచేయు..."
 
 #: ../finch/gntsound.c:904
 #, fuzzy
 msgid "Sound Preferences"
-msgstr "అభిరుచులు "
+msgstr "ప్రాధాన్యాలు "
 
 #: ../finch/gntsound.c:915
 #, fuzzy
 msgid "Profiles"
 msgstr "ప్రొఫైల్ "
 
-#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1717
+#: ../finch/gntsound.c:954
+#: ../pidgin/gtkprefs.c:1817
 msgid "Automatic"
 msgstr "ఆటోమేటిక్ "
 
@@ -1651,16 +1951,18 @@
 msgid "Console Beep"
 msgstr "కన్సోల్ బీప్ "
 
-#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1721
+#: ../finch/gntsound.c:958
+#: ../pidgin/gtkprefs.c:1821
 msgid "Command"
 msgstr "కమాండ్ "
 
 #: ../finch/gntsound.c:959
 #, fuzzy
 msgid "No Sound"
-msgstr "శబ్దాలు "
-
-#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1712
+msgstr "ఎలాంటి శబ్ధాలు లేవు"
+
+#: ../finch/gntsound.c:961
+#: ../pidgin/gtkprefs.c:1812
 msgid "Sound Method"
 msgstr "ధ్వని పద్ధతి "
 
@@ -1670,7 +1972,7 @@
 msgstr "_పద్ధతి:"
 
 #: ../finch/gntsound.c:973
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Sound Command\n"
 "(%s for filename)"
@@ -1679,91 +1981,104 @@
 "(%s ఫైల్ పేరుకోసం)"
 
 #. Sound options
-#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1756
+#: ../finch/gntsound.c:981
+#: ../pidgin/gtkprefs.c:1856
 msgid "Sound Options"
 msgstr "సౌండ్ ఆప్షన్స్ "
 
-#  Remove on focus button
+# Remove on focus button
 #: ../finch/gntsound.c:982
 #, fuzzy
 msgid "Sounds when conversation has focus"
-msgstr "సంభాషణ _కేంద్రీకృతమైనప్పుడు ధ్వనించును."
-
-#: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:909
-#: ../pidgin/gtkprefs.c:1763 ../pidgin/plugins/timestamp_format.c:42
+msgstr "సంభాషణ _కేంద్రీకృతమైనప్పుడు ధ్వనిస్తుంది"
+
+#: ../finch/gntsound.c:990
+#: ../pidgin/gtkprefs.c:898
+#: ../pidgin/gtkprefs.c:910
+#: ../pidgin/gtkprefs.c:1863
+#: ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:334
-#, fuzzy
 msgid "Always"
-msgstr "దూరంగా "
-
-#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1761
-#, fuzzy
+msgstr "ఎల్లప్పుడూ"
+
+#: ../finch/gntsound.c:991
+#: ../pidgin/gtkprefs.c:1861
 msgid "Only when available"
-msgstr "లభించదు. "
-
-#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1762
-#, fuzzy
+msgstr "అందుబాటులో ఉన్నప్పుడు మాత్రమే"
+
+#: ../finch/gntsound.c:992
+#: ../pidgin/gtkprefs.c:1862
 msgid "Only when not available"
-msgstr "%s లో సంభాషణ లభ్యం కాలేదు. "
+msgstr "అందుబాటులో లేనప్పుడు మాత్రమే"
 
 #: ../finch/gntsound.c:999
+#, fuzzy
 msgid "Volume(0-100):"
-msgstr ""
+msgstr "సముదాయం మొత్తం:"
 
 #. Sound events
-#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1798
+#: ../finch/gntsound.c:1018
+#: ../pidgin/gtkprefs.c:1898
 msgid "Sound Events"
 msgstr "ధ్వని ఘటనలు "
 
-#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1857
+#: ../finch/gntsound.c:1020
+#: ../pidgin/gtkprefs.c:1957
 msgid "Event"
 msgstr "ఘటన"
 
+# The names of IM clients are marked for translation at the request of
+# translators who wanted to transliterate them.  Many translators
+# choose to leave them alone.  Choose what's best for your language.
 #: ../finch/gntsound.c:1020
 #, fuzzy
 msgid "File"
-msgstr "విఫలమైనది "
-
-#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1876
+msgstr "Fire"
+
+#: ../finch/gntsound.c:1039
+#: ../pidgin/gtkprefs.c:1976
 msgid "Test"
 msgstr "పరీక్ష"
 
-#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1880
+#: ../finch/gntsound.c:1042
+#: ../pidgin/gtkprefs.c:1980
 msgid "Reset"
 msgstr "పునఃస్థాపితం చేయు "
 
-#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1884
+#: ../finch/gntsound.c:1045
+#: ../pidgin/gtkprefs.c:1984
 msgid "Choose..."
 msgstr "ఎంపిక చేయండి..."
 
 #: ../finch/gntstatus.c:138
-#, fuzzy, c-format
+#, c-format
 msgid "Are you sure you want to delete \"%s\""
-msgstr "మీరు %sను తప్పకుండా తొలగించదల్చుకున్నారా?"
-
-#  Autostart
+msgstr "మీరు \"%s\" ను కచ్చితంగా తొలగించదలచు కున్నారా?"
+
 #: ../finch/gntstatus.c:141
-#, fuzzy
 msgid "Delete Status"
-msgstr "ఆన్‌లైన్ స్టాటస్ "
-
-#: ../finch/gntstatus.c:176 ../pidgin/gtksavedstatuses.c:597
-#, fuzzy
+msgstr "స్థాయిని తొలగించు"
+
+#: ../finch/gntstatus.c:176
+#: ../pidgin/gtksavedstatuses.c:597
 msgid "Saved Statuses"
-msgstr "సెర్వర్ స్టాటిస్టిక్స్ "
-
-#: ../finch/gntstatus.c:183 ../finch/gntstatus.c:539
+msgstr "సేవ్ చేసిన స్థాయులు"
+
+#: ../finch/gntstatus.c:183
+#: ../finch/gntstatus.c:539
 #: ../libpurple/protocols/jabber/buddy.c:298
 #: ../libpurple/protocols/jabber/buddy.c:1359
-#: ../libpurple/protocols/novell/novell.c:1484
+#: ../libpurple/protocols/msn/msn.c:725
+#: ../libpurple/protocols/novell/novell.c:1493
 #: ../pidgin/gtksavedstatuses.c:500
 msgid "Title"
-msgstr "టైటిల్ "
-
-#: ../finch/gntstatus.c:183 ../pidgin/gtksavedstatuses.c:515
+msgstr "శీర్షిక "
+
+#: ../finch/gntstatus.c:183
+#: ../pidgin/gtksavedstatuses.c:515
 msgid "Type"
-msgstr ""
+msgstr "టైప్"
 
 #. Statuses are almost all the same. Define a macro to reduce code repetition.
 #. PurpleStatusPrimitive
@@ -1773,81 +2088,89 @@
 #. user_settable
 #. not independent
 #. Attributes - each status can have a message.
-#: ../finch/gntstatus.c:183 ../finch/gntstatus.c:564 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:256
-#: ../libpurple/protocols/bonjour/bonjour.c:263
-#: ../libpurple/protocols/bonjour/bonjour.c:346
-#: ../libpurple/protocols/gg/gg.c:1077 ../libpurple/protocols/gg/gg.c:1579
-#: ../libpurple/protocols/gg/gg.c:1597 ../libpurple/protocols/gg/gg.c:1607
-#: ../libpurple/protocols/gg/gg.c:1613 ../libpurple/protocols/gg/gg.c:1622
-#: ../libpurple/protocols/gg/gg.c:1627 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1532
-#: ../libpurple/protocols/jabber/jabber.c:1555
-#: ../libpurple/protocols/jabber/jabber.c:1578
-#: ../libpurple/protocols/jabber/jabber.c:1601
-#: ../libpurple/protocols/jabber/jabber.c:1624
-#: ../libpurple/protocols/jabber/jabber.c:1649
+#: ../finch/gntstatus.c:183
+#: ../finch/gntstatus.c:564
+#: ../finch/gntstatus.c:576
+#: ../libpurple/protocols/bonjour/bonjour.c:275
+#: ../libpurple/protocols/bonjour/bonjour.c:282
+#: ../libpurple/protocols/bonjour/bonjour.c:365
+#: ../libpurple/protocols/gg/gg.c:1079
+#: ../libpurple/protocols/gg/gg.c:1587
+#: ../libpurple/protocols/gg/gg.c:1605
+#: ../libpurple/protocols/gg/gg.c:1615
+#: ../libpurple/protocols/gg/gg.c:1621
+#: ../libpurple/protocols/gg/gg.c:1630
+#: ../libpurple/protocols/gg/gg.c:1635
+#: ../libpurple/protocols/irc/irc.c:238
+#: ../libpurple/protocols/jabber/jabber.c:1570
+#: ../libpurple/protocols/jabber/jabber.c:1584
+#: ../libpurple/protocols/jabber/jabber.c:1598
+#: ../libpurple/protocols/jabber/jabber.c:1612
+#: ../libpurple/protocols/jabber/jabber.c:1626
+#: ../libpurple/protocols/jabber/jabber.c:1642
+#: ../libpurple/protocols/msn/msn.c:677
+#: ../libpurple/protocols/msn/msn.c:683
+#: ../libpurple/protocols/msn/msn.c:689
+#: ../libpurple/protocols/msn/msn.c:695
+#: ../libpurple/protocols/msn/msn.c:700
+#: ../libpurple/protocols/msn/msn.c:705
 #: ../libpurple/protocols/myspace/myspace.c:148
-#: ../libpurple/protocols/novell/novell.c:2838
-#: ../libpurple/protocols/novell/novell.c:2941
-#: ../libpurple/protocols/novell/novell.c:2947
-#: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/oscar/oscar.c:5554
-#: ../libpurple/protocols/oscar/oscar.c:5772
-#: ../libpurple/protocols/oscar/oscar.c:5786
-#: ../libpurple/protocols/oscar/oscar.c:5802
-#: ../libpurple/protocols/oscar/oscar.c:5809
-#: ../libpurple/protocols/oscar/oscar.c:5816
-#: ../libpurple/protocols/sametime/sametime.c:3286
-#: ../libpurple/protocols/sametime/sametime.c:3292
-#: ../libpurple/protocols/sametime/sametime.c:3298
-#: ../libpurple/protocols/sametime/sametime.c:3377
-#: ../libpurple/protocols/silc/buddy.c:1551
-#: ../libpurple/protocols/silc10/buddy.c:1551
-#: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3751
-#: ../libpurple/protocols/yahoo/yahoo.c:3757
+#: ../libpurple/protocols/novell/novell.c:2855
+#: ../libpurple/protocols/novell/novell.c:2958
+#: ../libpurple/protocols/novell/novell.c:2964
+#: ../libpurple/protocols/novell/novell.c:2970
+#: ../libpurple/protocols/oscar/oscar.c:5604
+#: ../libpurple/protocols/oscar/oscar.c:5822
+#: ../libpurple/protocols/oscar/oscar.c:5836
+#: ../libpurple/protocols/oscar/oscar.c:5852
+#: ../libpurple/protocols/oscar/oscar.c:5859
+#: ../libpurple/protocols/oscar/oscar.c:5866
+#: ../libpurple/protocols/sametime/sametime.c:3328
+#: ../libpurple/protocols/sametime/sametime.c:3334
+#: ../libpurple/protocols/sametime/sametime.c:3340
+#: ../libpurple/protocols/sametime/sametime.c:3419
+#: ../libpurple/protocols/silc/buddy.c:1554
+#: ../libpurple/protocols/silc10/buddy.c:1554
+#: ../libpurple/protocols/simple/simple.c:247
+#: ../libpurple/protocols/yahoo/yahoo.c:3762
+#: ../libpurple/protocols/yahoo/yahoo.c:3768
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
-#: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1010
+#: ../pidgin/gtksavedstatuses.c:526
+#: ../pidgin/gtksavedstatuses.c:1016
 msgid "Message"
 msgstr "సందేశం "
 
 #. Use
-#: ../finch/gntstatus.c:194 ../finch/gntstatus.c:593
-#, fuzzy
+#: ../finch/gntstatus.c:194
+#: ../finch/gntstatus.c:593
 msgid "Use"
-msgstr "_ఉపయోగించుము,"
+msgstr "వినియోగించు"
 
 #: ../finch/gntstatus.c:301
-#, fuzzy
 msgid "Invalid title"
-msgstr "Invalid authzid"
+msgstr "చెల్లని శీర్షిక"
 
 #: ../finch/gntstatus.c:302
-#, fuzzy
 msgid "Please enter a non-empty title for the status."
-msgstr "సెలక్ట్ చేసిన గ్రూపుకు కొత్త పేరిమ్ము "
+msgstr "స్థాయికోసం ఖాళీగాలేని శీర్షికను దయచేసి ఎంటర్ చేయండి. "
 
 #: ../finch/gntstatus.c:310
-#, fuzzy
 msgid "Duplicate title"
-msgstr "పబ్లిక్ కీ ఫైల్"
+msgstr "డూప్లికేట్ శీర్షిక"
 
 #: ../finch/gntstatus.c:311
-#, fuzzy
 msgid "Please enter a different title for the status."
-msgstr "సెలక్ట్ చేసిన గ్రూపుకు కొత్త పేరిమ్ము "
-
-#  Autostart
+msgstr "స్థాయికోసం భిన్నమైన శీర్షికను దయచేసి ఎంటర్ చేయండి."
+
 #: ../finch/gntstatus.c:452
-#, fuzzy
 msgid "Substatus"
-msgstr "స్టాటస్ "
-
-#  Autostart
-#: ../finch/gntstatus.c:464 ../pidgin/gtkft.c:699
+msgstr "ఉపస్థాయి"
+
+# Autostart
+#: ../finch/gntstatus.c:464
+#: ../pidgin/gtkft.c:699
 msgid "Status:"
-msgstr "స్టాటస్ :"
+msgstr "స్థాయి :"
 
 #: ../finch/gntstatus.c:479
 #, fuzzy
@@ -1855,51 +2178,47 @@
 msgstr "_సందేశం:"
 
 #: ../finch/gntstatus.c:528
-#, fuzzy
 msgid "Edit Status"
-msgstr "వివాహమైనదా లేదా"
+msgstr "స్థాయిని ఎడిట్ చేయు"
 
 #: ../finch/gntstatus.c:570
 msgid "Use different status for following accounts"
-msgstr ""
+msgstr " కింది అకౌంట్లకోసం భిన్న స్థాయిని ఉపయోగించండి"
 
 #. Save & Use
 #: ../finch/gntstatus.c:604
-#, fuzzy
 msgid "Save & Use"
-msgstr "సేవ్ చేయుము & ఉపయోగించుము"
+msgstr "సేవ్ చేయి & ఉపయోగించు"
 
 #: ../finch/gntui.c:85
 msgid "Certificates"
 msgstr ""
 
-#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2035
+#: ../finch/gntui.c:89
+#: ../pidgin/gtkprefs.c:2137
 msgid "Sounds"
 msgstr "శబ్దాలు "
 
-#  Autostart
+# Autostart
 #: ../finch/gntui.c:91
-#, fuzzy
 msgid "Statuses"
-msgstr "స్టాటస్ "
-
-#  *< name
-#  *< version
-#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
+msgstr "స్థాయులు"
+
+#: ../finch/plugins/gntclipboard.c:115
+#: ../finch/plugins/gntclipboard.c:121
 #: ../finch/plugins/gntclipboard.c:128
-#, fuzzy
 msgid "Error loading the plugin."
-msgstr "పెరల్ ప్లగ్‌ఇన్‌లు లోడ్ చేయడానికి సపోర్టును అందించును."
+msgstr ""
 
 #: ../finch/plugins/gntclipboard.c:116
 #, fuzzy
 msgid "Couldn't find X display"
-msgstr "ఫైలును పంపుట సాధ్యం కాదు. "
+msgstr "ఫైలును తెరవలేము"
 
 #: ../finch/plugins/gntclipboard.c:122
 #, fuzzy
 msgid "Couldn't find window"
-msgstr "ఫైలును పంపుట సాధ్యం కాదు. "
+msgstr "ఫైలును తెరవలేము"
 
 #: ../finch/plugins/gntclipboard.c:129
 msgid "This plugin cannot be loaded because it was not built with X11 support."
@@ -1907,246 +2226,249 @@
 
 #: ../finch/plugins/gntclipboard.c:158
 msgid "GntClipboard"
-msgstr ""
+msgstr "Gnt క్లిప్ బోర్డు"
 
 #: ../finch/plugins/gntclipboard.c:160
 msgid "Clipboard plugin"
-msgstr ""
+msgstr "క్లిప్ బోర్డు ప్లగ్ ఇన్"
 
 #: ../finch/plugins/gntclipboard.c:161
-msgid ""
-"When the gnt clipboard contents change, the contents are made available to "
-"X, if possible."
-msgstr ""
+msgid "When the gnt clipboard contents change, the contents are made available to X, if possible."
+msgstr "gnt క్లిప్ బోర్డులోని విషయం మారినప్పుడు, సాధ్యమైతే, అందులోని విషయాలు X కు తెలియజేయడం జరుగుతుంది."
 
 #: ../finch/plugins/gntgf.c:231
-#, fuzzy, c-format
+#, c-format
 msgid "%s just signed on"
-msgstr "%s సైన్డ్ ఆన్ "
+msgstr "%s ఇప్పుడే సైన్ ఆన్ చేయడం జరిగింది"
 
 #: ../finch/plugins/gntgf.c:238
-#, fuzzy, c-format
+#, c-format
 msgid "%s just signed off"
-msgstr "%s సైన్డ్ ఆఫ్ "
+msgstr "%s ఇప్పుడే సైన్ ఆఫ్ చేయడం జరిగింది"
 
 #: ../finch/plugins/gntgf.c:246
-#, fuzzy, c-format
+#, c-format
 msgid "%s sent you a message"
-msgstr "%s మీకు ఒక ఫైలును పంపించా లనుకుంటున్నాడు."
+msgstr "%s మీకు ఓ సందేశం పంపారు"
 
 #: ../finch/plugins/gntgf.c:265
 #, c-format
 msgid "%s said your nick in %s"
-msgstr ""
+msgstr "%s లో మీ ముద్దు పేరు ఉందని%s తెలిపారు"
 
 #: ../finch/plugins/gntgf.c:267
-#, fuzzy, c-format
+#, c-format
 msgid "%s sent a message in %s"
-msgstr "సందేశమును పంపుము"
+msgstr "%s ఓ సందేశాన్ని  %s లో పంపారు"
 
 #: ../finch/plugins/gntgf.c:305
-#, fuzzy
 msgid "Buddy signs on/off"
-msgstr "మిత్రుడు ఆఫ్‌లైన్‌లో ఉన్నాడు:"
+msgstr "మిత్రుడు సైన్ఆన్/ఆఫ్ చేశారు  "
 
 #: ../finch/plugins/gntgf.c:306
 msgid "You receive an IM"
-msgstr ""
+msgstr "మీకు IM అందింది"
 
 #: ../finch/plugins/gntgf.c:307
-#, fuzzy
 msgid "Someone speaks in a chat"
-msgstr "సంభాషణలో మీ పేరును ఒకానొకరు చెప్పినారు. "
+msgstr "సంభాషణలో ఎవరో మాట్లాడుతున్నారు"
 
 #: ../finch/plugins/gntgf.c:308
-#, fuzzy
 msgid "Someone says your name in a chat"
-msgstr "సంభాషణలో మీ పేరును ఒకానొకరు చెప్పినారు. "
+msgstr "సంభాషణలో ఎవరో మీ పేరు ప్రస్తావించారు"
 
 #: ../finch/plugins/gntgf.c:336
 msgid "Notify with a toaster when"
-msgstr ""
+msgstr "అప్పుడు టోస్టర్ తో తెలియజేయండి"
 
 #: ../finch/plugins/gntgf.c:351
 msgid "Beep too!"
-msgstr ""
+msgstr "బీప్ కూడా చేయండి!"
 
 #: ../finch/plugins/gntgf.c:357
 msgid "Set URGENT for the terminal window."
-msgstr ""
+msgstr "టెర్మినల్ విండోకోసం URGENT ను సెట్ చేయండి."
 
 #: ../finch/plugins/gntgf.c:377
 msgid "GntGf"
-msgstr ""
-
-#: ../finch/plugins/gntgf.c:379 ../finch/plugins/gntgf.c:380
+msgstr "GntGf"
+
+#: ../finch/plugins/gntgf.c:379
+#: ../finch/plugins/gntgf.c:380
 msgid "Toaster plugin"
-msgstr ""
-
-#  Conversations
-#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:120
-#, fuzzy, c-format
+msgstr "టోస్టర్ ప్లగ్ ఇన్"
+
+#: ../finch/plugins/gnthistory.c:116
+#: ../pidgin/plugins/history.c:125
+#, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
-msgstr "%s తో సంభాషణలు "
-
-#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:147
+msgstr " %s:</b><br> పై %s తో <b> సంభాషణలో ఉన్నారు"
+
+#: ../finch/plugins/gnthistory.c:138
+#: ../pidgin/plugins/history.c:153
 msgid "History Plugin Requires Logging"
-msgstr ""
-
-#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:148
+msgstr "హిస్టరీ ప్లగ్ ఇన్ కోసం లాగింగ్ అవసరం"
+
+#: ../finch/plugins/gnthistory.c:139
+#: ../pidgin/plugins/history.c:154
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
-"Enabling logs for instant messages and/or chats will activate history for "
-"the same conversation type(s)."
-msgstr ""
+"Enabling logs for instant messages and/or chats will activate history for the same conversation type(s)."
+msgstr ""
+"లాగింగ్ ను సుసాధ్యం చేసుకోవడానికి పరికరాలు -> ప్రాధాన్యతలు -> లాగింగ్.\n"
+"\n"
+"Enabling logs for instant messages and/or chats will activate history for the same conversation type(s)."
 
 #: ../finch/plugins/gnthistory.c:179
-#, fuzzy
 msgid "GntHistory"
-msgstr "ఇతిహాసం "
-
-#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:190
+msgstr "Gntహిస్టరీ"
+
+#: ../finch/plugins/gnthistory.c:181
+#: ../pidgin/plugins/history.c:197
 msgid "Shows recently logged conversations in new conversations."
-msgstr "కొత్త సంభాషణల్లో ఇటీవల లాగ్ చేసిన సంభాషణలను చూపును."
-
-#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:191
-msgid ""
-"When a new conversation is opened this plugin will insert the last "
-"conversation into the current conversation."
-msgstr "కొత్త సంభాషణ ప్రారంభించినప్పుడు ఈ ప్లగ్‌ఇన్ చివరి సంభాషణను వర్తమాన సంభాషణలో ప్రవేశపెట్టును."
+msgstr "కొత్త సంభాషణల్లో ఇటీవల లాగ్ చేసిన సంభాషణలను చూపుతోంది."
+
+#: ../finch/plugins/gnthistory.c:182
+#: ../pidgin/plugins/history.c:198
+msgid "When a new conversation is opened this plugin will insert the last conversation into the current conversation."
+msgstr "కొత్త సంభాషణ ప్రారంభించినప్పుడు ఈ ప్లగ్‌ఇన్ ఇదివరకటి సంభాషణను ప్రస్తుత సంభాషణలో చేరుస్తుంది."
 
 #: ../finch/plugins/lastlog.c:69
 msgid "Lastlog"
-msgstr ""
+msgstr "చివరిలాగ్"
 
 #. Translator Note: The "backlog" is the conversation buffer/history.
 #: ../finch/plugins/lastlog.c:100
 msgid "lastlog: Searches for a substring in the backlog."
-msgstr ""
+msgstr "చివరిలాగ్: వెనుకలాగ్ లో సబ్ స్ట్రింగ్ కోసం అన్వేషణ"
 
 #: ../finch/plugins/lastlog.c:122
 msgid "GntLastlog"
-msgstr ""
-
-#: ../finch/plugins/lastlog.c:124 ../finch/plugins/lastlog.c:125
+msgstr "Gntచివరిలాగ్"
+
+#: ../finch/plugins/lastlog.c:124
+#: ../finch/plugins/lastlog.c:125
 msgid "Lastlog plugin."
-msgstr ""
-
-#  And now for the buttons
-#: ../libpurple/account.c:791
-#, fuzzy
+msgstr "చివరిలాగ్ ప్లగ్ ఇన్"
+
+# And now for the buttons
+#: ../libpurple/account.c:875
 msgid "accounts"
-msgstr "ఖాతాలు"
-
-#: ../libpurple/account.c:958 ../libpurple/protocols/jabber/auth.c:195
-#, fuzzy
+msgstr "అకౌంట్లు"
+
+#: ../libpurple/account.c:1050
+#: ../libpurple/protocols/jabber/auth.c:199
 msgid "Password is required to sign on."
-msgstr "పాస్‌వర్డ్ కాలం ముగిసినది."
-
-#: ../libpurple/account.c:992
+msgstr "సైన్ ఆన్ అవడానికి పాస్ వర్డ్ అవసరం."
+
+#: ../libpurple/account.c:1084
 #, c-format
 msgid "Enter password for %s (%s)"
-msgstr "%s కోసం పాస్‌వర్డ్‌ను ఎంటర్ చేయండి (%s)"
-
-#: ../libpurple/account.c:999
-#, fuzzy
+msgstr "%s (%s) కోసం పాస్‌వర్డ్‌ను ఎంటర్ చేయండి"
+
+#: ../libpurple/account.c:1091
 msgid "Enter Password"
-msgstr "పాస్‌వర్డ్‌ను మార్చండి."
-
-#: ../libpurple/account.c:1004
-#, fuzzy
+msgstr "పాస్ వర్డ్ ను ఎంటర్ చేయండి"
+
+#: ../libpurple/account.c:1096
 msgid "Save password"
-msgstr "కొత్త పాస్‌వర్డ్ "
-
-#: ../libpurple/account.c:1039 ../libpurple/connection.c:105
+msgstr "పాస్ వర్డ్ ను సేవ్ చేయండి"
+
+#: ../libpurple/account.c:1131
+#: ../libpurple/connection.c:105
 #: ../libpurple/connection.c:178
 #, c-format
 msgid "Missing protocol plugin for %s"
-msgstr "%s ప్రొటోకాల్ ప్లగ్‌ఇన్ మిస్ అయింది."
-
-#: ../libpurple/account.c:1041 ../libpurple/connection.c:108
-#: ../pidgin/gtkblist.c:4036
+msgstr "%s కోసం ప్రొటోకాల్ ప్లగ్‌ఇన్  అదృశ్యం"
+
+#: ../libpurple/account.c:1133
+#: ../libpurple/connection.c:108
 msgid "Connection Error"
-msgstr "కనెక్షన్ పొరపాటు. "
-
-#: ../libpurple/account.c:1199 ../libpurple/protocols/gg/gg.c:707
-#: ../libpurple/protocols/jabber/jabber.c:1687
+msgstr "కనెక్షన్ లో పొరపాటు"
+
+#: ../libpurple/account.c:1330
+#: ../libpurple/protocols/gg/gg.c:708
+#: ../libpurple/protocols/jabber/jabber.c:1698
 msgid "New passwords do not match."
-msgstr "కొత్త పాస్‌వర్డ్స్ మాచ్ కావు."
-
-#: ../libpurple/account.c:1208
+msgstr "కొత్త పాస్‌వర్డులు సరిపోలడం లేదు."
+
+#: ../libpurple/account.c:1339
 msgid "Fill out all fields completely."
-msgstr "ఫీల్డ్స్ అన్నింటిని సంపూర్ణముగా పూర్తిచేయుము."
-
-#: ../libpurple/account.c:1231
+msgstr "ఖాళీలన్నింటినీ  పూర్తిచేయండి."
+
+#: ../libpurple/account.c:1362
 msgid "Original password"
-msgstr "ఒరిజినల్ పాస్‌వర్డ్ "
-
-#: ../libpurple/account.c:1238
+msgstr "అసలైన పాస్‌వర్డ్ "
+
+#: ../libpurple/account.c:1369
 msgid "New password"
 msgstr "కొత్త పాస్‌వర్డ్ "
 
-#: ../libpurple/account.c:1245
+#: ../libpurple/account.c:1376
 msgid "New password (again)"
-msgstr "కొత్త పాస్‌వర్డ్ (మరోసారి)."
-
-#: ../libpurple/account.c:1251
+msgstr "కొత్త పాస్‌వర్డ్ (మరోసారి)"
+
+#: ../libpurple/account.c:1382
 #, c-format
 msgid "Change password for %s"
-msgstr "%sకు పాస్‌వర్డ్‌ను మార్చండి."
-
-#: ../libpurple/account.c:1259
+msgstr "%sకోసం పాస్‌వర్డ్‌ను మార్చండి"
+
+#: ../libpurple/account.c:1390
 msgid "Please enter your current password and your new password."
-msgstr "దయచేసి మీ వర్తమాన పాస్‌వర్డ్‌ను మరియు మీ కొత్త పాస్‌వర్డ్‌ను ఎంటర్ చేయండి."
-
-#: ../libpurple/account.c:1290
+msgstr "దయచేసి మీ ప్రస్తుత పాస్‌వర్డ్‌ను అలాగే  మీ కొత్త పాస్‌వర్డ్‌ను ఎంటర్ చేయండి."
+
+#: ../libpurple/account.c:1421
 #, c-format
 msgid "Change user information for %s"
-msgstr "వినియోగదారుని సమాచారాన్ని %s కోసం మార్చండి. "
-
-#: ../libpurple/account.c:1293 ../libpurple/protocols/toc/toc.c:1670
+msgstr "%s కోసం వినియోగదారు సమాచారాన్ని  మార్చండి. "
+
+#: ../libpurple/account.c:1424
+#: ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
-msgstr "వినియోగదారుని సమాచారం సెట్ చేయండి."
+msgstr "వినియోగదారు సమాచారాన్ని సెట్ చేయండి"
 
 # #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
 # gnome-session/gsm-client-row.c:43
 # #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
-# gnome-session/gsm-client-row.c:43
-#: ../libpurple/account.c:1764 ../libpurple/protocols/gg/gg.c:1017
+#: ../libpurple/account.c:1895
+#: ../libpurple/protocols/gg/gg.c:1019
 #: ../libpurple/protocols/jabber/buddy.c:782
-#: ../libpurple/protocols/jabber/buddy.c:2027
-#: ../libpurple/protocols/jabber/buddy.c:2044
-#: ../libpurple/protocols/novell/novell.c:2831
-#: ../libpurple/protocols/qq/qq.c:232 ../pidgin/gtkft.c:160
+#: ../libpurple/protocols/jabber/buddy.c:2030
+#: ../libpurple/protocols/jabber/buddy.c:2047
+#: ../libpurple/protocols/novell/novell.c:2848
+#: ../libpurple/protocols/qq/qq.c:233
+#: ../pidgin/gtkft.c:160
 msgid "Unknown"
 msgstr "అజ్ఞాతం"
 
-#: ../libpurple/blist.c:521 ../libpurple/blist.c:1320
-#: ../libpurple/blist.c:1552 ../libpurple/protocols/jabber/roster.c:69
-#: ../libpurple/protocols/myspace/myspace.c:3244 ../pidgin/gtkblist.c:5373
+#: ../libpurple/blist.c:521
+#: ../libpurple/blist.c:1321
+#: ../libpurple/blist.c:1531
+#: ../libpurple/protocols/jabber/roster.c:69
+#: ../libpurple/protocols/myspace/myspace.c:3272
+#: ../pidgin/gtkblist.c:6059
 #: ../pidgin/plugins/gevolution/gevo-util.c:67
 #: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
 msgstr "మిత్రులు "
 
-#  Buddy List
+# Buddy List
 #: ../libpurple/blist.c:548
-#, fuzzy
 msgid "buddy list"
-msgstr "మిత్రుల లిస్ట్ "
-
-#: ../libpurple/certificate.c:545
+msgstr "మిత్రుల జాబితా"
+
+#: ../libpurple/certificate.c:558
 msgid "(DOES NOT MATCH)"
 msgstr ""
 
 #. Make messages
-#: ../libpurple/certificate.c:549
+#: ../libpurple/certificate.c:562
 #, c-format
 msgid "%s has presented the following certificate for just-this-once use:"
 msgstr ""
 
-#: ../libpurple/certificate.c:550
+#: ../libpurple/certificate.c:563
 #, c-format
 msgid ""
 "Common name: %s %s\n"
@@ -2154,48 +2476,51 @@
 msgstr ""
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:555
+#: ../libpurple/certificate.c:568
 msgid "Single-use Certificate Verification"
 msgstr ""
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:872
+#: ../libpurple/certificate.c:886
 msgid "Certificate Authorities"
 msgstr ""
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:1040
+#: ../libpurple/certificate.c:1054
 msgid "SSL Peers Cache"
 msgstr ""
 
 #. Make messages
-#: ../libpurple/certificate.c:1171
-#, fuzzy, c-format
+#: ../libpurple/certificate.c:1185
+#, c-format
 msgid "Accept certificate for %s?"
 msgstr "సంభాషణ ఆహ్వానాన్ని అంగీకరించారా?"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1177
+#: ../libpurple/certificate.c:1191
 msgid "SSL Certificate Verification"
 msgstr ""
 
+# *
+# * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #. Number of actions
-#: ../libpurple/certificate.c:1186
+#: ../libpurple/certificate.c:1201
+#, fuzzy
 msgid "Accept"
-msgstr "అంగీకరించు "
-
-#: ../libpurple/certificate.c:1187 ../libpurple/protocols/qq/buddy_opt.c:214
+msgstr "_అంగీకరించు "
+
+#: ../libpurple/certificate.c:1202
+#: ../libpurple/protocols/qq/buddy_opt.c:214
 #: ../libpurple/protocols/qq/group_im.c:144
 #: ../libpurple/protocols/qq/group_opt.c:127
 #: ../libpurple/protocols/qq/sys_msg.c:90
 #: ../libpurple/protocols/qq/sys_msg.c:246
-#, fuzzy
 msgid "Reject"
-msgstr "పునఃస్థాపితం చేయు "
-
-#: ../libpurple/certificate.c:1188
+msgstr "నిరాకరించు"
+
+#: ../libpurple/certificate.c:1203
 msgid "_View Certificate..."
 msgstr ""
 
@@ -2203,23 +2528,19 @@
 #. TODO: Provide the user with more guidance about why he is
 #. being prompted
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1288
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
-"could mean that you are not connecting to the service you believe you are."
+#: ../libpurple/certificate.c:1303
+#, c-format
+msgid "The certificate presented by \"%s\" claims to be from \"%s\" instead.  This could mean that you are not connecting to the service you believe you are."
 msgstr ""
 
 #. Prompt the user to authenticate the certificate
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1313
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" is self-signed. It cannot be "
-"automatically checked."
-msgstr ""
-
-#: ../libpurple/certificate.c:1331
+#: ../libpurple/certificate.c:1328
+#, c-format
+msgid "The certificate presented by \"%s\" is self-signed. It cannot be automatically checked."
+msgstr ""
+
+#: ../libpurple/certificate.c:1346
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
 msgstr ""
@@ -2229,42 +2550,38 @@
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
-#: ../libpurple/certificate.c:1339 ../libpurple/certificate.c:1416
+#: ../libpurple/certificate.c:1354
+#: ../libpurple/certificate.c:1423
+#, fuzzy
 msgid "SSL Certificate Error"
-msgstr ""
-
-#: ../libpurple/certificate.c:1340
+msgstr "రైట్ చేయడంలో పొరపాటు"
+
+#: ../libpurple/certificate.c:1355
 #, fuzzy
 msgid "Invalid certificate chain"
-msgstr "విలువలేని ఆథరైజేషన్ మెకానిజం. "
+msgstr "చెల్లని శీర్షిక"
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1360
-msgid ""
-"You have no database of root certificates, so this certificate cannot be "
-"validated."
+#: ../libpurple/certificate.c:1375
+msgid "You have no database of root certificates, so this certificate cannot be validated."
 msgstr ""
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1382
-msgid ""
-"The root certificate this one claims to be issued by is unknown to Pidgin."
-msgstr ""
-
-#: ../libpurple/certificate.c:1408
-#, c-format
-msgid ""
-"The certificate chain presented by %s does not have a valid digital "
-"signature from the Certificate Authority from which it claims to have a "
-"signature."
-msgstr ""
-
-#: ../libpurple/certificate.c:1417
+#: ../libpurple/certificate.c:1398
+msgid "The root certificate this one claims to be issued by is unknown to Pidgin."
+msgstr ""
+
+#: ../libpurple/certificate.c:1415
+#, c-format
+msgid "The certificate chain presented by %s does not have a valid digital signature from the Certificate Authority from which it claims to have a signature."
+msgstr ""
+
+#: ../libpurple/certificate.c:1424
 msgid "Invalid certificate authority signature"
 msgstr ""
 
 #. Make messages
-#: ../libpurple/certificate.c:1881
+#: ../libpurple/certificate.c:1888
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -2276,56 +2593,60 @@
 msgstr ""
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1890
+#: ../libpurple/certificate.c:1897
 #, fuzzy
 msgid "Certificate Information"
-msgstr "ప్రొఫైల్ సమాచారం "
+msgstr "సర్వర్ సమాచారం "
 
 #: ../libpurple/connection.c:107
 msgid "Registration Error"
-msgstr "రిజిస్ట్రేషన్ పొరపాటు. "
+msgstr "నమోదులో పొరపాటు "
 
 #: ../libpurple/connection.c:180
 #, fuzzy
 msgid "Unregistration Error"
-msgstr "రిజిస్ట్రేషన్ పొరపాటు. "
+msgstr "నమోదులో పొరపాటు "
 
 #: ../libpurple/connection.c:350
-#, fuzzy, c-format
+#, c-format
 msgid "+++ %s signed on"
-msgstr "%s సైన్డ్ ఆన్ "
+msgstr "+++ %s సైన్డ్ ఆన్ "
 
 #: ../libpurple/connection.c:380
-#, fuzzy, c-format
+#, c-format
 msgid "+++ %s signed off"
-msgstr "%s సైన్డ్ ఆఫ్ "
+msgstr "+++ %s సైన్డ్ ఆఫ్ "
 
 # #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
 # gnome-session/gsm-client-row.c:43
 # #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
-# gnome-session/gsm-client-row.c:43
-#: ../libpurple/connection.c:497 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:2337
+#: ../libpurple/connection.c:525
+#: ../libpurple/plugin.c:277
+#: ../libpurple/protocols/jabber/buddy.c:2350
 #: ../libpurple/protocols/msn/servconn.c:141
-#: ../libpurple/protocols/msn/session.c:322
+#: ../libpurple/protocols/msn/session.c:377
+#: ../libpurple/protocols/msnp9/servconn.c:139
+#: ../libpurple/protocols/msnp9/session.c:330
 msgid "Unknown error"
-msgstr "తెలియని పొరపాటు."
+msgstr "అజ్ఞాత పొరపాటు"
 
 #: ../libpurple/conversation.c:170
 msgid "Unable to send message: The message is too large."
-msgstr "संदेश भेजने में असफल: संदेश बहुत बढ़ा है।"
-
-#: ../libpurple/conversation.c:173 ../libpurple/conversation.c:186
+msgstr "సందేశాన్ని పంపలేకపోతున్నాం. సందేశం చాలా పెద్దగా ఉంది."
+
+#: ../libpurple/conversation.c:173
+#: ../libpurple/conversation.c:186
 #, c-format
 msgid "Unable to send message to %s."
-msgstr "%s को संदेश भेजने में असफल।"
+msgstr "%s కు సందేశం పంపడంలో వైఫల్యం."
 
 #: ../libpurple/conversation.c:174
 msgid "The message is too large."
 msgstr "ఈ సందేశం చాలా పెద్దది."
 
-#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:255
-#: ../libpurple/protocols/bonjour/jabber.c:298
+#: ../libpurple/conversation.c:183
+#: ../libpurple/protocols/bonjour/jabber.c:267
+#: ../libpurple/protocols/bonjour/jabber.c:310
 msgid "Unable to send message."
 msgstr "సందేశాన్ని పంపడం కష్టం."
 
@@ -2341,106 +2662,104 @@
 #: ../libpurple/conversation.c:1620
 #, c-format
 msgid "%s entered the room."
-msgstr "%s గదిలో ప్రవేశించారు."
+msgstr "%s రూమ్ లో ప్రవేశించారు."
 
 #: ../libpurple/conversation.c:1623
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
-msgstr "%s [<I>%s</I>] గదిలోకి ప్రవేశించారు."
+msgstr "%s [<I>%s</I>] రూమ్ లోకి ప్రవేశించారు."
 
 #: ../libpurple/conversation.c:1733
 #, c-format
 msgid "You are now known as %s"
-msgstr "నేటినుండి మీ పేరు %s."
+msgstr "ఇప్పుడు మీకు  %s గా గుర్తింపు"
 
 #: ../libpurple/conversation.c:1753
 #, c-format
 msgid "%s is now known as %s"
-msgstr "%s కొత్తపేరు %s."
+msgstr "%s కు  %s గా గుర్తింపు "
 
 #: ../libpurple/conversation.c:1828
 #, c-format
 msgid "%s left the room."
-msgstr "%s గదినుండి బయటకు పోయినారు."
+msgstr "%s రూమ్ వదలి వెళ్లారు.  "
 
 #: ../libpurple/conversation.c:1831
 #, c-format
 msgid "%s left the room (%s)."
-msgstr "%s గదినుండి బయటకు పోయినారు(%s)."
+msgstr "%s రూమ్ వదలి వెళ్ళారు (%s)."
 
 #: ../libpurple/dbus-server.c:584
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to get connection: %s"
-msgstr "%s కోసం  cmodes సెట్ చేయడంలో వైఫల్యం."
+msgstr "కనెక్షన్ పొందడంలో వైఫల్యం: %s"
 
 #: ../libpurple/dbus-server.c:596
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to get name: %s"
-msgstr "సచిత్రమును స్టోర్ చేయడంలో వైఫల్యం: %s\n"
+msgstr "పేరును పొందడంలో వైఫల్యం: %s"
 
 #: ../libpurple/dbus-server.c:610
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to get serv name: %s"
-msgstr "సచిత్రమును స్టోర్ చేయడంలో వైఫల్యం: %s\n"
-
-#: ../libpurple/dbus-server.h:85
+msgstr "సర్వ్ పేరును పొందడంలో వైఫల్యం: %s"
+
+#: ../libpurple/dbus-server.h:84
 msgid "Purple's D-BUS server is not running for the reason listed below"
 msgstr ""
 
-#: ../libpurple/desktopitem.c:287 ../libpurple/desktopitem.c:878
-#, fuzzy
+#: ../libpurple/desktopitem.c:287
+#: ../libpurple/desktopitem.c:878
 msgid "No name"
-msgstr "చివరి పేరు:"
+msgstr "పేరు లేదు"
 
 #: ../libpurple/dnsquery.c:511
-#, fuzzy
 msgid "Unable to create new resolver process\n"
-msgstr "సాకెట్‌ను సృష్టించలేదు. "
+msgstr "కొత్త రిసాల్వర్ ప్రాసెస్ ను సృష్టించలేకపోతున్నాం\n"
 
 #: ../libpurple/dnsquery.c:516
-#, fuzzy
 msgid "Unable to send request to resolver process\n"
-msgstr "%s को संदेश भेजने में असमर्थ"
-
-#: ../libpurple/dnsquery.c:549 ../libpurple/dnsquery.c:697
-#, fuzzy, c-format
+msgstr "రిసాల్వర్ ప్రాసెస్ కు నివేదనను పంపలేకపోతున్నాం\n"
+
+#: ../libpurple/dnsquery.c:549
+#: ../libpurple/dnsquery.c:698
+#, c-format
 msgid ""
 "Error resolving %s:\n"
 "%s"
 msgstr ""
-"చదవడంలో పొరపాటు %s: \n"
-"%s.\n"
-
-#: ../libpurple/dnsquery.c:552 ../libpurple/dnsquery.c:711
-#: ../libpurple/dnsquery.c:831
-#, fuzzy, c-format
+"రిసాల్వ్ చేయడంలో పొరపాటు %s:\n"
+"%s"
+
+#: ../libpurple/dnsquery.c:552
+#: ../libpurple/dnsquery.c:712
+#: ../libpurple/dnsquery.c:830
+#, c-format
 msgid "Error resolving %s: %d"
-msgstr ""
-"చదవడంలో పొరపాటు %s: \n"
-"%s.\n"
+msgstr "రిసాల్వ్ చేయడంలో పొరపాటు %s: %d"
 
 #: ../libpurple/dnsquery.c:574
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error reading from resolver process:\n"
 "%s"
-msgstr "సాకెట్‌నుండి చదువునప్పుడు పొరపాటు."
+msgstr ""
+"రిసాల్వర్ ప్రాసెస్ నుంచి చదవడంలో పొరపాటు:\n"
+"%s"
 
 #: ../libpurple/dnsquery.c:578
-#, fuzzy, c-format
 msgid "EOF while reading from resolver process"
-msgstr "సాకెట్‌నుండి చదువునప్పుడు పొరపాటు."
-
-#: ../libpurple/dnsquery.c:761
-#, fuzzy, c-format
+msgstr "రిసాల్వర్ ప్రాసెస్ నుంచి చదువుతున్నప్పుడు EOF"
+
+#: ../libpurple/dnsquery.c:762
+#, c-format
 msgid "Thread creation failure: %s"
-msgstr "ప్రమాణీకరణ వైఫల్యం. "
+msgstr "Thread ను సృష్టించడంలో వైఫల్యం: %s"
 
 # #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
 # gnome-session/gsm-client-row.c:43
 # #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
-# gnome-session/gsm-client-row.c:43
-#: ../libpurple/dnsquery.c:762
+#: ../libpurple/dnsquery.c:763
 #, fuzzy
 msgid "Unknown reason"
 msgstr "కారణం తెలియదు. "
@@ -2451,7 +2770,7 @@
 "Error reading %s: \n"
 "%s.\n"
 msgstr ""
-"చదవడంలో పొరపాటు %s: \n"
+"%s:  రీడింగ్ లో పొరపాటు  \n"
 "%s.\n"
 
 #: ../libpurple/ft.c:213
@@ -2460,7 +2779,7 @@
 "Error writing %s: \n"
 "%s.\n"
 msgstr ""
-"%s:వ్రాయడంలో పొరపాటు\n"
+"%s: రైటింగ్ లో పొరపాటు \n"
 "%s.\n"
 
 #: ../libpurple/ft.c:217
@@ -2469,16 +2788,16 @@
 "Error accessing %s: \n"
 "%s.\n"
 msgstr ""
-"%s యాక్సెస్ చేయడంలో పొరపాటు \n"
-"%s.\n"
+"%s: \n"
+" యాక్సెస్ చేయడంలో పొరపాటు%s.\n"
 
 #: ../libpurple/ft.c:253
 msgid "Directory is not writable."
-msgstr ""
+msgstr "వ్రాయతగినట్లుగా డైరెక్టరీ లేదు."
 
 #: ../libpurple/ft.c:268
 msgid "Cannot send a file of 0 bytes."
-msgstr "0 బైట్స్ ఫైలను పంపలేదు."
+msgstr "0 బైట్స్ ఉన్న ఫైలును పంపజాలదు."
 
 #: ../libpurple/ft.c:278
 msgid "Cannot send a directory."
@@ -2487,22 +2806,22 @@
 #: ../libpurple/ft.c:287
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
-msgstr "%s  నియమిత ఫైల్ కాదు. పిరికితనంతో ఓవర్‌రైట్ చేయడానికి నిరాకరిస్తోంది.\n"
+msgstr "%s  రెగ్యులర్ ఫైలు కాదు.  ఓవర్‌రైట్ చేయడానికి నిరాకరిస్తోంది.\n"
 
 #: ../libpurple/ft.c:347
 #, c-format
 msgid "%s wants to send you %s (%s)"
-msgstr "%s మీకు పంపించా లనుకుంటున్నాడు %s (%s)"
+msgstr "%s మీకు %s (%s) పంపించా లనుకుంటున్నారు"
 
 #: ../libpurple/ft.c:354
 #, c-format
 msgid "%s wants to send you a file"
-msgstr "%s మీకు ఒక ఫైలును పంపించా లనుకుంటున్నాడు."
+msgstr "%s మీకు ఒక ఫైలును పంపించా లనుకుంటున్నారు"
 
 #: ../libpurple/ft.c:397
 #, c-format
 msgid "Accept file transfer request from %s?"
-msgstr "%s నుండి వచ్చిన ఫైల్ ట్రాన్స్‌ఫర్ విజ్ఞప్తిని అంగీకరించాలా?"
+msgstr "%s నుంచి వచ్చిన ఫైలు బదిలీ విజ్ఞప్తిని అంగీకరించాలా?"
 
 #: ../libpurple/ft.c:401
 #, c-format
@@ -2518,216 +2837,196 @@
 #: ../libpurple/ft.c:436
 #, c-format
 msgid "%s is offering to send file %s"
-msgstr " %s కు %s  ఫైల్ పంపాలని కోరుతున్నాడు. "
+msgstr " %s కు %s  ఫైల్ పంపదలుచుకున్నారు "
 
 #: ../libpurple/ft.c:488
 #, c-format
 msgid "%s is not a valid filename.\n"
-msgstr "%s ఫైల్ పేరుకు విలువ లేదు.\n"
+msgstr "%s ఫైలు పేరు చెల్లుబాటుకాదు.\n"
 
 #: ../libpurple/ft.c:509
 #, c-format
 msgid "Offering to send %s to %s"
-msgstr "%s ను %s కు పంపాలని కోరుకుంటున్నాడు. "
+msgstr "%s కు %s పంపదలుచుకున్నారు  "
 
 #: ../libpurple/ft.c:521
-#, fuzzy, c-format
+#, c-format
 msgid "Starting transfer of %s from %s"
-msgstr "%s నుండి వచ్చిన ఫైల్ ట్రాన్స్‌ఫర్ విజ్ఞప్తిని అంగీకరించాలా?"
+msgstr "%s నుండి %s ను ట్రాన్స్ఫర్ చేయడం ప్రారంభిస్తున్నాం"
 
 #: ../libpurple/ft.c:682
 #, c-format
 msgid "Transfer of file %s complete"
-msgstr "ఫైల్ ట్రాన్స్‌ఫర్ %s పూర్తైనది."
+msgstr "%s ఫైలు బదిలీ పూర్తయినది "
 
 #: ../libpurple/ft.c:685
-#, fuzzy, c-format
 msgid "File transfer complete"
-msgstr "ఫైల్ ట్రాన్స్‌ఫర్ %s పూర్తైనది."
+msgstr "ఫైలు బదిలీ  పూర్తయినది"
 
 #: ../libpurple/ft.c:1103
 #, c-format
 msgid "You canceled the transfer of %s"
-msgstr "%s ఫైల్ ట్రాన్స్‌ఫర్‌ను మీరు రద్దుచేశారు."
+msgstr "%s ఫైలు బదిలీని మీరు రద్దుచేశారు"
 
 #: ../libpurple/ft.c:1108
-#, c-format
 msgid "File transfer cancelled"
-msgstr "ఫైల్ ట్రాన్స్‌ఫర్ కాన్సెల్ అయినది."
+msgstr "ఫైలు బదిలీ రద్దయినది"
 
 #: ../libpurple/ft.c:1166
 #, c-format
 msgid "%s canceled the transfer of %s"
-msgstr "%sను ట్రాన్స్‌ఫర్ చేయడాన్ని %s రద్దు చేశారు."
+msgstr "%s బదిలీని %s రద్దు చేశారు"
 
 #: ../libpurple/ft.c:1171
 #, c-format
 msgid "%s canceled the file transfer"
-msgstr "%s ఫైల్ ట్రాన్స్‌ఫర్‌ను రద్దు చేశారు."
+msgstr " ఫైలు బదిలీని %s రద్దు చేశారు"
 
 #: ../libpurple/ft.c:1228
-#, fuzzy, c-format
+#, c-format
 msgid "File transfer to %s failed."
-msgstr "%s కు ఫైల్ ట్రాన్స్‌ఫర్ రద్దు అయినది.\n"
+msgstr "%s కు ఫైలును ట్రాన్స్ఫర్ చేయడంలో వైఫల్యం."
 
 #: ../libpurple/ft.c:1230
-#, fuzzy, c-format
+#, c-format
 msgid "File transfer from %s failed."
-msgstr "%s నుండి ఫైల్ ట్రాన్స్‌ఫర్ రద్దు అయినది.\n"
+msgstr "%s నుంచి ఫైలును ట్రాన్స్ఫర్ చేయడంలో వైఫల్యం."
 
 #: ../libpurple/gconf/purple.schemas.in.h:1
 msgid "Run the command in a terminal"
-msgstr ""
+msgstr "టెర్మినల్ లో ఓ కమాండ్ ను పంపండి"
 
 #: ../libpurple/gconf/purple.schemas.in.h:2
 msgid "The command used to handle \"aim\" URLs, if enabled."
-msgstr ""
+msgstr "URLs సాధ్యమైతే, \"aim\" హ్యాండిల్ చేయడానికి ఉపయోగించే కమాండ్."
 
 #: ../libpurple/gconf/purple.schemas.in.h:3
 msgid "The command used to handle \"gg\" URLs, if enabled."
-msgstr ""
+msgstr "URLs సాధ్యమైతే, \"gg\" హ్యాండిల్ చేయడానికి ఉపయోగించే కమాండ్."
 
 #: ../libpurple/gconf/purple.schemas.in.h:4
 msgid "The command used to handle \"icq\" URLs, if enabled."
-msgstr ""
+msgstr "URLs సాధ్యమైతే, \"icq\" హ్యాండిల్ చేయడానికి ఉపయోగించే కమాండ్."
 
 #: ../libpurple/gconf/purple.schemas.in.h:5
 msgid "The command used to handle \"irc\" URLs, if enabled."
-msgstr ""
+msgstr "URLs సాధ్యమైతే, \"irc\" హ్యాండిల్ చేయడానికి ఉపయోగించే కమాండ్."
 
 #: ../libpurple/gconf/purple.schemas.in.h:6
 msgid "The command used to handle \"msnim\" URLs, if enabled."
-msgstr ""
+msgstr "URLs సాధ్యమైతే, \"msnim\" హ్యాండిల్ చేయడానికి ఉపయోగించే కమాండ్."
 
 #: ../libpurple/gconf/purple.schemas.in.h:7
 msgid "The command used to handle \"sip\" URLs, if enabled."
-msgstr ""
+msgstr "URLs సాధ్యమైతే, \"sip\" హ్యాండిల్ చేయడానికి ఉపయోగించే కమాండ్."
 
 #: ../libpurple/gconf/purple.schemas.in.h:8
 msgid "The command used to handle \"xmpp\" URLs, if enabled."
-msgstr ""
+msgstr "URLs సాధ్యమైతే, \"xmpp\" హ్యాండిల్ చేయడానికి ఉపయోగించే కమాండ్."
 
 #: ../libpurple/gconf/purple.schemas.in.h:9
 msgid "The command used to handle \"ymsgr\" URLs, if enabled."
-msgstr ""
+msgstr "URLs సాధ్యమైతే, \"ymsgr\" హ్యాండిల్ చేయడానికి ఉపయోగించే కమాండ్."
 
 #: ../libpurple/gconf/purple.schemas.in.h:10
 msgid "The handler for \"aim\" URLs"
-msgstr ""
+msgstr "\"aim\" URLs కోసం హ్యాండిల్ చేసేది"
 
 #: ../libpurple/gconf/purple.schemas.in.h:11
 msgid "The handler for \"gg\" URLs"
-msgstr ""
+msgstr "\"gg\" URLs కోసం హ్యాండిల్ చేసేది"
 
 #: ../libpurple/gconf/purple.schemas.in.h:12
 msgid "The handler for \"icq\" URLs"
-msgstr ""
+msgstr "\"icq\" URLs కోసం హ్యాండిల్ చేసేది"
 
 #: ../libpurple/gconf/purple.schemas.in.h:13
 msgid "The handler for \"irc\" URLs"
-msgstr ""
+msgstr "\"irc\" URLs కోసం హ్యాండిల్ చేసేది"
 
 #: ../libpurple/gconf/purple.schemas.in.h:14
 msgid "The handler for \"msnim\" URLs"
-msgstr ""
+msgstr "\"msnim\" URLs కోసం హ్యాండిల్ చేసేది"
 
 #: ../libpurple/gconf/purple.schemas.in.h:15
 msgid "The handler for \"sip\" URLs"
-msgstr ""
+msgstr "\"sip\" URLs కోసం హ్యాండిల్ చేసేది"
 
 #: ../libpurple/gconf/purple.schemas.in.h:16
 msgid "The handler for \"xmpp\" URLs"
-msgstr ""
+msgstr "\"xmpp\" URLs కోసం హ్యాండిల్ చేసేది"
 
 #: ../libpurple/gconf/purple.schemas.in.h:17
 msgid "The handler for \"ymsgr\" URLs"
-msgstr ""
+msgstr "\"ymsgr\" URLs కోసం హ్యాండిల్ చేసేది"
 
 #: ../libpurple/gconf/purple.schemas.in.h:18
-msgid ""
-"True if the command specified in the \"command\" key should handle \"aim\" "
-"URLs."
-msgstr ""
+msgid "True if the command specified in the \"command\" key should handle \"aim\" URLs."
+msgstr "\"command\" కీలో నిర్దేశించిన కమాండ్ \"aim\" URLs ను హ్యాండిల్ చేసేది నిజమేనా."
 
 #: ../libpurple/gconf/purple.schemas.in.h:19
-msgid ""
-"True if the command specified in the \"command\" key should handle \"gg\" "
-"URLs."
-msgstr ""
+msgid "True if the command specified in the \"command\" key should handle \"gg\" URLs."
+msgstr "\"command\" కీలో నిర్దేశించిన కమాండ్ \"gg\" URLs ను హ్యాండిల్ చేసేది నిజమేనా."
 
 #: ../libpurple/gconf/purple.schemas.in.h:20
-msgid ""
-"True if the command specified in the \"command\" key should handle \"icq\" "
-"URLs."
-msgstr ""
+msgid "True if the command specified in the \"command\" key should handle \"icq\" URLs."
+msgstr "\"command\" కీలో నిర్దేశించిన కమాండ్ \"icq\" URLs ను హ్యాండిల్ చేసేది నిజమేనా."
 
 #: ../libpurple/gconf/purple.schemas.in.h:21
-msgid ""
-"True if the command specified in the \"command\" key should handle \"irc\" "
-"URLs."
-msgstr ""
+msgid "True if the command specified in the \"command\" key should handle \"irc\" URLs."
+msgstr "\"command\" కీలో నిర్దేశించిన కమాండ్ \"irc\" URLs ను హ్యాండిల్ చేసేది నిజమేనా."
 
 #: ../libpurple/gconf/purple.schemas.in.h:22
-msgid ""
-"True if the command specified in the \"command\" key should handle \"msnim\" "
-"URLs."
-msgstr ""
+msgid "True if the command specified in the \"command\" key should handle \"msnim\" URLs."
+msgstr "\"command\" కీలో నిర్దేశించిన కమాండ్ \"msnim\" URLs ను హ్యాండిల్ చేసేది నిజమేనా."
 
 #: ../libpurple/gconf/purple.schemas.in.h:23
-msgid ""
-"True if the command specified in the \"command\" key should handle \"sip\" "
-"URLs."
-msgstr ""
+msgid "True if the command specified in the \"command\" key should handle \"sip\" URLs."
+msgstr "\"command\" కీలో నిర్దేశించిన కమాండ్ \"sip\" URLs ను హ్యాండిల్ చేసేది నిజమేనా."
 
 #: ../libpurple/gconf/purple.schemas.in.h:24
-msgid ""
-"True if the command specified in the \"command\" key should handle \"xmpp\" "
-"URLs."
-msgstr ""
+msgid "True if the command specified in the \"command\" key should handle \"xmpp\" URLs."
+msgstr "\"command\" కీలో నిర్దేశించిన కమాండ్ \"xmpp\" URLs ను హ్యాండిల్ చేసేది నిజమేనా."
 
 #: ../libpurple/gconf/purple.schemas.in.h:25
-msgid ""
-"True if the command specified in the \"command\" key should handle \"ymsgr\" "
-"URLs."
-msgstr ""
+msgid "True if the command specified in the \"command\" key should handle \"ymsgr\" URLs."
+msgstr "\"command\" కీలో నిర్దేశించిన కమాండ్ \"ymsgr\" URLs ను హ్యాండిల్ చేసేది నిజమేనా."
 
 #: ../libpurple/gconf/purple.schemas.in.h:26
-msgid ""
-"True if the command used to handle this type of URL should be run in a "
-"terminal."
-msgstr ""
+msgid "True if the command used to handle this type of URL should be run in a terminal."
+msgstr "ఈ తరహా URL ను హ్యాండిల్ చేయడానికి ఉపయోగించిన కమాండ్ టెర్మినల్ లో పనిచేయాలన్నది నిజమేనా."
 
 #: ../libpurple/gconf/purple.schemas.in.h:27
 msgid "Whether the specified command should handle \"aim\" URLs"
-msgstr ""
+msgstr "నిర్దిష్ట కమాండ్ \"aim\" URLs ను హ్యాండిల్ చేయాలా"
 
 #: ../libpurple/gconf/purple.schemas.in.h:28
 msgid "Whether the specified command should handle \"gg\" URLs"
-msgstr ""
+msgstr "నిర్దిష్ట కమాండ్ \"gg\" URLs ను హ్యాండిల్ చేయాలా"
 
 #: ../libpurple/gconf/purple.schemas.in.h:29
 msgid "Whether the specified command should handle \"icq\" URLs"
-msgstr ""
+msgstr "నిర్దిష్ట కమాండ్ \"icq\" URLs ను హ్యాండిల్ చేయాలా"
 
 #: ../libpurple/gconf/purple.schemas.in.h:30
 msgid "Whether the specified command should handle \"irc\" URLs"
-msgstr ""
+msgstr "నిర్దిష్ట కమాండ్ \"irc\" URLs ను హ్యాండిల్ చేయాలా"
 
 #: ../libpurple/gconf/purple.schemas.in.h:31
 msgid "Whether the specified command should handle \"msnim\" URLs"
-msgstr ""
+msgstr "నిర్దిష్ట కమాండ్ \"msnim\" URLs ను హ్యాండిల్ చేయాలా"
 
 #: ../libpurple/gconf/purple.schemas.in.h:32
 msgid "Whether the specified command should handle \"sip\" URLs"
-msgstr ""
+msgstr "నిర్దిష్ట కమాండ్ \"sip\" URLs ను హ్యాండిల్ చేయాలా"
 
 #: ../libpurple/gconf/purple.schemas.in.h:33
 msgid "Whether the specified command should handle \"xmpp\" URLs"
-msgstr ""
+msgstr "నిర్దిష్ట కమాండ్ \"xmpp\" URLs ను హ్యాండిల్ చేయాలా"
 
 #: ../libpurple/gconf/purple.schemas.in.h:34
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
-msgstr ""
+msgstr "నిర్దిష్ట కమాండ్ \"ymsgr\" URLs ను హ్యాండిల్ చేయాలా"
 
 #: ../libpurple/log.c:183
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
@@ -2739,15 +3038,15 @@
 
 #: ../libpurple/log.c:612
 msgid "Plain text"
-msgstr "ప్లెయిన్ టెక్‌స్ట్ "
+msgstr "ప్లెయిన్ టెక్స్ట్ "
 
 #: ../libpurple/log.c:626
 msgid "Old flat format"
-msgstr ""
+msgstr "పాత ఫ్లాట్ ఫార్మాట్"
 
 #: ../libpurple/log.c:839
 msgid "Logging of this conversation failed."
-msgstr ""
+msgstr "ఈ సంభాషణకు లాగింగ్ కావడంలో వైఫల్యం."
 
 #: ../libpurple/log.c:1282
 msgid "XML"
@@ -2755,168 +3054,145 @@
 
 #: ../libpurple/log.c:1366
 #, c-format
-msgid ""
-"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
-"REPLY&gt;:</b></font> %s<br/>\n"
-msgstr ""
-"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;ఆటో‌రిప్లై "
-"నిమ్ము&gt;:</b></font> %s<br/>\n"
+msgid "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
+msgstr "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;ఆటో‌రిప్లై &gt;:</b></font> %s<br/>\n"
 
 #: ../libpurple/log.c:1368
 #, c-format
-msgid ""
-"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
-"REPLY&gt;:</b></font> %s<br/>\n"
-msgstr ""
-"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;ఆటో‌రిప్లై "
-"నిమ్ము&gt;:</b></font> %s<br/>\n"
-
-#: ../libpurple/log.c:1426 ../libpurple/log.c:1559
+msgid "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
+msgstr "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;ఆటో‌రిప్లై &gt;:</b></font> %s<br/>\n"
+
+#: ../libpurple/log.c:1426
+#: ../libpurple/log.c:1559
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
-msgstr "<font color=\"red\"><b>లాగ్ పాత్‌ను కనుగొనడంలో అశక్తత </b></font>"
-
-#: ../libpurple/log.c:1438 ../libpurple/log.c:1568
+msgstr "<font color=\"red\"><b>లాగ్ పాత్‌ను కనుగొనడంలో వైఫల్యం </b></font>"
+
+#: ../libpurple/log.c:1438
+#: ../libpurple/log.c:1568
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
-msgstr "<font color=\"red\"><b>ఫైల్ చదువుటకు కుదరడంలేదు: %s</b></font>"
+msgstr "<font color=\"red\"><b>ఫైలును రీడ్ చేయడం సాధ్యపడలేదు: %s</b></font>"
 
 #: ../libpurple/log.c:1500
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <ఆటో రిప్లై>: %s\n"
 
-#: ../libpurple/plugin.c:365
+#: ../libpurple/plugin.c:360
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
-msgstr ""
-
-#: ../libpurple/plugin.c:380
-#, c-format
+msgstr "%s ని మీరు ఉపయోగిస్తున్నారు, కానీ ఈ ప్లగ్ ఇన్ కు %s అవసరం."
+
+#: ../libpurple/plugin.c:375
 msgid "This plugin has not defined an ID."
-msgstr ""
-
-#: ../libpurple/plugin.c:448
+msgstr "ఈ ప్లగ్ ఇన్ ను IDలో నిర్వచించలేదు."
+
+#: ../libpurple/plugin.c:443
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
-msgstr ""
-
-#: ../libpurple/plugin.c:465
+msgstr "ప్లగ్ ఇన్ మ్యాజిక్ సరిపోలడంలేదు  %d (%d అవసరం)"
+
+#: ../libpurple/plugin.c:460
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
-msgstr ""
-
-#: ../libpurple/plugin.c:482
+msgstr "ABI వెర్షన్ %d.%d.x సరిపోలడంలేదు (%d.%d.x అవసరం)"
+
+#: ../libpurple/plugin.c:477
 msgid "Plugin does not implement all required functions"
-msgstr ""
+msgstr "ఈ ప్లగ్ ఇన్ అన్ని అవసరమైన నిర్వహణలను నిర్వర్తించలేదు"
+
+#: ../libpurple/plugin.c:542
+#, c-format
+msgid "The required plugin %s was not found. Please install this plugin and try again."
+msgstr "కావలసిన ప్లగ్ ‌ఇన్ %s కనిపించలేదు. దయచేసి ఈ ప్లగ్ఇన్‌ను ఇన్‌స్టాల్‌ చేసి మరల ప్రయత్నించండి. "
 
 #: ../libpurple/plugin.c:547
-#, c-format
-msgid ""
-"The required plugin %s was not found. Please install this plugin and try "
-"again."
-msgstr "కావలసిన ప్లగ్ ‌ఇన్ %s కనిపించలేదు. దయచేసి ఈ ప్లగ్ఇన్‌ను ఇన్‌స్టాల్‌ చేసి మరల ప్రయత్నించండి. "
-
-#: ../libpurple/plugin.c:552
-#, fuzzy
 msgid "Unable to load the plugin"
-msgstr "మీ ప్లగ్‌ఇన్‌ను గెయిమ్ లోడ్ చేయలేకపోతున్నది."
-
-#: ../libpurple/plugin.c:574
+msgstr "ప్లగ్ ఇన్ ను లోడ్ చేయలేకపోతున్నాం"
+
+#: ../libpurple/plugin.c:569
 #, c-format
 msgid "The required plugin %s was unable to load."
-msgstr "కావలసిన ప్లగ్‌ఇన్ %s రీలోడ్ చేయలేకపోతున్నది."
-
-#: ../libpurple/plugin.c:578
-#, fuzzy
+msgstr "కావలసిన ప్లగ్‌ఇన్ %s లోడ్ చేయలేకపోతున్నది."
+
+#: ../libpurple/plugin.c:573
 msgid "Unable to load your plugin."
-msgstr "మీ ప్లగ్‌ఇన్‌ను గెయిమ్ లోడ్ చేయలేకపోతున్నది."
-
-#: ../libpurple/plugin.c:677
-#, fuzzy, c-format
-msgid "The dependent plugin %s failed to unload."
-msgstr "కావలసిన ప్లగ్‌ఇన్ %s రీలోడ్ చేయలేకపోతున్నది."
-
-#  *< name
-#  *< version
-#: ../libpurple/plugin.c:681
-#, fuzzy
-msgid "There were errors unloading the plugin."
-msgstr "పెరల్ ప్లగ్‌ఇన్‌లు లోడ్ చేయడానికి సపోర్టును అందించును."
+msgstr "మీ ప్లగ్ ఇన్ ను లోడ్ చేయలేకపోతున్నాం."
+
+#: ../libpurple/plugin.c:663
+#, c-format
+msgid "%s requires %s, but it failed to unload."
+msgstr "%s డిపెండర్ ప్లగ్ ఇన్ అన్ లోడ్ కావడంలో వైఫల్యం."
 
 #: ../libpurple/plugins/autoaccept.c:23
-#, fuzzy
 msgid "Autoaccept"
-msgstr "అంగీకరించు "
-
-#: ../libpurple/plugins/autoaccept.c:25 ../libpurple/plugins/autoaccept.c:26
-#, fuzzy
+msgstr "ఆటోమేటిక్ గా అంగీకరించు"
+
+#: ../libpurple/plugins/autoaccept.c:25
+#: ../libpurple/plugins/autoaccept.c:26
 msgid "Auto-accept file transfer requests from selected users."
-msgstr "%s నుండి వచ్చిన ఫైల్ ట్రాన్స్‌ఫర్ విజ్ఞప్తిని అంగీకరించాలా?"
+msgstr "ఎంచుకున్న వినియోగదారుల నుంచి వచ్చిన ఫైల్ బదిలీ అభ్యర్ధనలను ఆటోమేటిక్ గా ఆమోదించు."
 
 #: ../libpurple/plugins/autoaccept.c:80
-#, fuzzy, c-format
+#, c-format
 msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
-msgstr "%s నుండి వచ్చిన ఫైల్ ట్రాన్స్‌ఫర్ విజ్ఞప్తిని అంగీకరించాలా?"
+msgstr "\"%s\" నుంచి \"%s\" ఫైలు బదిలీ కోసం వచ్చిన అభ్యర్ధనను అంగీకరించడం పూర్తయింది."
 
 #: ../libpurple/plugins/autoaccept.c:82
 msgid "Autoaccept complete"
-msgstr ""
+msgstr "అటోమేటిక్ గా అంగీకరించడం పూర్తయింది."
 
 #: ../libpurple/plugins/autoaccept.c:160
-#, fuzzy, c-format
+#, c-format
 msgid "When a file-transfer request arrives from %s"
-msgstr "%s నుండి వచ్చిన ఫైల్ ట్రాన్స్‌ఫర్ విజ్ఞప్తిని అంగీకరించాలా?"
+msgstr "%s నుంచి ఫైలు బదిలీ కోసం అభ్యర్ధన వచ్చినప్పుడు"
 
 #: ../libpurple/plugins/autoaccept.c:162
 msgid "Set Autoaccept Setting"
-msgstr ""
+msgstr "ఆటోమేటిక్ గా అంగీకారానికి సంబంధించి సెట్టింగ్ ను ఏర్పరచు"
 
 #: ../libpurple/plugins/autoaccept.c:164
 msgid "_Save"
-msgstr "_సేవ్ "
+msgstr "_సేవ్ చేయి "
 
 # #-#-#-#-#  anjuta.ANJUTA_1_2_0.hi.po (anjuta2 VERSION)  #-#-#-#-#
 # #-#-#-#-#  gnome-session.HEAD.hi.po (gnome-session VERSION)  #-#-#-#-#
 # gnome-session/session-properties.c:179
 #  Cancel button.
-#: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
-#: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
-#: ../libpurple/protocols/oscar/oscar.c:1453
-#: ../libpurple/protocols/oscar/oscar.c:2233
-#: ../libpurple/protocols/oscar/oscar.c:2282
-#: ../libpurple/protocols/oscar/oscar.c:5886
-#: ../libpurple/protocols/oscar/oscar.c:5941
-#: ../libpurple/protocols/oscar/oscar.c:6167
-#: ../libpurple/protocols/oscar/oscar.c:6237 ../libpurple/request.h:1388
-#: ../libpurple/request.h:1398
+#: ../libpurple/plugins/autoaccept.c:165
+#: ../libpurple/plugins/idle.c:170
+#: ../libpurple/plugins/idle.c:204
+#: ../libpurple/plugins/idle.c:230
+#: ../libpurple/protocols/oscar/oscar.c:1451
+#: ../libpurple/protocols/oscar/oscar.c:2243
+#: ../libpurple/protocols/oscar/oscar.c:2292
+#: ../libpurple/protocols/oscar/oscar.c:5936
+#: ../libpurple/protocols/oscar/oscar.c:5991
+#: ../libpurple/protocols/oscar/oscar.c:6217
+#: ../libpurple/protocols/oscar/oscar.c:6287
+#: ../libpurple/request.h:1828
+#: ../libpurple/request.h:1841
+#: ../libpurple/request.h:1854
+#: ../libpurple/request.h:1867
+#: ../pidgin/gtkblist.c:546
 msgid "_Cancel"
-msgstr "_రద్దుచేయండి"
+msgstr "_రద్దుచేయి"
 
 #: ../libpurple/plugins/autoaccept.c:168
 msgid "Ask"
-msgstr ""
+msgstr "అడగండి"
 
 #: ../libpurple/plugins/autoaccept.c:169
-#, fuzzy
 msgid "Auto Accept"
-msgstr "అంగీకరించు "
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
+msgstr "ఆటోమేటిక్ గా అంగీకరించు"
+
 #: ../libpurple/plugins/autoaccept.c:170
-#, fuzzy
 msgid "Auto Reject"
-msgstr "ఆటో-రీకనెక్ట్."
+msgstr "ఆటోమేటిక్ గా తిరస్కరించు"
 
 #: ../libpurple/plugins/autoaccept.c:185
-#, fuzzy
 msgid "Autoaccept File Transfers..."
-msgstr "ఫైల్‌ ట్రాన్స్‌ఫర్స్ "
+msgstr "ఫైలు బదిలీని ఆటోమేటిక్ గా అంగీకరించు"
 
 #. XXX: Is there a better way than this? There really should be.
 #: ../libpurple/plugins/autoaccept.c:215
@@ -2924,31 +3200,36 @@
 "Path to save the files in\n"
 "(Please provide the full path)"
 msgstr ""
+"లో ఫైళ్లను సేవ్ చేయడానికి పాథ్  \n"
+"(దయచేసి పూర్తి పాథ్ ను సమకూర్చు)"
 
 #: ../libpurple/plugins/autoaccept.c:220
-#, fuzzy
 msgid "Automatically reject from users not in buddy list"
-msgstr "నా మిత్రుల లిస్టులో ఉన్నవారిని మాత్రమే అనుమతించుము. "
+msgstr "మిత్రుల జాబితాలో లేని వినియోగదార్లను ఆటోమేటిక్ గా తిరస్కరించు"
 
 #: ../libpurple/plugins/autoaccept.c:224
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
 msgstr ""
-
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1660
-#: ../libpurple/protocols/msn/msn.c:1690
-#, fuzzy
+"ఆటోమేటిక్ గా అంగీకరించిన ఫైలు బదిలీ పూర్తయినప్పుడు పాప్అప్ ద్వారా తెలియచేయండి. \n"
+"(పంపినవారితో సంభాషణలో లేనప్పుడు మాత్రమే)"
+
+#: ../libpurple/plugins/buddynote.c:46
+#: ../libpurple/protocols/msn/msn.c:1808
+#: ../libpurple/protocols/msn/msn.c:1838
+#: ../libpurple/protocols/msnp9/msn.c:1661
+#: ../libpurple/protocols/msnp9/msn.c:1691
 msgid "Notes"
-msgstr "నోట్ "
+msgstr "నోట్స్"
 
 #: ../libpurple/plugins/buddynote.c:47
 msgid "Enter your notes below..."
-msgstr ""
+msgstr "మీరు చెప్పదల్చుకున్నది ఇక్కడ ఎంటర్ చేయండి....."
 
 #: ../libpurple/plugins/buddynote.c:65
 msgid "Edit Notes..."
-msgstr ""
+msgstr "మీరు చెప్పదల్చుకున్న విషయాన్ని ఎడిట్ చేయండి...."
 
 #. *< major version
 #. *< minor version
@@ -2958,22 +3239,23 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/buddynote.c:90 ../pidgin/plugins/gtkbuddynote.c:74
-#, fuzzy
+#: ../libpurple/plugins/buddynote.c:90
+#: ../pidgin/plugins/gtkbuddynote.c:74
 msgid "Buddy Notes"
-msgstr "మిత్రులు "
+msgstr "మిత్రునికి చెప్పదల్చుకున్నది"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/buddynote.c:92 ../pidgin/plugins/gtkbuddynote.c:76
+#: ../libpurple/plugins/buddynote.c:92
+#: ../pidgin/plugins/gtkbuddynote.c:76
 msgid "Store notes on particular buddies."
-msgstr ""
+msgstr "నిర్దిష్ట మిత్రులకోసం మీరు చెప్పదల్చుకున్న విషయాన్ని నిక్షిప్తం చేయండి."
 
 #. *< summary
-#: ../libpurple/plugins/buddynote.c:93 ../pidgin/plugins/gtkbuddynote.c:77
-#, fuzzy
+#: ../libpurple/plugins/buddynote.c:93
+#: ../pidgin/plugins/gtkbuddynote.c:77
 msgid "Adds the option to store notes for buddies on your buddy list."
-msgstr "వినియోగదారుని పేరును మీ మిత్రుల లిస్టులో చేర్చుము"
+msgstr "మీ మిత్రుల జాబితాలోని మిత్రులకోసం పంపేవిషయాలను నిక్షిప్తం చేయడానికి అవకాశాలను చేర్చండి."
 
 #. *< type
 #. *< ui_requirement
@@ -2983,15 +3265,16 @@
 #. *< id
 #: ../libpurple/plugins/ciphertest.c:264
 msgid "Cipher Test"
-msgstr ""
+msgstr "సైఫర్ టెస్ట్"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ciphertest.c:267 ../libpurple/plugins/ciphertest.c:269
+#: ../libpurple/plugins/ciphertest.c:267
+#: ../libpurple/plugins/ciphertest.c:269
 msgid "Tests the ciphers that ship with libpurple."
-msgstr ""
+msgstr "libpurpleతో వెళ్తున్న cipher లను పరీక్షిస్తుంది."
 
 #. *< type
 #. *< ui_requirement
@@ -3001,7 +3284,7 @@
 #. *< id
 #: ../libpurple/plugins/dbus-example.c:155
 msgid "DBus Example"
-msgstr ""
+msgstr "DBus ఉదాహరణ"
 
 #. *< name
 #. *< version
@@ -3010,15 +3293,8 @@
 #: ../libpurple/plugins/dbus-example.c:158
 #: ../libpurple/plugins/dbus-example.c:160
 msgid "DBus Plugin Example"
-msgstr ""
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
+msgstr "DBus ప్లగ్ ఇన్ ఉదాహరణ"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -3026,75 +3302,88 @@
 #. *< priority
 #. *< id
 #: ../libpurple/plugins/filectl.c:248
-#, fuzzy
 msgid "File Control"
-msgstr "గెయిమ్ ఫైల్ నియంత్రణ"
-
-#  *< name
+msgstr "ఫైల్ నియంత్రణ /కంట్రోల్"
+
+# *< name
 #  *< version
 #  *  summary
+# *< version
+# *  summary
+# *  description
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/filectl.c:251 ../libpurple/plugins/filectl.c:253
-#, fuzzy
+#: ../libpurple/plugins/filectl.c:251
+#: ../libpurple/plugins/filectl.c:253
 msgid "Allows control by entering commands in a file."
-msgstr "గెయిమ్‌ను కంట్రోల్‌చేయడానికి ఫైల్‌లో కమాండ్స్‌ను ఎంటర్ చేయుటకు అనుమతించును. "
-
-#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:218
+msgstr "ఫైల్ లో కమాండ్స్ ను ఎంటర్ చేయడం ద్వారా నియంత్రణకు అవకాశం."
+
+#: ../libpurple/plugins/idle.c:158
+#: ../libpurple/plugins/idle.c:218
 msgid "Minutes"
 msgstr "నిమిషాలు "
 
 #. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
 #. If that doesn't translate well into your language, drop the 's before translating.
-#: ../libpurple/plugins/idle.c:165 ../libpurple/plugins/idle.c:199
-#: ../libpurple/plugins/idle.c:225 ../libpurple/plugins/idle.c:318
+#: ../libpurple/plugins/idle.c:165
+#: ../libpurple/plugins/idle.c:199
+#: ../libpurple/plugins/idle.c:225
+#: ../libpurple/plugins/idle.c:318
 msgid "I'dle Mak'er"
-msgstr "సోమరులను తయారుచేసేవాడు. "
-
-#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:258
+msgstr "ఐడిల్ మేకర్స్"
+
+#: ../libpurple/plugins/idle.c:166
+#: ../libpurple/plugins/idle.c:258
 msgid "Set Account Idle Time"
-msgstr "ఖాతా ఉపయోగించని సమయాన్ని సెట్ చేయండి."
-
-#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:229
+msgstr "అకౌంట్ ఐడిల్ సమయాన్ని సెట్ చేయండి."
+
+#: ../libpurple/plugins/idle.c:169
+#: ../libpurple/plugins/idle.c:229
 msgid "_Set"
 msgstr "_సెట్ చేయండి"
 
 #: ../libpurple/plugins/idle.c:184
 msgid "None of your accounts are idle."
-msgstr ""
-
-#: ../libpurple/plugins/idle.c:200 ../libpurple/plugins/idle.c:262
-#, fuzzy
+msgstr "మీ అకౌంట్లలో ఏఒక్కరూ ఖాళీగా లేరు."
+
+#: ../libpurple/plugins/idle.c:200
+#: ../libpurple/plugins/idle.c:262
 msgid "Unset Account Idle Time"
-msgstr "ఖాతా ఉపయోగించని సమయాన్ని సెట్ చేయండి."
+msgstr "అకౌంటును ఉపయోగించని సమయాన్నిఅన్ సెట్ చేయండి"
 
 #: ../libpurple/plugins/idle.c:203
-#, fuzzy
 msgid "_Unset"
-msgstr "_ఉపయోగించుము,"
-
-#: ../libpurple/plugins/idle.c:226 ../libpurple/plugins/idle.c:266
+msgstr "_అన్ సెట్ చేయండి"
+
+#: ../libpurple/plugins/idle.c:226
+#: ../libpurple/plugins/idle.c:266
 msgid "Set Idle Time for All Accounts"
-msgstr ""
+msgstr "అన్ని అకౌంట్లకు ఖాళీ సమయాన్ని సెట్ చేయండి"
 
 #: ../libpurple/plugins/idle.c:271
 msgid "Unset Idle Time for All Idled Accounts"
-msgstr ""
-
-#: ../libpurple/plugins/idle.c:320 ../libpurple/plugins/idle.c:321
-#, fuzzy
+msgstr "అన్ని ఐడిల్ అకౌంట్లకు ఖాళీ సమయాన్ని అన్ సెట్ చేయండి"
+
+#: ../libpurple/plugins/idle.c:320
+#: ../libpurple/plugins/idle.c:321
 msgid "Allows you to hand-configure how long you've been idle"
-msgstr "మీరు ఎంతకాలం సోమరిగా ఉన్నారో సంకలనం చేయడానికి మీకు అవకాశం."
-
-#  *< api_version
+msgstr "మీరు ఎంతసేపు ఖాళీగా (ఐడిల్ గా) ఉన్నారో హ్యాండ్-కన్ఫిగర్ చేయడానికి అనుమతిస్తుంది"
+
+# *< api_version
 #  *< type
 #  *< ui_requirement
 #  *< flags
 #  *< dependencies
 #  *< priority
 #  *< id
+# *< type
+# *< ui_requirement
+# *< flags
+# *< dependencies
+# *< priority
+# *< id
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -3103,35 +3392,39 @@
 #. *< id
 #: ../libpurple/plugins/ipc-test-client.c:87
 msgid "IPC Test Client"
-msgstr "IPC టెస్ట్ క్లైంట్ "
-
-#  *< name
+msgstr "IPC టెస్ట్ క్లయింట్ "
+
+# *< name
 #  *< version
 #  *  summary
+# *< version
+# *  summary
 #. *< name
 #. *< version
 #. *  summary
 #: ../libpurple/plugins/ipc-test-client.c:90
 msgid "Test plugin IPC support, as a client."
-msgstr "టెస్ట్ ప్లగ్‌ఇన్ IPC support, క్లైంట్‌గా."
-
-#  *  description
+msgstr "క్లయింటుగా టెస్ట్ ప్లగ్‌ఇన్ IPC సపోర్టు"
+
+# *  description
 #. *  description
 #: ../libpurple/plugins/ipc-test-client.c:92
-msgid ""
-"Test plugin IPC support, as a client. This locates the server plugin and "
-"calls the commands registered."
-msgstr ""
-"టెస్ట్ ప్లగ్‌ఇన్ IPC support, ఒక క్లైంట్‌గా. ఇది సెర్వర్ ప్లగ్‌ఇన్‌ ఎక్కడుందో తెలుసుకుంటుంది మరియు "
-"రిజిస్టర్ చేసిన కమాండ్స్‌ను పిలుస్తుంది."
-
-#  *< api_version
+msgid "Test plugin IPC support, as a client. This locates the server plugin and calls the commands registered."
+msgstr "క్లయింటుగా టెస్ట్ ప్లగ్‌ఇన్ IPC సపోర్టు. సర్వర్ ప్లగ్‌ఇన్‌ ఎక్కడుందో ఇది గుర్తిస్తుంది. అలాగే నమోదైన  కమాండ్స్‌ను చూపిస్తుంది."
+
+# *< api_version
 #  *< type
 #  *< ui_requirement
 #  *< flags
 #  *< dependencies
 #  *< priority
 #  *< id
+# *< type
+# *< ui_requirement
+# *< flags
+# *< dependencies
+# *< priority
+# *< id
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -3140,36 +3433,37 @@
 #. *< id
 #: ../libpurple/plugins/ipc-test-server.c:74
 msgid "IPC Test Server"
-msgstr "IPC టెస్ట్ సెర్వర్ "
-
-#  *< name
+msgstr "IPC టెస్ట్ సర్వర్ "
+
+# *< name
 #  *< version
 #  *  summary
+# *< version
+# *  summary
 #. *< name
 #. *< version
 #. *  summary
 #: ../libpurple/plugins/ipc-test-server.c:77
 msgid "Test plugin IPC support, as a server."
-msgstr "టెస్ట్ ప్లగ్‌ఇన్ IPC support, సెర్వర్‌గా."
-
-#  *  description
+msgstr "సర్వర్ గా టెస్ట్ ప్లగ్‌ఇన్ IPC సపోర్టు."
+
+# *  description
 #. *  description
 #: ../libpurple/plugins/ipc-test-server.c:79
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
-msgstr "టెస్ట్ ప్లగ్‌ఇన్ IPC support, సెర్వర్‌గా. ఇది IPC కమాండ్స్‌ను రిజిస్టర్ చేస్తుంది."
+msgstr "సర్వర్ గా టెస్ట్ ప్లగ్‌ఇన్ IPC సపోర్టు.IPC కమాండ్స్ ను ఇది నమోదు చేస్తుంది."
 
 #: ../libpurple/plugins/joinpart.c:229
-#, fuzzy
 msgid "Join/Part Hiding Configuration"
-msgstr "ఎవొలూషన్ ఇంటెగ్రేషన్ కన్ఫిగరేషన్ "
+msgstr "చేరడం/భాగంగా ఉండటం, దాచి ఉంచడం కోసం కన్ఫిగర్ చేయండి"
 
 #: ../libpurple/plugins/joinpart.c:233
 msgid "Minimum Room Size"
-msgstr ""
+msgstr "కనీస రూమ్ పరిమాణం"
 
 #: ../libpurple/plugins/joinpart.c:239
 msgid "User Inactivity Timeout (in minutes)"
-msgstr ""
+msgstr "వినియోగదారు సచేతనంగా లేనప్పుడు టైమ్అవుట్ (నిముషాల్లో)"
 
 #. *< type
 #. *< ui_requirement
@@ -3179,148 +3473,138 @@
 #. *< id
 #: ../libpurple/plugins/joinpart.c:270
 msgid "Join/Part Hiding"
-msgstr ""
+msgstr "చేరడం/భాగంగా ఉండటం, దాచిఉండటం"
 
 #. *< name
 #. *< version
 #. *  summary
 #: ../libpurple/plugins/joinpart.c:273
 msgid "Hides extraneous join/part messages."
-msgstr ""
+msgstr "భిన్నమైన  చేర్పు/భాగంగా ఉండే సందేశాలను దాచిఉంచుతుంది."
 
 #. *  description
 #: ../libpurple/plugins/joinpart.c:275
-msgid ""
-"This plugin hides join/part messages in large rooms, except for those users "
-"actively taking part in a conversation."
-msgstr ""
+msgid "This plugin hides join/part messages in large rooms, except for those users actively taking part in a conversation."
+msgstr "సంభాషణలో క్రియాశీలంగా పాల్గొనే వినియోగదారులు మినహా, ఇతరులు చేరిన/భాగంగా ఉన్న సందేశాలను ఈ ప్లగ్ ఇన్ పెద్దరూమ్ లలో దాచుతుంది."
 
 #. This is used in the place of a timezone abbreviation if the
 #. * offset is way off.  The user should never really see it, but
 #. * it's here just in case.  The parens are to make it clear it's
 #. * not a real timezone.
-#: ../libpurple/plugins/log_reader.c:493
+#: ../libpurple/plugins/log_reader.c:499
 msgid "(UTC)"
-msgstr ""
-
-#: ../libpurple/plugins/log_reader.c:1577
-#, fuzzy
+msgstr "(UTC)"
+
+#: ../libpurple/plugins/log_reader.c:1554
 msgid "User is offline."
-msgstr "వినియోగదారుడు ఆఫ్‌లైన్‌లో ఉన్నాడు. "
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-#: ../libpurple/plugins/log_reader.c:1583
-#, fuzzy
+msgstr "వినియోగదారు ఆఫ్‌లైన్‌లో ఉన్నారు. "
+
+#: ../libpurple/plugins/log_reader.c:1560
 msgid "Auto-response sent:"
-msgstr "ఆటో-రీకనెక్ట్."
-
-#: ../libpurple/plugins/log_reader.c:1593
-#: ../libpurple/plugins/log_reader.c:1596
+msgstr "ఆటో-రెస్పాన్స్ పంపబడినది:"
+
+#: ../libpurple/plugins/log_reader.c:1570
+#: ../libpurple/plugins/log_reader.c:1573
 #: ../libpurple/plugins/statenotify.c:80
-#, fuzzy, c-format
+#, c-format
 msgid "%s has signed off."
-msgstr "%s సైన్డ్ ఆఫ్ చేశారు. (%s)"
-
-#: ../libpurple/plugins/log_reader.c:1610
+msgstr "%s సైన్ ఆఫ్ చేశారు. (%s)"
+
+#: ../libpurple/plugins/log_reader.c:1587
 msgid "One or more messages may have been undeliverable."
-msgstr ""
+msgstr "ఒకటి లేదా అంతకంటే ఎక్కువ సందేశాలు పంపలేని స్థితిలో ఉన్నాయి."
+
+# MSG_SERVER_DISCONNECTING
+# we have been kicked off =^(
+#: ../libpurple/plugins/log_reader.c:1597
+msgid "You were disconnected from the server."
+msgstr "మీరు సర్వర్‌నుంచి డిస్‌కనెక్ట్ అయ్యారు."
+
+#: ../libpurple/plugins/log_reader.c:1605
+msgid "You are currently disconnected. Messages will not be received unless you are logged in."
+msgstr "ప్రస్తుతం మీరు డిస్కనెక్ట్ అయ్యారు. మీరు లాగ్ అయితే తప్ప సందేశాలను అందుకోలేరు."
 
 #: ../libpurple/plugins/log_reader.c:1620
-msgid "You were disconnected from the server."
-msgstr "మీరు సెర్వర్‌నుండి డిస్‌కనెక్ట్ అయినారు."
-
-#: ../libpurple/plugins/log_reader.c:1628
-msgid ""
-"You are currently disconnected. Messages will not be received unless you are "
-"logged in."
-msgstr ""
-
-#: ../libpurple/plugins/log_reader.c:1643
-#, fuzzy
 msgid "Message could not be sent because the maximum length was exceeded."
-msgstr "సందేశాన్ని పంపడం సాధ్యం కాదు, ఎందుకంటే వినియోగదారుడు ఆఫ్‌లైన్‌లో ఉన్నాడు. "
-
-#: ../libpurple/plugins/log_reader.c:1648
-#, fuzzy
+msgstr "సందేశం నిర్ధారిత పొడవు కన్నా ఎక్కువగా ఉంది సందేశాన్ని పంపలేకపోతున్నాం."
+
+#: ../libpurple/plugins/log_reader.c:1625
 msgid "Message could not be sent."
-msgstr "మీ Yahoo! సందేశాన్ని పంపుట సాధ్యం కాలేదు. "
+msgstr "సందేశాన్ని పంపించలేము."
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2349
-#: ../libpurple/plugins/log_reader.c:2472
+#: ../libpurple/plugins/log_reader.c:2699
+#: ../libpurple/plugins/log_reader.c:2835
 msgid "Adium"
-msgstr ""
+msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2362
-#: ../libpurple/plugins/log_reader.c:2477
-#, fuzzy
+#: ../libpurple/plugins/log_reader.c:2712
+#: ../libpurple/plugins/log_reader.c:2840
 msgid "Fire"
-msgstr "ఫైర్‌ఫాక్స్ "
+msgstr "Fire"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2374
-#: ../libpurple/plugins/log_reader.c:2481
-#, fuzzy
+#: ../libpurple/plugins/log_reader.c:2724
+#: ../libpurple/plugins/log_reader.c:2844
 msgid "Messenger Plus!"
-msgstr "%s నుండి సందేశం "
+msgstr "మెసెంజర్ ప్లస్!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2388
-#: ../libpurple/plugins/log_reader.c:2486
+#: ../libpurple/plugins/log_reader.c:2738
+#: ../libpurple/plugins/log_reader.c:2849
 msgid "QIP"
 msgstr ""
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2400
-#: ../libpurple/plugins/log_reader.c:2490
-#, fuzzy
+#: ../libpurple/plugins/log_reader.c:2750
+#: ../libpurple/plugins/log_reader.c:2853
 msgid "MSN Messenger"
-msgstr "సందేశాన్ని పంపండి. "
+msgstr "MSN మెసెంజర్"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libpurple/plugins/log_reader.c:2762
+#: ../libpurple/plugins/log_reader.c:2857
+msgid "Trillian"
+msgstr "Trillian"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2412
-#: ../libpurple/plugins/log_reader.c:2494
-msgid "Trillian"
+#: ../libpurple/plugins/log_reader.c:2774
+#: ../libpurple/plugins/log_reader.c:2861
+msgid "aMSN"
 msgstr ""
 
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2454
-#, fuzzy
+#: ../libpurple/plugins/log_reader.c:2817
 msgid "General Log Reading Configuration"
-msgstr "ట్రే ఐకన్ కన్ఫిగరేషన్ "
-
-#: ../libpurple/plugins/log_reader.c:2458
+msgstr "సాధారణ లాగ్ రీడింగ్ కన్ఫిగరేషన్"
+
+#: ../libpurple/plugins/log_reader.c:2821
 msgid "Fast size calculations"
-msgstr ""
-
-#: ../libpurple/plugins/log_reader.c:2462
+msgstr "పరిమాణ గణాంకాలను త్వరితం చేయండి"
+
+#: ../libpurple/plugins/log_reader.c:2825
 msgid "Use name heuristics"
-msgstr ""
+msgstr "నవీనమైన పేర్లను ఉపయోగించు"
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2468
-#, fuzzy
+#: ../libpurple/plugins/log_reader.c:2831
 msgid "Log Directory"
-msgstr "_అన్వేషించుము :"
+msgstr "లాగ్ డైరెక్టరీ"
 
 #. *< type
 #. *< ui_requirement
@@ -3328,37 +3612,36 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2523
-#, fuzzy
+#: ../libpurple/plugins/log_reader.c:2890
 msgid "Log Reader"
-msgstr "లాగిన్ సెర్వర్ "
+msgstr "లాగ్ రీడర్"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2527
+#: ../libpurple/plugins/log_reader.c:2894
 msgid "Includes other IM clients' logs in the log viewer."
-msgstr ""
+msgstr "లాగ్ వ్యూవర్ లో ఇతర IM క్లయింట్ల లాగ్ లు కూడా ఉన్నాయి."
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2531
-msgid ""
-"When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
-"\n"
-"WARNING: This plugin is still alpha code and may crash frequently.  Use it "
-"at your own risk!"
-msgstr ""
+#: ../libpurple/plugins/log_reader.c:2898
+msgid ""
+"When viewing logs, this plugin will include logs from other IM clients. Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"\n"
+"WARNING: This plugin is still alpha code and may crash frequently.  Use it at your own risk!"
+msgstr ""
+"లాగ్ లను చూస్తున్నప్పుడు, ఈ ప్లగ్ ఇన్ లో ఇతర IM క్లయింట్లకు చెందిన లాగ్ లు కూడా ఉంటాయి. ప్రస్తుతం వాటిలో ఉన్నవి Adium, MSN మెసెంజర్,  Trillian.\n"
+"\n"
+"WARNING: This plugin is still alpha code and may crash frequently.  Use it at your own risk!"
 
 #: ../libpurple/plugins/mono/loader/mono.c:217
-#, fuzzy
 msgid "Mono Plugin Loader"
-msgstr "Tcl ప్లగ్‌ఇన్‌ లోడర్ "
+msgstr "మోనో ప్లగ్‌ఇన్‌ లోడర్ "
 
 #: ../libpurple/plugins/mono/loader/mono.c:219
 #: ../libpurple/plugins/mono/loader/mono.c:220
 msgid "Loads .NET plugins with Mono."
-msgstr ""
+msgstr "Monoతో .NET ప్లగ్ ఇన్ లను లోడ్ చేస్తుంది."
 
 #. *< magic
 #. *< major version
@@ -3370,86 +3653,96 @@
 #. *< priority
 #. *< id
 #: ../libpurple/plugins/newline.c:68
-#, fuzzy
 msgid "New Line"
-msgstr "కొత్త విండో."
+msgstr "కొత్త లైను"
 
 #. *< name
 #. *< version
 #: ../libpurple/plugins/newline.c:70
-#, fuzzy
 msgid "Prepends a newline to displayed message."
-msgstr "సందేశాన్ని పంపడం కష్టం."
+msgstr "చూపించిన సందేశానికి ఒక కొత్త లైనును సూచిస్తుంది."
 
 #. *< summary
 #: ../libpurple/plugins/newline.c:71
-msgid ""
-"Prepends a newline to messages so that the rest of the message appears below "
-"the screen name in the conversation window."
-msgstr ""
+msgid "Prepends a newline to messages so that the rest of the message appears below the screen name in the conversation window."
+msgstr "సంభాషణ విండోలో స్క్రీన్ పేరు కింద మిగతా సందేశం కనపడ్డానికి వీలుగా సందేశానికి ఒక కొత్త లైనును సూచిస్తుంది."
 
 #: ../libpurple/plugins/offlinemsg.c:23
 msgid "Offline Message Emulation"
-msgstr ""
-
-#: ../libpurple/plugins/offlinemsg.c:25 ../libpurple/plugins/offlinemsg.c:26
+msgstr "ఆఫ్ లైన్ సందేశం వలె పనిచేయడానికి"
+
+#: ../libpurple/plugins/offlinemsg.c:25
+#: ../libpurple/plugins/offlinemsg.c:26
 msgid "Save messages sent to an offline user as pounce."
-msgstr ""
+msgstr "ఆఫ్ లైన్ వినియోగదారుకు పంపిన సందేశాలను చొచ్చుకొని వచ్చినవిగా సేవ్ చేయండి."
 
 #: ../libpurple/plugins/offlinemsg.c:95
-msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
-"pounce from the `Buddy Pounce' dialog."
-msgstr ""
+msgid "The rest of the messages will be saved as pounce. You can edit/delete the pounce from the `Buddy Pounce' dialog."
+msgstr "మిగతా సందేశాలను చొచ్చుకొని వచ్చినవిగా సేవ్ చేయడం జరుగుతుంది. `Buddy Pounce' డైలాగ్ నుంచి మీరు పౌన్స్ ను ఎడిట్ చేయవచ్చు లేదా తొలగించవచ్చు."
 
 #: ../libpurple/plugins/offlinemsg.c:156
 #, c-format
-msgid ""
-"\"%s\" is currently offline. Do you want to save the rest of the messages in "
-"a pounce and automatically send them when \"%s\" logs back in?"
-msgstr ""
+msgid "\"%s\" is currently offline. Do you want to save the rest of the messages in a pounce and automatically send them when \"%s\" logs back in?"
+msgstr "\"%s\" ప్రస్తుతం ఆఫ్ లైనులో ఉన్నారు. మీరు మిగతా సందేశాలను పౌన్స్ లో సేవ్ చేసి, ఆటోమేటిక్ గా వాటిని \"%s\" లాగ్స్ బ్యాక్ లో ఉన్నప్పుడు పంపదల్చుకున్నారా?"
 
 #: ../libpurple/plugins/offlinemsg.c:160
-#, fuzzy
 msgid "Offline Message"
-msgstr "ఆఫ్‌లైన్ "
+msgstr "ఆఫ్ లైన్ సందేశం"
 
 #: ../libpurple/plugins/offlinemsg.c:161
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
-msgstr ""
-
+msgstr "`Buddy Pounce' డైలాగ్ నుంచి మీరు పౌన్స్ ను ఎడిట్ చేయవచ్చు లేదా తొలగించవచ్చు"
+
+# *
+# * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #: ../libpurple/plugins/offlinemsg.c:165
-#: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
-#: ../libpurple/protocols/novell/novell.c:1917
+#: ../libpurple/protocols/msn/dialog.c:141
+#: ../libpurple/protocols/msn/msn.c:665
+#: ../libpurple/protocols/msnp9/dialog.c:133
+#: ../libpurple/protocols/msnp9/msn.c:550
+#: ../libpurple/protocols/msnp9/msn.c:564
+#: ../libpurple/protocols/novell/novell.c:1928
 #: ../libpurple/protocols/silc/buddy.c:317
-#: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
+#: ../libpurple/protocols/silc/pk.c:113
+#: ../libpurple/protocols/silc/wb.c:308
 #: ../libpurple/protocols/silc10/buddy.c:314
 #: ../libpurple/protocols/silc10/pk.c:119
-#: ../libpurple/protocols/silc10/wb.c:304 ../pidgin/gtkrequest.c:268
+#: ../libpurple/protocols/silc10/wb.c:307
+#: ../pidgin/gtkrequest.c:318
 msgid "Yes"
-msgstr "అవును."
+msgstr "అవును"
 
 #: ../libpurple/plugins/offlinemsg.c:166
-#: ../libpurple/protocols/msn/dialog.c:134
-#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
-#: ../libpurple/protocols/novell/novell.c:1918
+#: ../libpurple/protocols/msn/dialog.c:142
+#: ../libpurple/protocols/msn/msn.c:665
+#: ../libpurple/protocols/msnp9/dialog.c:134
+#: ../libpurple/protocols/msnp9/msn.c:550
+#: ../libpurple/protocols/msnp9/msn.c:564
+#: ../libpurple/protocols/novell/novell.c:1929
 #: ../libpurple/protocols/silc/buddy.c:318
-#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
+#: ../libpurple/protocols/silc/pk.c:114
+#: ../libpurple/protocols/silc/wb.c:309
 #: ../libpurple/protocols/silc10/buddy.c:315
 #: ../libpurple/protocols/silc10/pk.c:120
-#: ../libpurple/protocols/silc10/wb.c:305 ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/silc10/wb.c:308
+#: ../pidgin/gtkrequest.c:319
 msgid "No"
 msgstr "కాదు"
 
 #: ../libpurple/plugins/offlinemsg.c:193
 msgid "Save offline messages in pounce"
-msgstr ""
+msgstr "ఆఫ్ లైన్ సందేశాలను పౌన్స్ లో సేవ్ చేయండి"
 
 #: ../libpurple/plugins/offlinemsg.c:197
 msgid "Do not ask. Always save in pounce."
-msgstr ""
-
+msgstr "మళ్ళీ అడగకండి. ఎప్పుడూ పౌన్స్ లోనే సేవ్ చేయండి."
+
+# *< type
+# *< ui_requirement
+# *< flags
+# *< dependencies
+# *< priority
+# *< id
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -3458,84 +3751,97 @@
 #. *< id
 #: ../libpurple/plugins/perl/perl.c:601
 msgid "Perl Plugin Loader"
-msgstr "పెరల్ ప్లగ్‌ఇన్ లీడర్."
-
-#  *< name
+msgstr "పెర్ల్ ప్లగ్‌ఇన్ లోడర్"
+
+# *< name
 #  *< version
+# *< version
+# *< summary
 #. *< name
 #. *< version
 #. *< summary
-#: ../libpurple/plugins/perl/perl.c:603 ../libpurple/plugins/perl/perl.c:604
+#: ../libpurple/plugins/perl/perl.c:603
+#: ../libpurple/plugins/perl/perl.c:604
 msgid "Provides support for loading perl plugins."
-msgstr "పెరల్ ప్లగ్‌ఇన్‌లు లోడ్ చేయడానికి సపోర్టును అందించును."
+msgstr "పెర్ల్ ప్లగ్‌ఇన్‌లను లోడ్ చేయడానికి సహకరిస్తుంది."
 
 #: ../libpurple/plugins/psychic.c:20
 msgid "Psychic Mode"
-msgstr ""
+msgstr "మానసిక విధానాలు"
 
 #: ../libpurple/plugins/psychic.c:21
 msgid "Psychic mode for incoming conversation"
-msgstr ""
+msgstr "జరుగుతున్న సంభాషణకోసం మానసిక విధానాలు"
 
 #: ../libpurple/plugins/psychic.c:22
-msgid ""
-"Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
-msgstr ""
+#, fuzzy
+msgid "Causes conversation windows to appear as other users begin to message you.  This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
+msgstr "ఇతర వినియోగదారులు మీకు సందేశం ఇవ్వడం ఆరంభించినప్పుడు సంభాషణా విండో కనిపించేలా చేస్తుంది. AIM, ICQ, Jabber, Sametime, మరియు Yahoo!లలో ఈ సౌకర్యం ఉంది."
 
 #: ../libpurple/plugins/psychic.c:72
 msgid "You feel a disturbance in the force..."
-msgstr ""
+msgstr "మీకు అసౌకర్యంగా అనిపించినప్పుడు...."
 
 #: ../libpurple/plugins/psychic.c:91
-#, fuzzy
 msgid "Only enable for users on the buddy list"
-msgstr "నా మిత్రుల లిస్టులో ఉన్నవారిని మాత్రమే అనుమతించుము. "
+msgstr "మిత్రుల జాబితాలోని వినియోగదారుల కోసం మాత్రమే"
 
 #: ../libpurple/plugins/psychic.c:96
-#, fuzzy
 msgid "Disable when away"
-msgstr "%s వెళ్లిపోయినారు."
+msgstr "దూరంగా ఉన్నప్పుడు పనిచేయకుండా"
 
 #: ../libpurple/plugins/psychic.c:100
 msgid "Display notification message in conversations"
-msgstr ""
-
-#  IM Convo trans options
+msgstr "సంభాషణల్లో నోటిఫికేషన్ సందేశాన్ని చూపండి"
+
 #: ../libpurple/plugins/psychic.c:105
-#, fuzzy
 msgid "Raise psychic conversations"
-msgstr "IM Conversation Windows"
-
-#  *< api_version
+msgstr "మానసికపరమైన సంభాషణలను లేవనెత్తండి"
+
+# *< api_version
 #  *< type
 #  *< ui_requirement
 #  *< flags
 #  *< dependencies
 #  *< priority
 #  *< id
+# *< type
+# *< ui_requirement
+# *< flags
+# *< dependencies
+# *< priority
+# *< id
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/signals-test.c:711
+#: ../libpurple/plugins/signals-test.c:753
 msgid "Signals Test"
-msgstr "సిగ్నల్స్ పరీక్ష "
-
-#  *< name
+msgstr "సిగ్నళ్ల పరీక్ష "
+
+# *< name
 #  *< version
 #  *  summary
+# *< version
+# *  summary
+# *  description
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/signals-test.c:714
-#: ../libpurple/plugins/signals-test.c:716
+#: ../libpurple/plugins/signals-test.c:756
+#: ../libpurple/plugins/signals-test.c:758
 msgid "Test to see that all signals are working properly."
-msgstr "సిగ్నల్స్ అన్నీ బాగా పనిచేస్తున్నాయా లేదా తెలుసుకొనుటకు పరీక్ష. "
-
+msgstr "అన్ని సిగ్నల్స్ సరిగా పనిచేసేలా పరీక్షించి చూడటం."
+
+# *< type
+# *< ui_requirement
+# *< flags
+# *< dependencies
+# *< priority
+# *< id
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -3546,68 +3852,98 @@
 msgid "Simple Plugin"
 msgstr "సింపుల్ ప్లగ్‌ఇన్ "
 
-#  *< name
+# *< name
 #  *< version
 #  *  summary
+# *< version
+# *  summary
+# *  description
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/simple.c:40 ../libpurple/plugins/simple.c:42
+#: ../libpurple/plugins/simple.c:40
+#: ../libpurple/plugins/simple.c:42
 msgid "Tests to see that most things are working."
-msgstr "ఎక్కువభాగం పనిచేస్తున్నాయో లేదో తెలుసుకొనుటకు పరీక్ష."
+msgstr "ఎక్కువభాగం పనిచేస్తున్నాయో లేదో తెలుసుకునే పరీక్షలు."
 
 #. Scheme name
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:902
-#: ../libpurple/plugins/ssl/ssl-nss.c:725
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:911
+#: ../libpurple/plugins/ssl/ssl-nss.c:731
 msgid "X.509 Certificates"
 msgstr ""
 
-#  *< api_version
+# *< api_version
 #  *< type
 #  *< ui_requirement
 #  *< flags
 #  *< dependencies
 #  *< priority
 #  *< id
+# *< type
+# *< ui_requirement
+# *< flags
+# *< dependencies
+# *< priority
+# *< id
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:986
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:995
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
+# *< name
+# *< version
+# *  summary
+# *  description
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:989
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:991
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:998
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:1000
 msgid "Provides SSL support through GNUTLS."
-msgstr "GNUTLS ద్వారా SSL సపోర్టును అందించును."
-
+msgstr "GNUTLS ద్వారా SSL సపోర్టును అందించడం."
+
+# *< type
+# *< ui_requirement
+# *< flags
+# *< dependencies
+# *< priority
+# *< id
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:810
+#: ../libpurple/plugins/ssl/ssl-nss.c:816
 msgid "NSS"
 msgstr "NSS"
 
+# *< name
+# *< version
+# *  summary
+# *  description
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:813
-#: ../libpurple/plugins/ssl/ssl-nss.c:815
+#: ../libpurple/plugins/ssl/ssl-nss.c:819
+#: ../libpurple/plugins/ssl/ssl-nss.c:821
 msgid "Provides SSL support through Mozilla NSS."
-msgstr "మొజిల్లా NSS ద్వారా SSL సపోర్టును అందించును. "
-
+msgstr "మొజిల్లా NSS ద్వారా SSL సపోర్టును అందించడం"
+
+# *< type
+# *< ui_requirement
+# *< flags
+# *< dependencies
+# *< priority
+# *< id
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -3618,61 +3954,69 @@
 msgid "SSL"
 msgstr "SSL"
 
-#  *< name
+# *< name
 #  *< version
 #  *  summary
+# *< version
+# *  summary
+# *  description
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl.c:97 ../libpurple/plugins/ssl/ssl.c:99
+#: ../libpurple/plugins/ssl/ssl.c:97
+#: ../libpurple/plugins/ssl/ssl.c:99
 msgid "Provides a wrapper around SSL support libraries."
-msgstr "SSL సపోర్ట్ లైబ్రరీల చుట్టూ ముసుగును అమర్చును ."
+msgstr "SSL సపోర్ట్ లైబ్రరీల చుట్టూ ర్యాపర్  ను సమకూర్చడం."
 
 #: ../libpurple/plugins/statenotify.c:50
 #, c-format
 msgid "%s is no longer away."
-msgstr "ఇప్పుడు %s  దూరంలో లేరు/దు."
+msgstr " %s  దూరంలో లేదు."
 
 #: ../libpurple/plugins/statenotify.c:52
 #, c-format
 msgid "%s has gone away."
-msgstr "%s దూరం వెళ్లిపోయినారు."
+msgstr "%s దూరం వెళ్లారు."
 
 #: ../libpurple/plugins/statenotify.c:62
 #, c-format
 msgid "%s has become idle."
-msgstr "%s సోమరిగా మారిపోయినారు/నది."
+msgstr "%s ఖాళీ గా ఉంది."
 
 #: ../libpurple/plugins/statenotify.c:64
 #, c-format
 msgid "%s is no longer idle."
-msgstr "ఇప్పుడు %s సోమరిగా లేరు."
+msgstr " %s ఖాళీగా లేదు."
 
 #: ../libpurple/plugins/statenotify.c:73
-#, fuzzy, c-format
+#, c-format
 msgid "%s has signed on."
-msgstr "%s ఖాతాను ఓపెన్ చేశారు. (%s) "
-
-#  ---------- "Notify For" ----------
+msgstr "%s సైన్డ్ ఆన్ చేశారు."
+
+# ---------- "Notify For" ----------
 #: ../libpurple/plugins/statenotify.c:91
 msgid "Notify When"
 msgstr "ఎప్పుడో సూచించండి"
 
 #: ../libpurple/plugins/statenotify.c:94
 msgid "Buddy Goes _Away"
-msgstr "మిత్రుడు _దూరం వెళ్లిపోయినాడు. "
+msgstr "మిత్రుడు _వెళ్లిపోయాడు. "
 
 #: ../libpurple/plugins/statenotify.c:97
 msgid "Buddy Goes _Idle"
-msgstr "మిత్రుడు _సోమరి యైనాడు"
-
-#  Buddy List trans options
+msgstr "మిత్రుడు _ఖాళీగా ఉన్నాడు"
+
 #: ../libpurple/plugins/statenotify.c:100
-#, fuzzy
 msgid "Buddy _Signs On/Off"
-msgstr "మిత్రుడు లాగ్‌ఇన్ చేసినాడు "
-
+msgstr "మిత్రుడు _సైన్ ఆన్/ఆఫ్ చేశారు"
+
+# *< type
+# *< ui_requirement
+# *< flags
+# *< dependencies
+# *< priority
+# *< id
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -3681,91 +4025,88 @@
 #. *< id
 #: ../libpurple/plugins/statenotify.c:148
 msgid "Buddy State Notification"
-msgstr "బడ్డీ State Notification"
-
-#  *< name
+msgstr "మిత్రుడి State Notification"
+
+# *< name
 #  *< version
 #  *  summary
+# *< version
+# *  summary
+# *  description
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 #: ../libpurple/plugins/statenotify.c:151
 #: ../libpurple/plugins/statenotify.c:154
-msgid ""
-"Notifies in a conversation window when a buddy goes or returns from away or "
-"idle."
-msgstr ""
-"ఒక మిత్రుడు దూరంగా పోయినా లేక సోమరిగా మారినా లేదా వెనుదిరిగి వచ్చినా సంభాషణ విండోలో సూచన కనిపించును."
-
-#: ../libpurple/plugins/tcl/tcl.c:421
+msgid "Notifies in a conversation window when a buddy goes or returns from away or idle."
+msgstr "మిత్రుడు వచ్చినప్పుడు లేదా ఖాళీగా ఉన్నప్పుడు కన్వర్జేషన్ విండోలో తెలియజేయడం."
+
+#: ../libpurple/plugins/tcl/tcl.c:423
 msgid "Tcl Plugin Loader"
 msgstr "Tcl ప్లగ్‌ఇన్‌ లోడర్ "
 
-#: ../libpurple/plugins/tcl/tcl.c:423 ../libpurple/plugins/tcl/tcl.c:424
+#: ../libpurple/plugins/tcl/tcl.c:425
+#: ../libpurple/plugins/tcl/tcl.c:426
 msgid "Provides support for loading Tcl plugins"
-msgstr "Tcl ప్లగ్‌ఇన్స్‌ను లోడ్ చేయుటకు సపోర్టును అందించును."
-
-#: ../libpurple/plugins/tcl/tcl.c:507
-msgid ""
-"Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
-"install ActiveTCL from http://www.activestate.com\n"
-msgstr ""
-
-#. Send a message about the connection error
-#: ../libpurple/protocols/bonjour/bonjour.c:112
-#, fuzzy
+msgstr "Tcl ప్లగ్‌ఇన్ లను లోడ్ చేయడంలో సహకరిస్తుంది"
+
+#: ../libpurple/plugins/tcl/tcl.c:509
+msgid "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, install ActiveTCL from http://www.activestate.com\n"
+msgstr "ActiveTCL ఇన్స్టాలేషన్ ను కనుగొనడంలో అశక్తత. మీరు TCL ప్లగ్ ఇన్లను ఉపయోగించాలనుకుంటే http://www.activestate.com\n"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:108
+msgid "The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-LocalMessaging for more information."
+msgstr ""
+
+#: ../libpurple/protocols/bonjour/bonjour.c:127
 msgid "Unable to listen for incoming IM connections\n"
-msgstr "కొత్త కనెక్షన్ సృష్టించడంలో అసమర్థత. "
-
-#: ../libpurple/protocols/bonjour/bonjour.c:137
-msgid ""
-"Unable to establish connection with the local mDNS server.  Is it running?"
-msgstr ""
+msgstr "ఇన్ కమింగ్ IM కనెక్షన్లకు \n"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:154
+msgid "Unable to establish connection with the local mDNS server.  Is it running?"
+msgstr "లోకల్ mDNS సర్వర్ తో కనెక్షన్ కుదరటంలేదు. ఆ సర్వర్ అమలులో ఉందా?"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:351
-#: ../libpurple/protocols/bonjour/bonjour.c:656
-#: ../libpurple/protocols/gg/gg.c:632
-#: ../libpurple/protocols/jabber/jabber.c:942
-#, fuzzy
+#: ../libpurple/protocols/bonjour/bonjour.c:370
+#: ../libpurple/protocols/bonjour/bonjour.c:675
+#: ../libpurple/protocols/gg/gg.c:633
+#: ../libpurple/protocols/jabber/jabber.c:969
 msgid "First name"
-msgstr "మొదటి పేరు:"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:353
-#: ../libpurple/protocols/bonjour/bonjour.c:659
-#: ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/jabber/jabber.c:947
-#, fuzzy
+msgstr "పేరులోని మొదటి భాగం"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:372
+#: ../libpurple/protocols/bonjour/bonjour.c:678
+#: ../libpurple/protocols/gg/gg.c:628
+#: ../libpurple/protocols/jabber/jabber.c:974
 msgid "Last name"
-msgstr "చివరి పేరు:"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:357
+msgstr "పేరులోని చివరి భాగం"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:376
 #: ../libpurple/protocols/jabber/buddy.c:295
 #: ../libpurple/protocols/jabber/buddy.c:1325
 #: ../libpurple/protocols/jabber/buddy.c:1335
-#: ../libpurple/protocols/jabber/buddy.c:2216
+#: ../libpurple/protocols/jabber/buddy.c:2219
 #: ../libpurple/protocols/silc/ops.c:1041
-#: ../libpurple/protocols/silc/util.c:555
+#: ../libpurple/protocols/silc/util.c:561
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
 msgid "E-Mail"
 msgstr "ఇ-మెయిల్ "
 
-#  And now for the buttons
-#: ../libpurple/protocols/bonjour/bonjour.c:360
-#: ../libpurple/protocols/bonjour/bonjour.c:665
-#, fuzzy
+# And now for the buttons
+#: ../libpurple/protocols/bonjour/bonjour.c:379
+#: ../libpurple/protocols/bonjour/bonjour.c:684
 msgid "AIM Account"
-msgstr "ఖాతాను చేర్చండి"
-
-#  And now for the buttons
-#: ../libpurple/protocols/bonjour/bonjour.c:363
-#: ../libpurple/protocols/bonjour/bonjour.c:668
+msgstr "AIM అకౌంటు"
+
+# And now for the buttons
+#: ../libpurple/protocols/bonjour/bonjour.c:382
+#: ../libpurple/protocols/bonjour/bonjour.c:687
 #, fuzzy
 msgid "XMPP Account"
-msgstr "ఖాతా "
+msgstr "AIM అకౌంటు"
 
 #. *< type
 #. *< ui_requirement
@@ -3777,22 +4118,20 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:467
-#: ../libpurple/protocols/bonjour/bonjour.c:469
-#, fuzzy
+#: ../libpurple/protocols/bonjour/bonjour.c:486
+#: ../libpurple/protocols/bonjour/bonjour.c:488
 msgid "Bonjour Protocol Plugin"
-msgstr "Yahoo Protocol Plugin"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:610
-#, fuzzy
+msgstr "Bonjour ప్రొటోకాల్ ప్లగ్ ఇన్"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:629
 msgid "Purple Person"
-msgstr "కొత్త వ్యక్తి "
-
-#: ../libpurple/protocols/bonjour/bonjour.c:662
-#: ../libpurple/protocols/gg/gg.c:477
-#: ../libpurple/protocols/jabber/jabber.c:932
-#: ../libpurple/protocols/silc/silc.c:770
-#: ../libpurple/protocols/silc/silc.c:1011
+msgstr "Purple పర్సన్"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:681
+#: ../libpurple/protocols/gg/gg.c:478
+#: ../libpurple/protocols/jabber/jabber.c:959
+#: ../libpurple/protocols/silc/silc.c:913
+#: ../libpurple/protocols/silc/silc.c:1154
 #: ../libpurple/protocols/silc10/silc.c:681
 #: ../libpurple/protocols/silc10/silc.c:922
 #, fuzzy
@@ -3801,458 +4140,452 @@
 
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
-msgstr ""
-
-#  Remove on type button
-#: ../libpurple/protocols/bonjour/jabber.c:380
-#, fuzzy, c-format
+msgstr "Bonjour"
+
+#: ../libpurple/protocols/bonjour/jabber.c:395
+#, c-format
 msgid "%s has closed the conversation."
-msgstr "%s ఈ సంభాషణకు ఆహ్వానించబడినారు."
-
-#: ../libpurple/protocols/bonjour/jabber.c:437
-#: ../libpurple/protocols/bonjour/jabber.c:660
-#: ../libpurple/protocols/bonjour/jabber.c:678
-#, fuzzy
+msgstr "%s తన సంభాషణను ముగించారు."
+
+#: ../libpurple/protocols/bonjour/jabber.c:453
+#: ../libpurple/protocols/bonjour/jabber.c:686
+#: ../libpurple/protocols/bonjour/jabber.c:704
 msgid "Unable to send the message, the conversation couldn't be started."
-msgstr "संदेश भेजने में असफल: संदेश बहुत बढ़ा है।"
-
-#: ../libpurple/protocols/bonjour/jabber.c:583
-#, fuzzy
+msgstr "సందేశాన్ని పంపలేకపోయాం, సంభాషణను ప్రారంభించలేరు."
+
+#: ../libpurple/protocols/bonjour/jabber.c:603
 msgid "Cannot open socket"
-msgstr "సాకెట్‌ను ఓపెన్ చేయడంలో అసమర్థత. "
-
-#: ../libpurple/protocols/bonjour/jabber.c:591
-#, fuzzy
+msgstr "సాకెట్ ను తెరవజాలదు"
+
+#: ../libpurple/protocols/bonjour/jabber.c:613
 msgid "Error setting socket options"
-msgstr "కనెక్షన్ సృష్టిలో పొరపాటు. "
-
-#: ../libpurple/protocols/bonjour/jabber.c:615
-#, fuzzy
+msgstr "సాకెట్ ఆప్షన్లను సెట్ చేయడంలో పొరపాటు"
+
+#: ../libpurple/protocols/bonjour/jabber.c:639
 msgid "Could not bind socket to port"
-msgstr "సాకెట్‌ను సృష్టించలేదు. "
-
-#: ../libpurple/protocols/bonjour/jabber.c:623
-#, fuzzy
+msgstr "పోర్టుకు సాకెట్ ను కలపలేకపోతున్నాం"
+
+#: ../libpurple/protocols/bonjour/jabber.c:649
 msgid "Could not listen on socket"
-msgstr "సాకెట్‌ను సృష్టించలేదు. "
-
-#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1829
+msgstr "సాకెట్ పై వినలేకపోతున్నాం"
+
+#: ../libpurple/protocols/gg/gg.c:76
+#: ../libpurple/proxy.c:1845
 msgid "Invalid proxy settings"
-msgstr "విలువలేని ప్రాక్సీ సెట్టింగులు. "
-
-#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1829
-msgid ""
-"Either the host name or port number specified for your given proxy type is "
-"invalid."
-msgstr "మీరు నిర్దేశించిన దాత పేరుగానీ లేక పోర్ట్ నెంబరుగానీ మీ రిచ్చిన ప్రాక్సీ టైప్‌కు పనికిరావు."
-
-# #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
-# gnome-session/gsm-client-row.c:43
-# #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
-# gnome-session/gsm-client-row.c:43
-#: ../libpurple/protocols/gg/gg.c:115 ../libpurple/protocols/gg/gg.c:137
+msgstr "చెల్లని ప్రాక్సీ సెట్టింగులు "
+
+#: ../libpurple/protocols/gg/gg.c:77
+#: ../libpurple/proxy.c:1845
+msgid "Either the host name or port number specified for your given proxy type is invalid."
+msgstr "మీ ప్రాక్సీ టైపునకు  నిర్దేశించిన  హోస్ట్ పేరు కాని పోర్ట్ నెంబరు కాని చెల్లదు."
+
+#: ../libpurple/protocols/gg/gg.c:115
+#: ../libpurple/protocols/gg/gg.c:137
 #: ../libpurple/protocols/gg/gg.c:180
-#, fuzzy
 msgid "Token Error"
-msgstr "అజ్ఞాత పొరపాటు. "
-
-#: ../libpurple/protocols/gg/gg.c:116 ../libpurple/protocols/gg/gg.c:138
+msgstr "టోకెన్ లో పొరపాటు"
+
+#: ../libpurple/protocols/gg/gg.c:116
+#: ../libpurple/protocols/gg/gg.c:138
 #: ../libpurple/protocols/gg/gg.c:181
-#, fuzzy
 msgid "Unable to fetch the token.\n"
-msgstr "గది లిస్టును తీసుకురావడంలో వైఫల్యం. "
-
-#  Buddy List
-#: ../libpurple/protocols/gg/gg.c:269 ../libpurple/protocols/gg/gg.c:288
-#, fuzzy
+msgstr " టోకెన్ ను పొందలేకపోతున్నాం \n"
+
+#: ../libpurple/protocols/gg/gg.c:267
+#: ../libpurple/protocols/gg/gg.c:274
+#: ../libpurple/protocols/gg/gg.c:280
 msgid "Save Buddylist..."
-msgstr "మిత్రుల లిస్టును పంపుము. "
-
-#: ../libpurple/protocols/gg/gg.c:270
+msgstr "మిత్రుల జాబితాను సేవ్ చేయండి..."
+
+#: ../libpurple/protocols/gg/gg.c:268
 msgid "Your buddylist is empty, nothing was written to the file."
-msgstr ""
-
-#: ../libpurple/protocols/gg/gg.c:276 ../libpurple/protocols/gg/gg.c:278
-#, fuzzy
-msgid "Couldn't open file"
-msgstr "ఫైలును పంపుట సాధ్యం కాదు. "
-
-#: ../libpurple/protocols/gg/gg.c:289
-#, fuzzy
+msgstr "మీ మిత్రుల జాబితా ఖాళీగా ఉంది. ఫైలులో ఏమీ రాయబడలేదు."
+
+#: ../libpurple/protocols/gg/gg.c:275
 msgid "Buddylist saved successfully!"
-msgstr "పాస్‌వర్డ్ విజయవంతముగా మార్చబడినది."
-
-#: ../libpurple/protocols/gg/gg.c:307 ../libpurple/protocols/gg/gg.c:308
-#, fuzzy
+msgstr "మిత్రుల జాబితా విజయవంతంగా సేవ్ చేయడం జరిగింది!"
+
+#: ../libpurple/protocols/gg/gg.c:278
+#, c-format
+msgid "Couldn't write buddy list for %s to %s"
+msgstr "మిత్రుల జాబితాను లోడ్ చేయలేకపోతోంది"
+
+#: ../libpurple/protocols/gg/gg.c:303
+#: ../libpurple/protocols/gg/gg.c:304
 msgid "Couldn't load buddylist"
-msgstr "మిత్రుల లిస్టును ఎక్స్‌పోర్ట్ చేయలేకపోతోంది."
-
-#: ../libpurple/protocols/gg/gg.c:324
-#, fuzzy
+msgstr "మిత్రుల జాబితాను లోడ్ చేయలేకపోతోంది"
+
+#: ../libpurple/protocols/gg/gg.c:320
 msgid "Load Buddylist..."
-msgstr "_మిత్రుని ఉపనామం..."
-
-#: ../libpurple/protocols/gg/gg.c:325
-#, fuzzy
+msgstr "మిత్రుల జాబితాను లోడ్ చేయండి..."
+
+#: ../libpurple/protocols/gg/gg.c:321
 msgid "Buddylist loaded successfully!"
-msgstr "పాస్‌వర్డ్ విజయవంతముగా మార్చబడినది."
-
-#  Buddy List
-#: ../libpurple/protocols/gg/gg.c:336
-#, fuzzy
+msgstr "మిత్రుల జాబితా విజయవంతంగా లోడ్ అయింది!"
+
+#: ../libpurple/protocols/gg/gg.c:332
 msgid "Save buddylist..."
-msgstr "మిత్రుల లిస్టును పంపుము. "
-
-#: ../libpurple/protocols/gg/gg.c:384
+msgstr "మిత్రుల జాబితాను సేవ్ చేయండి..."
+
+#: ../libpurple/protocols/gg/gg.c:382
 msgid "Fill in the registration fields."
-msgstr ""
+msgstr "నమోదు పత్రంలోని అన్ని ఖాళీలను నింపండి."
 
 #: ../libpurple/protocols/gg/gg.c:389
-#, fuzzy
 msgid "Passwords do not match."
-msgstr "కొత్త పాస్‌వర్డ్స్ మాచ్ కావు."
-
-#: ../libpurple/protocols/gg/gg.c:398
-#, fuzzy
+msgstr "పాస్‌వర్డ్స్ సరిపోలడంలేదు."
+
+#: ../libpurple/protocols/gg/gg.c:399
 msgid "Unable to register new account. Error occurred.\n"
-msgstr "కొత్త కనెక్షన్ సృష్టించడంలో అసమర్థత. "
-
-#: ../libpurple/protocols/gg/gg.c:411
-msgid "New Gadu-Gadu Account Registered"
-msgstr ""
+msgstr "కొత్త అకౌంటును నమోదు చేయలేకపోతున్నాం. లోపం జరిగింది.\n"
 
 #: ../libpurple/protocols/gg/gg.c:412
-#, fuzzy
+msgid "New Gadu-Gadu Account Registered"
+msgstr "కొత్త Gadu-Gadu అకౌంటు నమోదు అయింది"
+
+#: ../libpurple/protocols/gg/gg.c:413
 msgid "Registration completed successfully!"
-msgstr " రెజిస్ట్రేషన్ విజయవంతమైనది."
-
-#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
-#: ../libpurple/protocols/jabber/jabber.c:913
-#: ../libpurple/protocols/jabber/jabber.c:916
-#: ../libpurple/protocols/jabber/jabber.c:1722
+msgstr "నమోదుచేయడం విజయవంతంగా పూర్తయ్యింది!"
+
+#: ../libpurple/protocols/gg/gg.c:483
+#: ../libpurple/protocols/gg/gg.c:776
+#: ../libpurple/protocols/jabber/jabber.c:940
+#: ../libpurple/protocols/jabber/jabber.c:943
+#: ../libpurple/protocols/jabber/jabber.c:1731
 msgid "Password"
 msgstr "పాస్‌వర్డ్"
 
-#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
-#, fuzzy
+#: ../libpurple/protocols/gg/gg.c:488
+#: ../libpurple/protocols/gg/gg.c:781
 msgid "Password (retype)"
-msgstr "పాస్‌వర్డ్ పంపబడింది."
-
-#: ../libpurple/protocols/gg/gg.c:492 ../libpurple/protocols/gg/gg.c:785
-#, fuzzy
+msgstr "పాస్ వర్డ్ ను (మళ్ళీటైప్ చేయండి)"
+
+#: ../libpurple/protocols/gg/gg.c:493
+#: ../libpurple/protocols/gg/gg.c:786
 msgid "Enter current token"
-msgstr "%s వర్తమానంలో లాగ్ ఇన్ చేయలేదు."
-
-#: ../libpurple/protocols/gg/gg.c:498 ../libpurple/protocols/gg/gg.c:791
-#, fuzzy
+msgstr "ప్రస్తుత టోకెన్ ను ఎంటర్ చేయండి"
+
+#: ../libpurple/protocols/gg/gg.c:499
+#: ../libpurple/protocols/gg/gg.c:792
 msgid "Current token"
-msgstr "ప్రస్తుతం ఆన్‌లో ఉన్నది."
-
-#: ../libpurple/protocols/gg/gg.c:502 ../libpurple/protocols/gg/gg.c:503
-#, fuzzy
-msgid "Register New Gadu-Gadu Account"
-msgstr "కొత్త జాబర్ ఎకౌంట్‌ను రిజిస్టర్ చేయండి."
-
+msgstr "ప్రస్తుత టోకెన్"
+
+#: ../libpurple/protocols/gg/gg.c:503
 #: ../libpurple/protocols/gg/gg.c:504
+msgid "Register New Gadu-Gadu Account"
+msgstr "కొత్త Gadu-Gadu అకౌంటును నమోదు చేయండి"
+
+#: ../libpurple/protocols/gg/gg.c:505
 msgid "Please, fill in the following fields"
-msgstr ""
-
-#: ../libpurple/protocols/gg/gg.c:642 ../libpurple/protocols/gg/gg.c:1054
-#: ../libpurple/protocols/gg/gg.c:1126
-#: ../libpurple/protocols/jabber/jabber.c:957
-#: ../libpurple/protocols/oscar/oscar.c:3789
-#: ../libpurple/protocols/oscar/oscar.c:3802
+msgstr "దయచేసి, ఈ కింది జాగాల్లోని ఖాళీలను పూర్తిచేయండి"
+
+#: ../libpurple/protocols/gg/gg.c:643
+#: ../libpurple/protocols/gg/gg.c:1056
+#: ../libpurple/protocols/gg/gg.c:1128
+#: ../libpurple/protocols/jabber/jabber.c:984
+#: ../libpurple/protocols/oscar/oscar.c:3799
+#: ../libpurple/protocols/oscar/oscar.c:3812
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "నగరం "
 
-#: ../libpurple/protocols/gg/gg.c:647
+#: ../libpurple/protocols/gg/gg.c:648
 msgid "Year of birth"
-msgstr ""
-
-#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1589
-#: ../libpurple/protocols/myspace/user.c:115
-#: ../libpurple/protocols/oscar/oscar.c:3732
+msgstr "పుట్టిన సంవత్సరం"
+
+#: ../libpurple/protocols/gg/gg.c:651
+#: ../libpurple/protocols/msn/msn.c:1737
+#: ../libpurple/protocols/msnp9/msn.c:1590
+#: ../libpurple/protocols/myspace/user.c:119
+#: ../libpurple/protocols/oscar/oscar.c:3742
 #: ../libpurple/protocols/qq/buddy_info.c:46
-#: ../libpurple/protocols/qq/qq.c:226 ../libpurple/protocols/qq/qq.c:229
-#: ../libpurple/protocols/qq/qq.c:232 ../libpurple/protocols/qq/qq.c:236
+#: ../libpurple/protocols/qq/qq.c:227
+#: ../libpurple/protocols/qq/qq.c:230
+#: ../libpurple/protocols/qq/qq.c:233
+#: ../libpurple/protocols/qq/qq.c:237
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1091
 msgid "Gender"
 msgstr "లింగము"
 
-#: ../libpurple/protocols/gg/gg.c:651
+#: ../libpurple/protocols/gg/gg.c:652
 msgid "Male or female"
-msgstr ""
-
-#: ../libpurple/protocols/gg/gg.c:652
-#: ../libpurple/protocols/oscar/oscar.c:3732
+msgstr "పురుషుడా లేక స్త్రీనా"
+
+#: ../libpurple/protocols/gg/gg.c:653
+#: ../libpurple/protocols/oscar/oscar.c:3742
 #: ../libpurple/protocols/qq/buddy_info.c:83
-#: ../libpurple/protocols/qq/qq.c:226
+#: ../libpurple/protocols/qq/qq.c:227
 msgid "Male"
 msgstr "పురుష "
 
-#: ../libpurple/protocols/gg/gg.c:653
-#: ../libpurple/protocols/oscar/oscar.c:3732
+#: ../libpurple/protocols/gg/gg.c:654
+#: ../libpurple/protocols/oscar/oscar.c:3742
 #: ../libpurple/protocols/qq/buddy_info.c:84
-#: ../libpurple/protocols/qq/qq.c:229
+#: ../libpurple/protocols/qq/qq.c:230
 msgid "Female"
 msgstr "స్త్రీ "
 
-#: ../libpurple/protocols/gg/gg.c:657
-#, fuzzy
+#: ../libpurple/protocols/gg/gg.c:658
 msgid "Only online"
-msgstr "ఆన్‌లైన్ "
-
-#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:662
-#, fuzzy
+msgstr "ఆన్ లైన్ మాత్రమే"
+
+#: ../libpurple/protocols/gg/gg.c:662
+#: ../libpurple/protocols/gg/gg.c:663
 msgid "Find buddies"
-msgstr "సోమరి మిత్రులను కాంతిహీనులను చేయుము."
-
-#: ../libpurple/protocols/gg/gg.c:663
-#, fuzzy
+msgstr "మిత్రులకోసం చూడండి"
+
+#: ../libpurple/protocols/gg/gg.c:664
 msgid "Please, enter your search criteria below"
-msgstr "దయచేసి మీ పాస్‌వర్డ్‌ను ఎంటర్ చేయండి."
-
-#: ../libpurple/protocols/gg/gg.c:701
+msgstr "దయచేసి, మీ అన్వేషణా ప్రాధాన్యతను కింద ఎంటర్ చేయండి"
+
+#: ../libpurple/protocols/gg/gg.c:702
 msgid "Fill in the fields."
-msgstr ""
-
-#: ../libpurple/protocols/gg/gg.c:713
+msgstr "ఫీల్డులను పూరించండి."
+
+#: ../libpurple/protocols/gg/gg.c:714
 msgid "Your current password is different from the one that you specified."
-msgstr ""
-
-#: ../libpurple/protocols/gg/gg.c:727
-#, fuzzy
+msgstr "మీరు ఇంతకు ముందు నిర్ధారించిన పాస్ వర్డ్ కు ప్రస్తుత పాస్ వర్డ్ భిన్నంగా ఉంది."
+
+#: ../libpurple/protocols/gg/gg.c:728
 msgid "Unable to change password. Error occurred.\n"
-msgstr "Gadu-Gadu పాస్‌వర్డ్‌ను మార్చలేని అశక్తత."
-
-#: ../libpurple/protocols/gg/gg.c:736
-#, fuzzy
-msgid "Change password for the Gadu-Gadu account"
-msgstr "%sకు పాస్‌వర్డ్‌ను మార్చండి."
+msgstr "పాస్ వర్డ్ ను మార్చలేకపోతున్నాం. లోపం జరిగింది.\n"
 
 #: ../libpurple/protocols/gg/gg.c:737
-#, fuzzy
+msgid "Change password for the Gadu-Gadu account"
+msgstr "Gadu-Gadu అకౌంటు కోసం పాస్ వర్డ్ ను మార్చండి"
+
+#: ../libpurple/protocols/gg/gg.c:738
 msgid "Password was changed successfully!"
-msgstr "పాస్‌వర్డ్ విజయవంతముగా మార్చబడినది."
-
-#: ../libpurple/protocols/gg/gg.c:770
-#, fuzzy
+msgstr "పాస్ వర్డ్ ను విజయవంతంగా మార్చడం జరిగింది!"
+
+#: ../libpurple/protocols/gg/gg.c:771
 msgid "Current password"
-msgstr "తప్పు పాస్‌వర్డ్ "
-
-#: ../libpurple/protocols/gg/gg.c:795
-#, fuzzy
+msgstr "ప్రస్తుత పాస్ వర్డ్"
+
+#: ../libpurple/protocols/gg/gg.c:796
 msgid "Please, enter your current password and your new password for UIN: "
-msgstr "దయచేసి మీ వర్తమాన పాస్‌వర్డ్‌ను మరియు మీ కొత్త పాస్‌వర్డ్‌ను ఎంటర్ చేయండి."
-
-#: ../libpurple/protocols/gg/gg.c:799 ../libpurple/protocols/gg/gg.c:800
-#, fuzzy
+msgstr "UIN:  కోసం దయచేసి మీ ప్రస్తుత పాస్‌వర్డ్‌ను, అలాగే మీ కొత్త పాస్‌వర్డ్‌ను ఎంటర్ చేయండి"
+
+#: ../libpurple/protocols/gg/gg.c:800
+#: ../libpurple/protocols/gg/gg.c:801
 msgid "Change Gadu-Gadu Password"
-msgstr "Gadu-Gadu పాస్‌వర్డ్‌ను మార్చలేని అశక్తత."
-
-#: ../libpurple/protocols/gg/gg.c:876
-#, fuzzy, c-format
+msgstr "Gadu-Gadu పాస్ వర్డ్ ను మార్చండి"
+
+#: ../libpurple/protocols/gg/gg.c:878
+#, c-format
 msgid "Select a chat for buddy: %s"
-msgstr "మీ మిత్రుల లిస్టునుండి సంభాషణను తొలగించుము."
-
-#: ../libpurple/protocols/gg/gg.c:879 ../libpurple/protocols/gg/gg.c:880
-#, fuzzy
+msgstr "%s మిత్రుని కోసం సంభాషణను ఎంపిక చేయండి:"
+
+#: ../libpurple/protocols/gg/gg.c:881
+#: ../libpurple/protocols/gg/gg.c:882
 msgid "Add to chat..."
-msgstr "ఒక సంభాషణను చేర్చండి "
-
-#: ../libpurple/protocols/gg/gg.c:1008
-#: ../libpurple/protocols/jabber/buddy.c:2031
-#: ../libpurple/protocols/novell/novell.c:2828
+msgstr "సంభాషణకు చేర్చండి..."
+
+#: ../libpurple/protocols/gg/gg.c:1010
+#: ../libpurple/protocols/jabber/buddy.c:2034
+#: ../libpurple/protocols/novell/novell.c:2845
 #: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:5604
-#: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
-#: ../libpurple/protocols/qq/qq.c:292
-#: ../libpurple/protocols/yahoo/yahoo.c:3099 ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:3104 ../pidgin/gtkblist.c:3436
-#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1061
+#: ../libpurple/protocols/oscar/oscar.c:5654
+#: ../libpurple/protocols/qq/qq.c:171
+#: ../libpurple/protocols/qq/qq.c:178
+#: ../libpurple/protocols/qq/qq.c:293
+#: ../libpurple/protocols/yahoo/yahoo.c:3110
+#: ../libpurple/status.c:154
+#: ../pidgin/gtkblist.c:3338
+#: ../pidgin/gtkblist.c:3676
+#: ../pidgin/gtkdocklet.c:561
+#: ../pidgin/gtkstatusbox.c:1061
 msgid "Offline"
 msgstr "ఆఫ్‌లైన్ "
 
-#: ../libpurple/protocols/gg/gg.c:1011
-#: ../libpurple/protocols/jabber/buddy.c:2033
-#: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
-#: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
-#: ../libpurple/protocols/novell/novell.c:2816
-#: ../libpurple/protocols/qq/qq.c:280
-#: ../libpurple/protocols/yahoo/yahoo.c:3101 ../libpurple/status.c:155
-#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1057
+# hacks
+#: ../libpurple/protocols/gg/gg.c:1013
+#: ../libpurple/protocols/jabber/buddy.c:2036
+#: ../libpurple/protocols/msn/state.c:29
+#: ../libpurple/protocols/msn/state.c:30
+#: ../libpurple/protocols/msn/state.c:37
+#: ../libpurple/protocols/msn/state.c:38
+#: ../libpurple/protocols/msnp9/state.c:29
+#: ../libpurple/protocols/msnp9/state.c:30
+#: ../libpurple/protocols/msnp9/state.c:37
+#: ../libpurple/protocols/msnp9/state.c:38
+#: ../libpurple/protocols/novell/novell.c:2833
+#: ../libpurple/protocols/qq/qq.c:281
+#: ../libpurple/protocols/yahoo/yahoo.c:3112
+#: ../libpurple/status.c:155
+#: ../pidgin/gtkdocklet.c:545
+#: ../pidgin/gtkstatusbox.c:1057
 msgid "Available"
-msgstr "లభించును."
+msgstr "లభించును"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#: ../libpurple/protocols/gg/gg.c:1014 ../libpurple/protocols/irc/irc.c:528
+#: ../libpurple/protocols/gg/gg.c:1016
+#: ../libpurple/protocols/irc/irc.c:537
 #: ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/buddy.c:2037
-#: ../libpurple/protocols/novell/novell.c:2819
+#: ../libpurple/protocols/jabber/buddy.c:2040
+#: ../libpurple/protocols/novell/novell.c:2836
 #: ../libpurple/protocols/oscar/oscar.c:733
-#: ../libpurple/protocols/oscar/oscar.c:4547
-#: ../libpurple/protocols/oscar/oscar.c:5632
-#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/qq/qq.c:284
-#: ../libpurple/protocols/silc/buddy.c:1476
-#: ../libpurple/protocols/silc10/buddy.c:1476
-#: ../libpurple/protocols/yahoo/yahoo.c:3653
-#: ../libpurple/protocols/yahoo/yahoo.c:3727 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1939
+#: ../libpurple/protocols/oscar/oscar.c:4557
+#: ../libpurple/protocols/oscar/oscar.c:5682
+#: ../libpurple/protocols/qq/qq.c:181
+#: ../libpurple/protocols/qq/qq.c:285
+#: ../libpurple/protocols/silc/buddy.c:1479
+#: ../libpurple/protocols/silc10/buddy.c:1479
+#: ../libpurple/protocols/yahoo/yahoo.c:3664
+#: ../libpurple/protocols/yahoo/yahoo.c:3738
+#: ../libpurple/status.c:158
+#: ../pidgin/gtkdocklet.c:549
+#: ../pidgin/gtkprefs.c:2040
 #: ../pidgin/gtkstatusbox.c:1058
-#, c-format
 msgid "Away"
 msgstr "దూరంగా "
 
-#: ../libpurple/protocols/gg/gg.c:1043 ../libpurple/protocols/gg/gg.c:1117
-#: ../libpurple/protocols/oscar/oscar.c:2699
-#: ../libpurple/protocols/oscar/oscar.c:3699
+#: ../libpurple/protocols/gg/gg.c:1045
+#: ../libpurple/protocols/gg/gg.c:1119
+#: ../libpurple/protocols/oscar/oscar.c:2709
+#: ../libpurple/protocols/oscar/oscar.c:3709
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libpurple/protocols/gg/gg.c:1046 ../libpurple/protocols/gg/gg.c:1120
-#: ../libpurple/protocols/jabber/buddy.c:2210
-#: ../libpurple/protocols/jabber/buddy.c:2386
-#: ../libpurple/protocols/oscar/oscar.c:3710
+#: ../libpurple/protocols/gg/gg.c:1048
+#: ../libpurple/protocols/gg/gg.c:1122
+#: ../libpurple/protocols/jabber/buddy.c:2213
+#: ../libpurple/protocols/jabber/buddy.c:2399
+#: ../libpurple/protocols/oscar/oscar.c:3720
 #: ../libpurple/protocols/silc/ops.c:990
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
-msgstr "మొదటి పేరు "
-
-#: ../libpurple/protocols/gg/gg.c:1059 ../libpurple/protocols/gg/gg.c:1129
+msgstr "పేరులోని మొదటి భాగం"
+
+#: ../libpurple/protocols/gg/gg.c:1061
+#: ../libpurple/protocols/gg/gg.c:1131
 msgid "Birth Year"
 msgstr "జన్మించిన సంవత్సరం "
 
-#: ../libpurple/protocols/gg/gg.c:1111 ../libpurple/protocols/gg/gg.c:1180
-#: ../libpurple/protocols/oscar/oscar.c:3911
-#, fuzzy
+#: ../libpurple/protocols/gg/gg.c:1113
+#: ../libpurple/protocols/gg/gg.c:1182
+#: ../libpurple/protocols/oscar/oscar.c:3921
 msgid "Unable to display the search results."
-msgstr "వినియోగదారుని ఆహ్వానించలేని అసమర్థత (%s)."
-
-#: ../libpurple/protocols/gg/gg.c:1171
+msgstr "అన్వేషణా ఫలితాలను చూపించలేకపోతున్నాం."
+
+#: ../libpurple/protocols/gg/gg.c:1173
 msgid "Gadu-Gadu Public Directory"
-msgstr ""
-
-#: ../libpurple/protocols/gg/gg.c:1172
-#, fuzzy
+msgstr "Gadu-Gadu పబ్లిక్ డైరెక్టరీ"
+
+#: ../libpurple/protocols/gg/gg.c:1174
 msgid "Search results"
 msgstr "అన్వేషణ ఫలితాలు "
 
-#: ../libpurple/protocols/gg/gg.c:1215
-#, fuzzy
+#: ../libpurple/protocols/gg/gg.c:1217
 msgid "No matching users found"
-msgstr "నాన్-మాచింగ్ హోస్ట్స్"
-
-#: ../libpurple/protocols/gg/gg.c:1216
-#, fuzzy
+msgstr "సరిపోలే వినియోగదారు కనిపించలేదు"
+
+#: ../libpurple/protocols/gg/gg.c:1218
 msgid "There are no users matching your search criteria."
-msgstr "దయచేసి మీ పాస్‌వర్డ్‌ను ఎంటర్ చేయండి."
-
-#: ../libpurple/protocols/gg/gg.c:1310 ../libpurple/protocols/gg/gg.c:1463
+msgstr "మీ అన్వేషణా ప్రాధాన్యతలకు సరిపోలే వినియోగదారులు లేరు."
+
+#: ../libpurple/protocols/gg/gg.c:1314
+#: ../libpurple/protocols/gg/gg.c:1469
 msgid "Unable to read socket"
-msgstr "సాకెట్‌ను చదవడం సాధ్యం కావడం లేదు. "
-
-#: ../libpurple/protocols/gg/gg.c:1395
-#, fuzzy
+msgstr "సాకెట్‌ను చదవడం సాధ్యంకాదు"
+
+#: ../libpurple/protocols/gg/gg.c:1399
 msgid "Buddy list downloaded"
-msgstr "మిత్రుడు సోమరిపోతు : "
-
-#: ../libpurple/protocols/gg/gg.c:1396
-#, fuzzy
+msgstr "మిత్రుల జాబితా డౌన్ లోడ్ అయింది"
+
+#: ../libpurple/protocols/gg/gg.c:1400
 msgid "Your buddy list was downloaded from the server."
-msgstr "మీరు సెర్వర్‌నుండి డిస్‌కనెక్ట్ అయినారు."
-
-#: ../libpurple/protocols/gg/gg.c:1403
-#, fuzzy
+msgstr "సర్వర్ నుంచి మీ మిత్రుల జాబితాను డౌన్ లోడ్ చేయబడింది."
+
+#: ../libpurple/protocols/gg/gg.c:1407
 msgid "Buddy list uploaded"
-msgstr "మిత్రుని ప్రదర్శన "
-
-#: ../libpurple/protocols/gg/gg.c:1404
-#, fuzzy
+msgstr "మిత్రుల జాబితా అప్ లోడ్ అయింది"
+
+#: ../libpurple/protocols/gg/gg.c:1408
 msgid "Your buddy list was stored on the server."
-msgstr "Gadu-Gadu సెర్వర్‌లో మిత్రుల లిస్టును  స్టోర్ చేసియుండలేదు."
-
-#: ../libpurple/protocols/gg/gg.c:1509 ../libpurple/protocols/gg/gg.c:1715
-#, fuzzy
+msgstr "సర్వర్ లో మీ మిత్రుల జాబితాను నిక్షిప్తపరచింది."
+
+#: ../libpurple/protocols/gg/gg.c:1517
+#: ../libpurple/protocols/gg/gg.c:1725
 msgid "Connection failed."
-msgstr "కనెక్షన్ వైఫల్యం "
-
-#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/msn/msn.c:559
+msgstr "కనెక్ట్ అవడంలో వైఫల్యం."
+
+#: ../libpurple/protocols/gg/gg.c:1629
+#: ../libpurple/protocols/msn/msn.c:664
+#: ../libpurple/protocols/msnp9/msn.c:563
 msgid "Blocked"
-msgstr "ఆగినది."
-
-#: ../libpurple/protocols/gg/gg.c:1644
-#, fuzzy
+msgstr "నిలిచిపోయింది"
+
+#: ../libpurple/protocols/gg/gg.c:1652
 msgid "Add to chat"
-msgstr "సంభాషణ చేర్చండి."
-
-#: ../libpurple/protocols/gg/gg.c:1653
-#, fuzzy
+msgstr "సంభాషణకు చేర్చండి"
+
+#: ../libpurple/protocols/gg/gg.c:1661
 msgid "Unblock"
-msgstr "ఆపుము "
-
-#: ../libpurple/protocols/gg/gg.c:1657
+msgstr "అడ్డుకోవద్దు"
+
+#: ../libpurple/protocols/gg/gg.c:1665
 msgid "Block"
-msgstr "ఆపుము "
-
-#: ../libpurple/protocols/gg/gg.c:1674
-#, fuzzy
+msgstr "నిలిపి వేయండి"
+
+#: ../libpurple/protocols/gg/gg.c:1682
 msgid "Chat _name:"
-msgstr "చివరి పేరు:"
-
-#: ../libpurple/protocols/gg/gg.c:1914
-#, fuzzy
+msgstr "సంభాషణ_పేరు:"
+
+#: ../libpurple/protocols/gg/gg.c:1933
 msgid "Chat error"
-msgstr "చదువుటలో పొరపాటు. "
-
-#: ../libpurple/protocols/gg/gg.c:1915
-#, fuzzy
+msgstr "సంభాషణలో పొరపాటు"
+
+#: ../libpurple/protocols/gg/gg.c:1934
 msgid "This chat name is already in use"
-msgstr "ఫైలు అస్తిత్వంలో ఉంది. "
-
-#: ../libpurple/protocols/gg/gg.c:1998
-#, fuzzy
+msgstr "ఈ సంభాషణ పేరు ఇప్పటికే ఉపయోగంలో ఉంది"
+
+#: ../libpurple/protocols/gg/gg.c:2019
 msgid "Not connected to the server."
-msgstr "మీరు సెర్వర్‌నుండి డిస్‌కనెక్ట్ అయినారు."
-
-#: ../libpurple/protocols/gg/gg.c:2021
-#, fuzzy
+msgstr "సర్వర్ కు కనెక్టు కాలేదు."
+
+#: ../libpurple/protocols/gg/gg.c:2042
 msgid "Find buddies..."
-msgstr "సోమరి మిత్రులను కాంతిహీనులను చేయుము."
-
-#: ../libpurple/protocols/gg/gg.c:2027
+msgstr "మిత్రులకోసం వెతకండి..."
+
+#: ../libpurple/protocols/gg/gg.c:2048
 #, fuzzy
 msgid "Change password..."
 msgstr "పాస్‌వర్డ్‌ను మార్చండి ..."
 
-#: ../libpurple/protocols/gg/gg.c:2033
-#, fuzzy
+#: ../libpurple/protocols/gg/gg.c:2054
 msgid "Upload buddylist to Server"
-msgstr "సెర్వర్‌కు మిత్రుల లిస్టును ఎగుమతి చేయండి."
-
-#: ../libpurple/protocols/gg/gg.c:2037
-#, fuzzy
+msgstr "సర్వర్ కు మిత్రుల జాబితాను అప్ లోడ్ చేయండి"
+
+#: ../libpurple/protocols/gg/gg.c:2058
 msgid "Download buddylist from Server"
-msgstr "సెర్వర్‌నుండి మిత్రుల లిస్టును తొలగించండి."
-
-#: ../libpurple/protocols/gg/gg.c:2041
-#, fuzzy
+msgstr "సర్వర్ నుంచి మిత్రుల జాబితాను డౌన్ లోడ్ చేయండి"
+
+#: ../libpurple/protocols/gg/gg.c:2062
 msgid "Delete buddylist from Server"
-msgstr "సెర్వర్‌నుండి మిత్రుల లిస్టును తొలగించండి."
-
-#  Buddy List
-#: ../libpurple/protocols/gg/gg.c:2045
-#, fuzzy
+msgstr "సర్వర్ నుంచి మిత్రుల జాబితాను తొలగించండి"
+
+#: ../libpurple/protocols/gg/gg.c:2066
 msgid "Save buddylist to file..."
-msgstr "మిత్రుల లిస్టును పంపుము. "
-
-#: ../libpurple/protocols/gg/gg.c:2049
-#, fuzzy
+msgstr "మిత్రుల జాబితాను ఫైలులో సేవ్ చేయండి..."
+
+#: ../libpurple/protocols/gg/gg.c:2070
 msgid "Load buddylist from file..."
-msgstr "సెర్వర్‌నుండి మిత్రుల లిస్టును దిగుమతి చేయండి."
-
+msgstr "ఫైలునుడి మిత్రుల జాబితాను లోడ్ చేయండి..."
+
+# magic
+# major_version
+# minor_version
+# plugin type
+# ui_requirement
+# flags
+# dependencies
+# priority
+# id
+# name
+# version
 #. magic
 #. major_version
 #. minor_version
@@ -4264,161 +4597,171 @@
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2153
+#: ../libpurple/protocols/gg/gg.c:2174
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu ప్రొటోకాల్ ప్లగ్‌ఇన్ "
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2154
+#: ../libpurple/protocols/gg/gg.c:2175
 msgid "Polish popular IM"
-msgstr ""
-
-#: ../libpurple/protocols/gg/gg.c:2208
-#, fuzzy
+msgstr "ప్రఖ్యాత IMకు మెరుగులు దిద్దండి"
+
+#: ../libpurple/protocols/gg/gg.c:2229
 msgid "Gadu-Gadu User"
-msgstr "Gadu-Gadu సెర్చ్ ఎంజిన్."
+msgstr "Gadu-Gadu వినియోగదారు"
 
 #: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1637
-#: ../libpurple/protocols/silc10/silc.c:1566
+#: ../libpurple/protocols/silc/silc.c:1780
+#: ../libpurple/protocols/silc10/silc.c:1569
 #, c-format
 msgid "Unknown command: %s"
 msgstr "అజ్ఞాత కమాండ్: %s"
 
 #: ../libpurple/protocols/irc/cmds.c:503
 #: ../libpurple/protocols/jabber/chat.c:591
-#: ../libpurple/protocols/silc/silc.c:1345
-#: ../libpurple/protocols/silc10/silc.c:1274
+#: ../libpurple/protocols/silc/silc.c:1488
+#: ../libpurple/protocols/silc10/silc.c:1277
 #, c-format
 msgid "current topic is: %s"
-msgstr "వర్తమాన విషయం: %s"
+msgstr "ప్రస్తుత విషయం: %s"
 
 #: ../libpurple/protocols/irc/cmds.c:507
 #: ../libpurple/protocols/jabber/chat.c:595
-#: ../libpurple/protocols/silc/silc.c:1349
-#: ../libpurple/protocols/silc10/silc.c:1278
+#: ../libpurple/protocols/silc/silc.c:1492
+#: ../libpurple/protocols/silc10/silc.c:1281
 msgid "No topic is set"
-msgstr "ఏ విషయమూ సెట్ చేయలేదు."
+msgstr "ఏ విషయాన్నీ సెట్ చేయలేదు"
 
 #: ../libpurple/protocols/irc/dcc_send.c:296
 #: ../libpurple/protocols/irc/dcc_send.c:337
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:269
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:278
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:287
-#, fuzzy
 msgid "File Transfer Failed"
-msgstr "ఫైల్ ట్రాన్స్‌ఫర్ కాన్సెల్ అయినది."
+msgstr "ఫైలు బదిలీలో వైఫల్యం"
 
 #: ../libpurple/protocols/irc/dcc_send.c:297
 #: ../libpurple/protocols/irc/dcc_send.c:338
-#, fuzzy
 msgid "Could not open a listening port."
-msgstr "వినే పోర్టును గెయిమ్ ఓపెన్ చేయలేదు."
+msgstr "లిజెనింగ్ పోర్టును ప్రారంభించలేదు."
 
 #: ../libpurple/protocols/irc/irc.c:79
 msgid "Error displaying MOTD"
-msgstr "MOTDని ప్రదర్శించడంలో పొరపాటు."
+msgstr "MOTDని ప్రదర్శించడంలో పొరపాటు"
 
 #: ../libpurple/protocols/irc/irc.c:79
 msgid "No MOTD available"
-msgstr "MOTD లభించుటలేదు."
+msgstr "MOTD అందుబాటులో లేదు"
 
 #: ../libpurple/protocols/irc/irc.c:80
 msgid "There is no MOTD associated with this connection."
-msgstr "ఈ కనెక్షన్‌తో MOTD అనుబంధమై లేదు."
+msgstr "ఈ కనెక్షన్‌తో MOTD అనుసంధానమై లేదు."
 
 #: ../libpurple/protocols/irc/irc.c:83
 #, c-format
 msgid "MOTD for %s"
 msgstr "%s కోసం MOTD "
 
-#: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
-#: ../libpurple/protocols/irc/irc.c:612 ../libpurple/protocols/irc/irc.c:637
-#: ../libpurple/protocols/myspace/myspace.c:2356
+#: ../libpurple/protocols/irc/irc.c:129
+#: ../libpurple/protocols/irc/irc.c:169
+#: ../libpurple/protocols/irc/irc.c:625
+#: ../libpurple/protocols/irc/irc.c:654
+#: ../libpurple/protocols/myspace/myspace.c:2378
 msgid "Server has disconnected"
-msgstr "సెర్వర్ డిస్‌కనెక్ట్ అయింది. "
-
-#: ../libpurple/protocols/irc/irc.c:249
+msgstr "సర్వర్ డిస్‌కనెక్ట్ అయింది"
+
+#: ../libpurple/protocols/irc/irc.c:253
 msgid "View MOTD"
-msgstr "MOTDని దర్శించండి."
+msgstr "MOTDని చూడండి"
 
 # #-#-#-#-#  anjuta.ANJUTA_1_2_0.hi.po (anjuta2 VERSION)  #-#-#-#-#
 # #-#-#-#-#  gnome-session.HEAD.hi.po (gnome-session VERSION)  #-#-#-#-#
 # gnome-session/session-properties.c:179
 #  Cancel button.
-#: ../libpurple/protocols/irc/irc.c:261 ../libpurple/protocols/silc/chat.c:33
+#: ../libpurple/protocols/irc/irc.c:265
+#: ../libpurple/protocols/silc/chat.c:33
 #: ../libpurple/protocols/silc10/chat.c:33
 msgid "_Channel:"
 msgstr "_చానల్:"
 
-#: ../libpurple/protocols/irc/irc.c:267
-#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:524
+#: ../libpurple/protocols/irc/irc.c:271
+#: ../libpurple/protocols/jabber/chat.c:59
+#: ../pidgin/gtkaccount.c:527
 msgid "_Password:"
 msgstr "_పాస్‌వర్డ్:"
 
-#: ../libpurple/protocols/irc/irc.c:298
+#: ../libpurple/protocols/irc/irc.c:304
 msgid "IRC nicks may not contain whitespace"
-msgstr "IRC ఉపనామములలో తెల్లకాళీ లేదు."
-
+msgstr "IRC నిక్స్ లో ఖాళీలేదు"
+
+# connect to the server
 #. 1. connect to server
 #. connect to the server
-#: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1280
-#: ../libpurple/protocols/msn/session.c:345
-#: ../libpurple/protocols/myspace/myspace.c:301
-#: ../libpurple/protocols/novell/novell.c:2182
-#: ../libpurple/protocols/oscar/oscar.c:1287
+#: ../libpurple/protocols/irc/irc.c:325
+#: ../libpurple/protocols/jabber/jabber.c:1311
+#: ../libpurple/protocols/msn/session.c:402
+#: ../libpurple/protocols/msnp9/session.c:355
+#: ../libpurple/protocols/myspace/myspace.c:302
+#: ../libpurple/protocols/novell/novell.c:2198
+#: ../libpurple/protocols/oscar/oscar.c:1290
 #: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3723
-#: ../libpurple/protocols/simple/simple.c:1716
-#: ../libpurple/protocols/yahoo/yahoo.c:2939
-#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:662
+#: ../libpurple/protocols/sametime/sametime.c:3768
+#: ../libpurple/protocols/simple/simple.c:1893
+#: ../libpurple/protocols/yahoo/yahoo.c:2948
+#: ../libpurple/protocols/zephyr/zephyr.c:1621
+#: ../pidgin/gtkstatusbox.c:662
 msgid "Connecting"
-msgstr "కనెక్ట్ చేస్తున్నది."
-
-#: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:610
-#: ../libpurple/protocols/jabber/jabber.c:1095
+msgstr "కనెక్ట్ చేస్తున్నది"
+
+#: ../libpurple/protocols/irc/irc.c:335
+#: ../libpurple/protocols/jabber/jabber.c:637
+#: ../libpurple/protocols/jabber/jabber.c:1126
 msgid "SSL support unavailable"
-msgstr "SSL సపోర్ట్ లభించలేదు."
-
-#. TODO: try other ports if in auto mode, then save
-#. * working port and try that first next time.
-#: ../libpurple/protocols/irc/irc.c:338
-#: ../libpurple/protocols/myspace/myspace.c:317
-#: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1631
+msgstr "SSL సహకారం లభించడంలేదు"
+
+#: ../libpurple/protocols/irc/irc.c:348
+#: ../libpurple/protocols/myspace/myspace.c:320
+#: ../libpurple/protocols/simple/simple.c:469
+#: ../libpurple/protocols/simple/simple.c:1803
 msgid "Couldn't create socket"
-msgstr "సాకెట్‌ను సృష్టించలేదు. "
-
-#: ../libpurple/protocols/irc/irc.c:421
-#: ../libpurple/protocols/myspace/myspace.c:2469
-#: ../libpurple/protocols/oscar/oscar.c:1283
+msgstr "సాకెట్‌ను సృష్టించలేదు"
+
+#: ../libpurple/protocols/irc/irc.c:430
+#: ../libpurple/protocols/oscar/oscar.c:1286
 msgid "Couldn't connect to host"
-msgstr "హోస్ట్‌కు కనెక్ట్ చేయలేదు."
-
-#: ../libpurple/protocols/irc/irc.c:609 ../libpurple/protocols/irc/irc.c:634
-#: ../libpurple/protocols/myspace/myspace.c:2352
+msgstr "హోస్ట్‌కు కనెక్ట్ చేయలేదు"
+
+#: ../libpurple/protocols/irc/irc.c:620
+#: ../libpurple/protocols/irc/irc.c:649
+#: ../libpurple/protocols/myspace/myspace.c:2372
 msgid "Read error"
-msgstr "చదువుటలో పొరపాటు. "
-
-#: ../libpurple/protocols/irc/irc.c:773
-#: ../libpurple/protocols/silc/chat.c:1412
+msgstr "రీడ్ చేయడంలో పొరపాటు"
+
+#: ../libpurple/protocols/irc/irc.c:790
+#: ../libpurple/protocols/silc/chat.c:1398
 #: ../libpurple/protocols/silc10/chat.c:1426
 #: ../libpurple/protocols/yahoo/yahoochat.c:1497
 msgid "Users"
 msgstr "వినియోగదారులు "
 
-#: ../libpurple/protocols/irc/irc.c:776
-#: ../libpurple/protocols/sametime/sametime.c:3374
-#: ../libpurple/protocols/silc/chat.c:1415
-#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/irc/irc.c:793
+#: ../libpurple/protocols/sametime/sametime.c:3416
+#: ../libpurple/protocols/silc/chat.c:1401
+#: ../libpurple/protocols/silc/ops.c:1393
 #: ../libpurple/protocols/silc10/chat.c:1429
 #: ../libpurple/protocols/silc10/ops.c:1382
 #: ../libpurple/protocols/yahoo/yahoochat.c:1506
 msgid "Topic"
 msgstr "విషయం "
 
+# *< type
+# *< ui_requirement
+# *< flags
+# *< dependencies
+# *< priority
+# *< id
+# *< name
+# *< version
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -4427,77 +4770,84 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:914
+#: ../libpurple/protocols/irc/irc.c:931
 msgid "IRC Protocol Plugin"
-msgstr "IRC ప్రొటోకాల్ ప్లగ్‌ఇన్. "
-
+msgstr "IRC ప్రోటోకాల్ ప్లగ్‌ఇన్"
+
+# *  summary
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:915
+#: ../libpurple/protocols/irc/irc.c:932
 msgid "The IRC Protocol Plugin that Sucks Less"
-msgstr " IRC ప్రొటోకాల్ ప్లగ్‌ఇన్ చాలా తక్కువగా Suck చేస్తుంది."
+msgstr "తక్కువగా Suck చేసే IRC  ప్రోటోకాల్ ప్లగ్‌ఇన్"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:940 ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2185
-#: ../libpurple/protocols/oscar/oscar.c:6671
-#: ../libpurple/protocols/qq/qq.c:755
-#: ../libpurple/protocols/sametime/sametime.c:5727
+#: ../libpurple/protocols/irc/irc.c:957
+#: ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/msn/msn.c:2335
+#: ../libpurple/protocols/msnp9/msn.c:2186
+#: ../libpurple/protocols/oscar/oscar.c:6721
+#: ../libpurple/protocols/qq/qq.c:756
+#: ../libpurple/protocols/sametime/sametime.c:5773
 #: ../libpurple/protocols/silc/ops.c:1249
-#: ../libpurple/protocols/silc/ops.c:1341
+#: ../libpurple/protocols/silc/ops.c:1343
 #: ../libpurple/protocols/silc10/ops.c:1244
 #: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1896
+#: ../libpurple/protocols/simple/simple.c:2083
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
-msgstr "సెర్వర్ "
-
+msgstr "సర్వర్ "
+
+# Creating the options for the protocol
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2190
-#: ../libpurple/protocols/oscar/oscar.c:6674
-#: ../libpurple/protocols/qq/qq.c:758
-#: ../libpurple/protocols/sametime/sametime.c:5732
-#: ../libpurple/protocols/silc/silc.c:1918
-#: ../libpurple/protocols/silc10/silc.c:1861
+#: ../libpurple/protocols/irc/irc.c:960
+#: ../libpurple/protocols/msn/msn.c:2340
+#: ../libpurple/protocols/msnp9/msn.c:2191
+#: ../libpurple/protocols/oscar/oscar.c:6724
+#: ../libpurple/protocols/qq/qq.c:759
+#: ../libpurple/protocols/sametime/sametime.c:5778
+#: ../libpurple/protocols/silc/silc.c:2061
+#: ../libpurple/protocols/silc10/silc.c:1864
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "పోర్ట్ "
 
-#: ../libpurple/protocols/irc/irc.c:946
+#: ../libpurple/protocols/irc/irc.c:963
 msgid "Encodings"
 msgstr "ఎన్‌కోడింగులు "
 
-#: ../libpurple/protocols/irc/irc.c:949 ../libpurple/protocols/irc/msgs.c:316
-#: ../libpurple/protocols/jabber/jabber.c:904
-#: ../libpurple/protocols/jabber/jabber.c:907
-#: ../libpurple/protocols/silc/buddy.c:1539
+#: ../libpurple/protocols/irc/irc.c:966
+#: ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/jabber/jabber.c:931
+#: ../libpurple/protocols/jabber/jabber.c:934
+#: ../libpurple/protocols/silc/buddy.c:1542
 #: ../libpurple/protocols/silc/ops.c:1197
 #: ../libpurple/protocols/silc/ops.c:1200
-#: ../libpurple/protocols/silc/ops.c:1334
-#: ../libpurple/protocols/silc/ops.c:1337
-#: ../libpurple/protocols/silc/silc.c:1005
-#: ../libpurple/protocols/silc10/buddy.c:1539
+#: ../libpurple/protocols/silc/ops.c:1336
+#: ../libpurple/protocols/silc/ops.c:1339
+#: ../libpurple/protocols/silc/silc.c:1148
+#: ../libpurple/protocols/silc10/buddy.c:1542
 #: ../libpurple/protocols/silc10/ops.c:1191
 #: ../libpurple/protocols/silc10/ops.c:1194
 #: ../libpurple/protocols/silc10/ops.c:1340
 #: ../libpurple/protocols/silc10/ops.c:1343
 #: ../libpurple/protocols/silc10/silc.c:916
 msgid "Username"
-msgstr "వినియోగదారుని పేరు "
-
-#: ../libpurple/protocols/irc/irc.c:952 ../libpurple/protocols/irc/msgs.c:317
-#: ../libpurple/protocols/silc/silc.c:1009
+msgstr "వినియోగదారు పేరు "
+
+#: ../libpurple/protocols/irc/irc.c:969
+#: ../libpurple/protocols/irc/msgs.c:317
+#: ../libpurple/protocols/silc/silc.c:1152
 #: ../libpurple/protocols/silc10/silc.c:920
 msgid "Real name"
-msgstr "నిజమైన పేరు "
+msgstr "అసలు పేరు "
 
 #.
 #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libpurple/protocols/irc/irc.c:960
-#, fuzzy
+#: ../libpurple/protocols/irc/irc.c:977
 msgid "Use SSL"
-msgstr "SSL"
+msgstr "SSL ను ఉపయోగించండి"
 
 #: ../libpurple/protocols/irc/msgs.c:187
 msgid "Bad mode"
@@ -4506,16 +4856,16 @@
 #: ../libpurple/protocols/irc/msgs.c:198
 #, c-format
 msgid "You are banned from %s."
-msgstr "%s నుండి మిమ్మల్ని నిషేధించారు."
+msgstr "%s నుంచి మిమ్మల్ని నిషేధించారు."
 
 #: ../libpurple/protocols/irc/msgs.c:199
 msgid "Banned"
-msgstr "నిషేధించారు."
+msgstr "నిషిద్ధం"
 
 #: ../libpurple/protocols/irc/msgs.c:216
 #, c-format
 msgid "Cannot ban %s: banlist is full"
-msgstr "%sను నిషేధించలేము: నిషేధితుల లిస్టు నిండినది."
+msgstr "నిషిద్ధ జాబితా నిండినది.%s నిషేధం సాధ్యపడదు"
 
 #: ../libpurple/protocols/irc/msgs.c:301
 msgid " <i>(ircop)</i>"
@@ -4523,53 +4873,51 @@
 
 #: ../libpurple/protocols/irc/msgs.c:302
 msgid " <i>(identified)</i>"
-msgstr " <i>(గుర్తింపబడినది)</i>"
+msgstr " <i>(గుర్తించనైనది)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3700
-#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/oscar/oscar.c:3710
+#: ../libpurple/protocols/silc/ops.c:1422
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
-msgstr "ఉప నామము "
+msgstr "నిక్  "
 
 #: ../libpurple/protocols/irc/msgs.c:329
 #: ../libpurple/protocols/silc/ops.c:1268
 #: ../libpurple/protocols/silc10/ops.c:1272
 msgid "Currently on"
-msgstr "ప్రస్తుతం ఆన్‌లో ఉన్నది."
+msgstr "ప్రస్తుతం ఆన్‌లో ఉన్నది"
 
 #: ../libpurple/protocols/irc/msgs.c:334
-#, fuzzy
 msgid "Idle for"
-msgstr "बेकार"
+msgstr "ఖాళీగా ఉన్న కారణం"
 
 #: ../libpurple/protocols/irc/msgs.c:337
 msgid "Online since"
-msgstr "నుండి ఆన్‌లైన్ "
+msgstr "నుంచి ఆన్‌లైన్ లో నున్నది"
 
 #: ../libpurple/protocols/irc/msgs.c:341
-#, fuzzy
 msgid "<b>Defining adjective:</b>"
-msgstr "<br><b>విశేషణమును నిర్వచిస్తున్నాము:</b> ప్రశంసనీయ<br>"
+msgstr "<b>విశేషణాన్ని నిర్వచించు:</b>"
 
 #: ../libpurple/protocols/irc/msgs.c:341
 msgid "Glorious"
-msgstr ""
+msgstr "Glorious"
 
 #: ../libpurple/protocols/irc/msgs.c:420
 #, c-format
 msgid "%s has changed the topic to: %s"
-msgstr "%s విషయాన్ని %sకు మార్చాడు "
+msgstr "%s విషయాన్ని %sకు మార్చడం జరిగింది"
 
 #: ../libpurple/protocols/irc/msgs.c:422
-#, fuzzy, c-format
+#, c-format
 msgid "%s has cleared the topic."
-msgstr "%s విషయాన్ని %sకు మార్చాడు "
+msgstr "%s తన విషయాన్ని క్లియర్ చేశారు."
 
 #: ../libpurple/protocols/irc/msgs.c:430
 #, c-format
 msgid "The topic for %s is: %s"
-msgstr "The topic for %s is: %s"
+msgstr " %s కు విషయం: %s"
 
 #: ../libpurple/protocols/irc/msgs.c:448
 #, c-format
@@ -4579,15 +4927,13 @@
 # #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
 # gnome-session/gsm-client-row.c:43
 # #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
-# gnome-session/gsm-client-row.c:43
 #: ../libpurple/protocols/irc/msgs.c:449
 msgid "Unknown message"
 msgstr "అజ్ఞాత సందేశం"
 
 #: ../libpurple/protocols/irc/msgs.c:449
-#, fuzzy
 msgid "The IRC server received a message it did not understand."
-msgstr "గెయిమ్ పంపిన సందేశాన్ని  IRC సెర్వర్ అర్థంచేసుకోలేక పోయినది."
+msgstr "IRC సర్వర్ అందుకున్న ఒక సందేశాన్ని అర్ధం చేసుకోలేదు."
 
 #: ../libpurple/protocols/irc/msgs.c:470
 #, c-format
@@ -4596,345 +4942,272 @@
 
 #: ../libpurple/protocols/irc/msgs.c:575
 msgid "Time Response"
-msgstr "సమయం విషయంలో బాధ్యత. "
+msgstr "సమయ స్పందన"
 
 #: ../libpurple/protocols/irc/msgs.c:576
 msgid "The IRC server's local time is:"
-msgstr "IRC సెర్వర్ స్థానిక సమయం:"
+msgstr "IRC సర్వర్ స్థానిక సమయం:"
 
 #: ../libpurple/protocols/irc/msgs.c:587
 msgid "No such channel"
-msgstr "అలాంటి చానల్ లేదు."
-
+msgstr "అలాంటి చానల్ లేదు"
+
+# does this happen?
 #. does this happen?
 #: ../libpurple/protocols/irc/msgs.c:598
 msgid "no such channel"
-msgstr "అలాంటి చానల్ లేదు."
+msgstr "అలాంటి చానల్ లేదు"
 
 #: ../libpurple/protocols/irc/msgs.c:601
 msgid "User is not logged in"
-msgstr "వినియోగదారుడు లాగ్‌ఇన్ చేయలేదు."
+msgstr "వినియోగదారు లాగ్‌ఇన్ చేయలేదు"
 
 #: ../libpurple/protocols/irc/msgs.c:606
 msgid "No such nick or channel"
-msgstr "అలాంటి చానల్‌గానీ లేక ఉపనామంగానీ లేదు."
+msgstr "అలాంటి నిక్ కాని చానల్‌ కానీ  లేదు"
 
 #: ../libpurple/protocols/irc/msgs.c:626
 msgid "Could not send"
-msgstr "పంపలేకపోయింది."
+msgstr "పంపడం సాధ్యంకాలేదు"
 
 #: ../libpurple/protocols/irc/msgs.c:682
 #, c-format
 msgid "Joining %s requires an invitation."
-msgstr "%s లోకి పోవుటకు ఆహ్వానం అవసరం."
+msgstr "%s తో కలవడానికి ఆహ్వానం అవసరం."
 
 #: ../libpurple/protocols/irc/msgs.c:683
 msgid "Invitation only"
-msgstr "ఆహ్వానం మాత్రమే."
-
-#: ../libpurple/protocols/irc/msgs.c:795
+msgstr "ఆహ్వానం మాత్రమే"
+
+#: ../libpurple/protocols/irc/msgs.c:798
 #, c-format
 msgid "You have been kicked by %s: (%s)"
-msgstr "మిమ్మల్ని %s: (%s) వారు తన్నారు."
+msgstr " %s: (%s)  ద్వారా మీరు కిక్ చేయబడ్డారు"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:800 ../libpurple/protocols/silc/ops.c:699
+#: ../libpurple/protocols/irc/msgs.c:803
+#: ../libpurple/protocols/silc/ops.c:699
 #: ../libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
-msgstr "%s (%s) తన్నారు."
-
-#: ../libpurple/protocols/irc/msgs.c:823
+msgstr "%s (%s) ద్వారా కిక్ చేయబడ్డారు"
+
+#: ../libpurple/protocols/irc/msgs.c:826
 #, c-format
 msgid "mode (%s %s) by %s"
-msgstr "మోడ్ (%s %s) ద్వారా %s"
-
-#: ../libpurple/protocols/irc/msgs.c:908 ../libpurple/protocols/irc/msgs.c:909
+msgstr "%s ద్వారా మోడ్ (%s %s)"
+
+#: ../libpurple/protocols/irc/msgs.c:911
+#: ../libpurple/protocols/irc/msgs.c:912
 msgid "Invalid nickname"
-msgstr "విలువలేని ఉపనామం."
-
-#: ../libpurple/protocols/irc/msgs.c:910
-#, fuzzy
-msgid ""
-"Your selected nickname was rejected by the server.  It probably contains "
-"invalid characters."
-msgstr ""
-"మీరు సెలక్ట్ చేసుకున్న పేరును సెర్వర్ నిరాకరించింది. బహుశా అందులో విలువలేని అక్షరాలుండవచ్చును. "
-
-#: ../libpurple/protocols/irc/msgs.c:915
-msgid ""
-"Your selected account name was rejected by the server.  It probably contains "
-"invalid characters."
-msgstr ""
-"మీరు సెలక్ట్ చేసుకున్న పేరును సెర్వర్ నిరాకరించింది. బహుశా అందులో విలువలేని అక్షరాలుండవచ్చును. "
-
-#: ../libpurple/protocols/irc/msgs.c:954
+msgstr "చెల్లని నిక్ నేమ్"
+
+#: ../libpurple/protocols/irc/msgs.c:913
+msgid "Your selected nickname was rejected by the server.  It probably contains invalid characters."
+msgstr "మీరు ఎంచుకున్న నిక్ నేమ్ ను సర్వర్ నిరాకరించింది. బహుశా అందులో చెల్లని అక్షరాలుండవచ్చును. "
+
+#: ../libpurple/protocols/irc/msgs.c:918
+msgid "Your selected account name was rejected by the server.  It probably contains invalid characters."
+msgstr "మీరు ఎంపిక చేసినఅకౌంటు నేమ్ ను సర్వర్ నిరాకరించింది. బహుశా అందులో చెల్లని అక్షరాలుండవచ్చును. "
+
+#: ../libpurple/protocols/irc/msgs.c:957
 msgid "Cannot change nick"
-msgstr "ఉపనామమును మార్చలేము."
-
-#: ../libpurple/protocols/irc/msgs.c:954
+msgstr "నిక్ ను మార్చజాలదు"
+
+#: ../libpurple/protocols/irc/msgs.c:957
 msgid "Could not change nick"
-msgstr "ఉపనామమును మార్చలేకపోయాము."
-
-#: ../libpurple/protocols/irc/msgs.c:975
+msgstr "నిక్ ను మార్చలేదు"
+
+#: ../libpurple/protocols/irc/msgs.c:978
 #, c-format
 msgid "You have parted the channel%s%s"
-msgstr "మీరు చానల్‌ను వదిలేశారు%s%s"
-
-#: ../libpurple/protocols/irc/msgs.c:1017
+msgstr "మీరు చానల్‌ %s%s లో భాగమయ్యారు"
+
+#: ../libpurple/protocols/irc/msgs.c:1020
 msgid "Error: invalid PONG from server"
-msgstr "పొరపాటు: సెర్వర్‌నుండి విలువలేని పాంగ్."
-
-#: ../libpurple/protocols/irc/msgs.c:1019
+msgstr "పొరపాటు:సర్వర్‌నుంచి చెల్లని PONG"
+
+#: ../libpurple/protocols/irc/msgs.c:1022
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
-msgstr "పింగ్ సమాధానం -- Lag: %lu सेकेंड"
-
-#: ../libpurple/protocols/irc/msgs.c:1110
-#, fuzzy, c-format
+msgstr "PING సమాధానం -- Lag: %lu సెకండ్లు"
+
+#: ../libpurple/protocols/irc/msgs.c:1113
+#, c-format
 msgid "Cannot join %s: Registration is required."
-msgstr "రెజిస్ట్రేషన్ అవసరం. "
-
-#: ../libpurple/protocols/irc/msgs.c:1111
+msgstr "నమోదు అవసరం"
+
+#: ../libpurple/protocols/irc/msgs.c:1114
 #: ../libpurple/protocols/silc/ops.c:1093
 #: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
-msgstr "చానల్‌లో చేరలేను."
-
-#: ../libpurple/protocols/irc/msgs.c:1145
-#, fuzzy
+msgstr "చానల్‌ ను చేరజాలదు"
+
+#: ../libpurple/protocols/irc/msgs.c:1148
 msgid "Nick or channel is temporarily unavailable."
-msgstr "సర్వీస్ తాత్కాలికంగా అలభ్యం. "
-
-#: ../libpurple/protocols/irc/msgs.c:1157
+msgstr "నిక్ లేదా చానల్ తాత్కాలికంగా అందుబాటులో లేదు."
+
+#: ../libpurple/protocols/irc/msgs.c:1160
 #, c-format
 msgid "Wallops from %s"
-msgstr "%s నుండి చావబాదుడు."
+msgstr "%s నుంచి Wallops"
 
 #: ../libpurple/protocols/irc/parse.c:122
 msgid "action &lt;action to perform&gt;:  Perform an action."
-msgstr "చర్య &lt;నెరవేర్చవలసిన పని&gt;: పనిని నెరవేర్చు."
+msgstr "action &lt;action to perform&gt;:  చర్యతీసుకోండి.  "
 
 #: ../libpurple/protocols/irc/parse.c:123
-msgid ""
-"away [message]:  Set an away message, or use no message to return from being "
-"away."
+msgid "away [message]:  Set an away message, or use no message to return from being away."
 msgstr "దూరపు [సందేశం]: దూరపు సందేశాన్ని సెట్ చేయండి. లేదా దూరంగా ఉండడంచేత ఏ సందేశాన్నీ ఇవ్వకండి."
 
 #: ../libpurple/protocols/irc/parse.c:124
-#, fuzzy
 msgid "chanserv: Send a command to chanserv"
-msgstr "quote [...]: సెర్వర్‌కు raw command పంపండి."
+msgstr "చాన్ సర్వ్: చాన్ సర్వ్ కు ఓ కమాండ్ ను పంపండి"
 
 #: ../libpurple/protocols/irc/parse.c:125
-msgid ""
-"deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
-"someone. You must be a channel operator to do this."
-msgstr ""
-"deop &lt;ఉపనామం&gt; [ఉపనామం2] ...: ఒకరి చానల్ ఆపరేటర్ స్టాటస్‌ను రద్దుచేయండి. ఇలా చేయాలంటే మీరు "
-"విధిగా చానల్ ఆపరేటరై ఉండాలి."
+msgid "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from someone. You must be a channel operator to do this."
+msgstr "deop &lt;nick1&gt; [nick2] ...:  ఒకరి వద్ద నుంచి చానల్ ఆపరేటర్ స్థాయిని తొలగించండి. ఇలా చేయాలంటే మీరు విధిగా చానల్ ఆపరేటరై ఉండాలి."
 
 #: ../libpurple/protocols/irc/parse.c:126
-msgid ""
-"devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
-"someone, preventing them from speaking if the channel is moderated (+m). You "
-"must be a channel operator to do this."
-msgstr ""
-"devoice &lt;ఉపనామం1&gt; [ఉపనామం2] ...:  చానల్ మోడరేట్ అయివుంటే (+m) ఒకరినుండి చానల్ వాయిస్ "
-"స్టాటస్‌ను తొలగించి వారిని మాట్లాడకుండా చేయండి. ఇలా  చేయాలంటే మీరు విధిగా చానల్ ఆపరేటరై ఉండాలి."
+msgid "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from someone, preventing them from speaking if the channel is moderated (+m). You must be a channel operator to do this."
+msgstr "devoice &lt;nick1&gt; [nick2] ...:  చానల్ మోడరేట్ (+m)అయిఉన్నప్పుడు మాట్లాడకుండా నిరోధించడానికి ఒకరివద్ద నుంచి చానల్ వాయిస్ స్థాయిని తొలగించండి. అందుకోసం మీరు విధిగా చానల్ అపరేటర్ అయిఉండాలి.   "
 
 #: ../libpurple/protocols/irc/parse.c:127
-msgid ""
-"invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
-"channel, or the current channel."
-msgstr ""
-"అహ్వానం &lt;ఉపనామం&gt; [గది]: మీ నిర్దిష్ట చానల్‌కు గానీ, వర్తమాన చానల్‌కుగానీ రమ్మని ఒకరిని ఆహ్వానించండి."
+msgid "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified channel, or the current channel."
+msgstr "invite &lt;nick&gt; [room]: నిర్దిష్ట చానల్‌లో లేదా ప్రస్తుత చానల్ లో మీతో కలవడానికి ఒకరిని   ఆహ్వానించండి."
 
 #: ../libpurple/protocols/irc/parse.c:128
-msgid ""
-"j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
-"channels, optionally providing a channel key for each if needed."
-msgstr ""
-"j &lt;గది1&gt;[,గది2][,...] [key1[,key2][,...]]:  ఒకటి లేక రెండు చానల్స్‌ను ఆప్షన్స్‌గా "
-"ప్రతి చానల్‌కూ ఒక కీ గూడా ఇచ్చి ఎంటర్ చేయండి. "
+msgid "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more channels, optionally providing a channel key for each if needed."
+msgstr "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]: అవసరమైతే ఒక్కొక్కరికి ఒక్కో చానల్ కి అందజేయడానికి వీలుగా ఒకటి లేదా అంతకుమించి చానల్ లను ఎంటర్ చేయండి."
 
 #: ../libpurple/protocols/irc/parse.c:129
-msgid ""
-"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
-"channels, optionally providing a channel key for each if needed."
-msgstr ""
-"join &lt;గది1&gt;[,గది2][,...] [కీ1[,కీ2][,...]]:  ఒకటి లేక రెండు చానల్స్‌ను, అవసరమైతే "
-"ఆప్షన్స్‌గా ప్రతి చానల్‌కూ ఒక కీ గూడా ఇచ్చి ఎంటర్ చేయండి. "
+msgid "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more channels, optionally providing a channel key for each if needed."
+msgstr "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]: అవసరమైతే ఒక్కొక్కరికి ఒక్కో చానల్ కి అందజేయడానికి వీలుగా ఒకటి లేదా అంతకుమించి చానల్ లను ఎంటర్ చేయండి."
 
 #: ../libpurple/protocols/irc/parse.c:130
-msgid ""
-"kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
-"channel operator to do this."
-msgstr ""
-"kick &lt;ఉపనామం&gt; [సందేశం]: ఎవరినైనా చానల్‌నుండి తీసేయండి. ఇలా చేయడానికి మీరు చానల్ ఆపరేటరై "
-"ఉండితీరాలి. "
+msgid "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a channel operator to do this."
+msgstr "kick &lt;nick&gt; [message]:  ఎవరినైనా చానల్‌నుంచి తొలగించండి. ఇలా చేయాలంటే మీరు విధిగా చానల్ ఆపరేటరై ఉండాలి. "
 
 #: ../libpurple/protocols/irc/parse.c:131
-msgid ""
-"list:  Display a list of chat rooms on the network. <i>Warning, some servers "
-"may disconnect you upon doing this.</i>"
-msgstr ""
-"లిస్ట్: నెట్‌వర్క్‌లో సంభాషణల గదులను ప్రదర్శించును. <i>హెచ్చరిక: ఇలా చేస్తే కొన్ని సెర్వర్లు మిమ్మల్ని "
-"డిస్‌కనెక్ట్ చేయవచ్చు.</i>"
+msgid "list:  Display a list of chat rooms on the network. <i>Warning, some servers may disconnect you upon doing this.</i>"
+msgstr "జాబితా: నెట్‌వర్క్‌లో సంభాషణల రూమ్ లను చూపుము. <i>హెచ్చరిక: ఇలా చేసినప్పుడు కొన్ని సర్వర్లు మిమ్మల్ని డిస్‌కనెక్ట్ చేయవచ్చు.</i>"
 
 #: ../libpurple/protocols/irc/parse.c:132
 msgid "me &lt;action to perform&gt;:  Perform an action."
-msgstr "me &lt;నెరవేర్చవలసిన పని&gt;: ఒక పనిని చేయుము."
+msgstr "me &lt;action to perform&gt;: చర్య తీసుకోండి."
 
 #: ../libpurple/protocols/irc/parse.c:133
-#, fuzzy
 msgid "memoserv: Send a command to memoserv"
-msgstr "quote [...]: సెర్వర్‌కు raw command పంపండి."
+msgstr "మెమ్ సర్వ్: మెమ్ సర్వ్ కు ఓ కమాండ్ ను పంపండి"
 
 #: ../libpurple/protocols/irc/parse.c:134
-msgid ""
-"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
-"or user mode."
-msgstr ""
-"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;ఉపనామం|చానల్&gt;:  చానల్‌నుగానీ లేక వినియోగదారుని మోడ్‌ను "
-"గానీ సెట్ చేయండి, లేదా అన్‌సెట్ చేయండి."
+msgid "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel or user mode."
+msgstr "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  చానల్‌ను లేదా వినియోగదారు మోడ్‌ను  సెట్ చేయండి, లేదా అన్‌సెట్ చేయండి."
 
 #: ../libpurple/protocols/irc/parse.c:135
-msgid ""
-"msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
-"opposed to a channel)."
-msgstr ""
-"msg &lt;ఉపనామం&gt; &lt;సందేశం&gt;: వినియోగదారునికి (చానల్‌ను వ్యతిరేకించినట్లు) ప్రైవేట్ సందేశం "
-"పంపండి. "
+msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as opposed to a channel)."
+msgstr "msg &lt;nick&gt; &lt;message&gt;: వినియోగదారుకు (చానల్‌ను వ్యతిరేకించినట్లు) ప్రైవేట్ సందేశం పంపండి. "
 
 #: ../libpurple/protocols/irc/parse.c:136
 msgid "names [channel]:  List the users currently in a channel."
-msgstr "పేర్లు [చానల్]:  చానల్‌లో ఉన్న వర్తమాన వినియోగదారుల లిస్టును ఇమ్ము."
+msgstr "పేర్లు [చానల్]: ప్రస్తుతం చానల్‌లో ఉన్న  వినియోగదారుల జాబితాను చూపు."
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:2261
+#: ../libpurple/protocols/jabber/jabber.c:2321
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
-msgstr "nick &lt;కొత్త ఉపనామం&gt;:  మీ ఉపనామం మార్చండి."
+msgstr "nick &lt;new nickname&gt;:    మీ ముద్దు పేరును మార్చండి."
 
 #: ../libpurple/protocols/irc/parse.c:138
-#, fuzzy
 msgid "nickserv: Send a command to nickserv"
-msgstr "quote [...]: సెర్వర్‌కు raw command పంపండి."
+msgstr "నిక్ సర్వ్: నిక్ సర్వ్ కు ఓ కమాండ్ ను పంపండి"
 
 #: ../libpurple/protocols/irc/parse.c:139
-msgid ""
-"op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
-"must be a channel operator to do this."
-msgstr ""
-"op &lt;ఉపనామం1&gt; [ఉపనామం2] ...:  ఎవరికన్నా చానల్ ఆపరేటర్ పదవి నివ్వండి. ఇలా చేయడానికి మీరు "
-"విధిగా చానల్ ఆపరేటరై ఉండాలి. "
+msgid "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You must be a channel operator to do this."
+msgstr "op &lt;nick1&gt; [nick2] ...:  ఎవరికన్నా చానల్ ఆపరేటర్ స్థాయి కల్పించండి. ఇలా చేయడానికి మీరు విధిగా చానల్ ఆపరేటరై ఉండాలి. "
 
 #: ../libpurple/protocols/irc/parse.c:140
-msgid ""
-"operwall &lt;message&gt;:  If you don't know what this is, you probably "
-"can't use it."
-msgstr "operwall &lt;సందేశం&gt;: ఇదేమిటో మీకు తెలియకపోతే, బహుశా మీరు దీన్ని  వాడలేరు."
+msgid "operwall &lt;message&gt;:  If you don't know what this is, you probably can't use it."
+msgstr "operwall &lt;message&gt;: ఇదేమిటో మీకు తెలియకపోతే, బహుశా మీరు దీన్ని  వాడలేరు."
 
 #: ../libpurple/protocols/irc/parse.c:141
-#, fuzzy
 msgid "operserv: Send a command to operserv"
-msgstr "quote [...]: సెర్వర్‌కు raw command పంపండి."
+msgstr "ఆపర్ సర్వ్: ఆపర్ సర్వ్ కు ఓ కమాండ్ ను పంపండి"
 
 #: ../libpurple/protocols/irc/parse.c:142
-msgid ""
-"part [room] [message]:  Leave the current channel, or a specified channel, "
-"with an optional message."
-msgstr ""
-"part [గది] [సందేశం]: వర్తమాన చానల్‌నుగానీ, లేక్ నిర్దేశించిన చానల్‌నుగానీ ఒక ఆప్షనల్ సందేశం ఇచ్చి మరీ "
-"వదిలిపెట్టుము."
+msgid "part [room] [message]:  Leave the current channel, or a specified channel, with an optional message."
+msgstr "part [రూమ్] [సందేశం]:ఐఛ్చిక సందేశంతో ప్రస్తుత చానల్‌ను, లేదా నిర్దిష్ట చానల్‌ను  వదిలి పెట్టండి."
 
 #: ../libpurple/protocols/irc/parse.c:143
-msgid ""
-"ping [nick]:  Asks how much lag a user (or the server if no user specified) "
-"has."
-msgstr ""
-"పింగ్ [ఉపనామం]: వినియోగాదారునికి ఎంత లాగ్ ఉందో అడుగుతోంది. (వినియోగదారుని పేరును చెప్పనిచో సెర్వర్‌ను "
-"అడుగుతుంది)."
+msgid "ping [nick]:  Asks how much lag a user (or the server if no user specified) has."
+msgstr "పింగ్ [ముద్దు పేరు]: వినియోగాదారుకు (లేదా వినియోగదారు ఎవరో నిర్ధిష్టంగా తెలియనప్పుడు  సర్వర్‌కు) ఎంతలాగ్ ఉందో అడుగుతోంది."
 
 #: ../libpurple/protocols/irc/parse.c:144
-msgid ""
-"query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
-"opposed to a channel)."
-msgstr ""
-"query &lt;ఉపనామం&gt; &lt;సందేశం&gt;:  వినియోగదారునికి ప్రైవేట్ సందేశమును పంపుము (చానల్‌ను "
-"వ్యతిరేకించి)."
+msgid "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as opposed to a channel)."
+msgstr "query &lt;nick&gt; &lt;message&gt;:  వినియోగదారుకు (చానల్‌ను వ్యతిరేకిస్తున్నట్టు) ప్రైవేట్ సందేశాన్ని పంపండి."
 
 #: ../libpurple/protocols/irc/parse.c:145
 msgid "quit [message]:  Disconnect from the server, with an optional message."
-msgstr "quit [సందేశం]: సెర్వర్‌నుండి ఆప్షనల్ సందేశంతో డిస్‌కనెక్ట్ చేయండి."
+msgstr "quit [సందేశం]: ఐఛ్చిక సందేశంతో సర్వర్‌నుంచి డిస్‌కనెక్ట్ కండి."
 
 #: ../libpurple/protocols/irc/parse.c:146
 msgid "quote [...]:  Send a raw command to the server."
-msgstr "quote [...]: సెర్వర్‌కు raw command పంపండి."
+msgstr "quote [...]: సర్వర్‌కు raw command పంపండి."
 
 #: ../libpurple/protocols/irc/parse.c:147
-msgid ""
-"remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
-"channel operator to do this."
-msgstr ""
-"remove &lt;ఉపనామం&gt; [సందేశం]:  గదినుండి ఒకరిని తొలగించండి. ఇలా చేయడానికి మీరు విధిగా చానల్ "
-"ఆపరేటరై ఉండాలి. "
+msgid "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a channel operator to do this."
+msgstr "remove &lt;nick&gt; [message]:    రూమ్ నుంచి ఒకరిని తొలగించండి. ఇలా చేయడానికి మీరు విధిగా చానల్ ఆపరేటరై ఉండాలి. "
 
 #: ../libpurple/protocols/irc/parse.c:148
 msgid "time: Displays the current local time at the IRC server."
-msgstr "సమయం: IRC సెర్వర్ లో స్థానిక సమయాన్ని ప్రదర్శిస్తుంది."
+msgstr "సమయం: IRC సర్వర్ లో స్థానిక సమయాన్ని చూపుతోంది."
 
 #: ../libpurple/protocols/irc/parse.c:149
 msgid "topic [new topic]:  View or change the channel topic."
-msgstr "topic [కొత్త విషయం]: చానల్ విషయాన్ని చూడండి లేక మార్పు చేయండి."
+msgstr "topic [కొత్త విషయం]: చానల్ విషయాన్ని చూడండి లేదా మార్చండి."
 
 #: ../libpurple/protocols/irc/parse.c:150
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
-msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  వినియోగదారుని మోడ్‌ను సెట్ చేయండి లేదా అన్‌సెట్ చేయండి. "
+msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  వినియోగదారు మోడ్‌ను సెట్ చేయండి లేదా అన్‌సెట్ చేయండి. "
 
 #: ../libpurple/protocols/irc/parse.c:151
 msgid "version [nick]: send CTCP VERSION request to a user"
-msgstr ""
+msgstr "వెర్షన్ [నిక్]: వినుయోగదారుకు CTCP VERSION నివేదనను పంపండి"
 
 #: ../libpurple/protocols/irc/parse.c:152
-msgid ""
-"voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
-"must be a channel operator to do this."
-msgstr ""
-"voice &lt;ఉపనామం1&gt; [ఉపనామం2] ...:  ఒకరికి చానల్ ధ్వనిని అనుమతించండి. ఇలా చేయడానికి మీరు "
-"విధిగా చానల్ ఆపరేటరై ఉండాలి. "
+msgid "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You must be a channel operator to do this."
+msgstr "voice &lt;nick1&gt; [nick2] ...:  ఒకరికి చానల్ వాయిస్ స్థాయి కల్పించండి. ఇలా చేయడానికి మీరు విధిగా చానల్ ఆపరేటరై ఉండాలి. "
 
 #: ../libpurple/protocols/irc/parse.c:153
-msgid ""
-"wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
-"use it."
-msgstr "wallops &lt;సందేశం&gt;:  ఇదేమిటో మీకు తెలియకపోతే, బహుశా దీన్ని మీ రుపయోగించలేరు."
+msgid "wallops &lt;message&gt;:  If you don't know what this is, you probably can't use it."
+msgstr "wallops &lt;message&gt;:  ఇదేమిటో మీకు తెలియకపోతే, బహుశా దీన్ని మీరు  ఉపయోగించలేరు."
 
 #: ../libpurple/protocols/irc/parse.c:154
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
-msgstr "whois [సెర్వర్] &lt;ఉపనామం&gt;:  వినియోగదారుని సమచారం సేకరించుము."
+msgstr "whois [server] &lt;nick&gt;: వినియోగదారుకు సంబంధించి సమచారం పొందండి."
 
 #: ../libpurple/protocols/irc/parse.c:155
 #, fuzzy
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
-msgstr "whois [సెర్వర్] &lt;ఉపనామం&gt;:  వినియోగదారుని సమచారం సేకరించుము."
-
-#: ../libpurple/protocols/irc/parse.c:465
+msgstr "whois [server] &lt;nick&gt;: వినియోగదారుకు సంబంధించి సమచారం పొందండి."
+
+#: ../libpurple/protocols/irc/parse.c:520
 #, c-format
 msgid "Reply time from %s: %lu seconds"
-msgstr " %s నుండి సమాధానం వచ్చు సమయం: %lu సెకండ్లు."
-
-#: ../libpurple/protocols/irc/parse.c:466
+msgstr " %s నుంచి సమాధానం వచ్చు సమయం: %lu సెకండ్లు."
+
+#: ../libpurple/protocols/irc/parse.c:521
 msgid "PONG"
 msgstr "పాంగ్ "
 
-#: ../libpurple/protocols/irc/parse.c:466
+#: ../libpurple/protocols/irc/parse.c:521
 msgid "CTCP PING reply"
 msgstr "CTCP PING సమాధానం "
 
-#: ../libpurple/protocols/irc/parse.c:577
-#: ../libpurple/protocols/irc/parse.c:581 ../libpurple/protocols/toc/toc.c:191
-#: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
+#: ../libpurple/protocols/irc/parse.c:633
+#: ../libpurple/protocols/irc/parse.c:640
+#: ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/toc/toc.c:694
+#: ../libpurple/protocols/toc/toc.c:710
 #: ../libpurple/protocols/toc/toc.c:786
 msgid "Disconnected."
 msgstr "డిస్‌కనెక్ట్ అయింది."
@@ -4942,86 +5215,79 @@
 # #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
 # gnome-session/gsm-client-row.c:43
 # #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
-# gnome-session/gsm-client-row.c:43
-#: ../libpurple/protocols/jabber/adhoccommands.c:137
-#: ../libpurple/protocols/jabber/jabber.c:671
-#: ../libpurple/protocols/jabber/jabber.c:701
-#: ../libpurple/protocols/jabber/jabber.c:1887
+#: ../libpurple/protocols/jabber/adhoccommands.c:143
+#: ../libpurple/protocols/jabber/jabber.c:698
+#: ../libpurple/protocols/jabber/jabber.c:728
+#: ../libpurple/protocols/jabber/jabber.c:1901
 msgid "Unknown Error"
-msgstr "అజ్ఞాత పొరపాటు. "
-
-#: ../libpurple/protocols/jabber/adhoccommands.c:139
-#: ../libpurple/protocols/jabber/adhoccommands.c:140
+msgstr "అజ్ఞాత పొరపాటు "
+
+#: ../libpurple/protocols/jabber/adhoccommands.c:145
+#: ../libpurple/protocols/jabber/adhoccommands.c:146
 #, fuzzy
 msgid "Ad-Hoc Command Failed"
-msgstr "కమాండ్ అశక్తమొనర్చబడినది."
-
-#: ../libpurple/protocols/jabber/adhoccommands.c:173
+msgstr "కమాండ్ పని చేయడం లేదు"
+
+#: ../libpurple/protocols/jabber/adhoccommands.c:182
 #, fuzzy
 msgid "execute"
-msgstr "ఆశించలేదు."
-
-#: ../libpurple/protocols/jabber/auth.c:53
+msgstr "ఆశించినది కాదు "
+
+#: ../libpurple/protocols/jabber/auth.c:55
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
-msgstr "లాగిన్ చేయాలంటే TLS/SSL అవసరం. TLS/SSL సపోర్ట్ కనిపించలేదు."
-
-#: ../libpurple/protocols/jabber/auth.c:116
+msgstr "లాగిన్ చేయాలంటే సర్వర్ కు TLS/SSL అవసరం. TLS/SSL సహకారం లభించలేదు. "
+
+#: ../libpurple/protocols/jabber/auth.c:120
 msgid "Server requires plaintext authentication over an unencrypted stream"
-msgstr "సెర్వర్‌కు సంకేతభాషకన్నా సరళమైన భాషతోకూడిన పదములు అవసరం."
-
-#: ../libpurple/protocols/jabber/auth.c:319
-#: ../libpurple/protocols/jabber/auth.c:508
-#, fuzzy, c-format
-msgid ""
-"%s requires plaintext authentication over an unencrypted connection.  Allow "
-"this and continue authentication?"
-msgstr "సెర్వర్‌కు సంకేత భాషకన్నా సాధారణ టెక్‌స్ట్ అవసరం. దీనికి అనుమతించి ప్రమాణీకరణను కొనసాగించమంటారా?"
-
-#: ../libpurple/protocols/jabber/auth.c:321
-#: ../libpurple/protocols/jabber/auth.c:322
-#: ../libpurple/protocols/jabber/auth.c:510
-#: ../libpurple/protocols/jabber/auth.c:511
-#: ../libpurple/protocols/jabber/auth.c:598
-#: ../libpurple/protocols/jabber/auth.c:599
+msgstr "సర్వర్‌కు సంకేతభాషకన్నా సరళమైన భాషతోకూడిన పదాలు అవసరం."
+
+#: ../libpurple/protocols/jabber/auth.c:323
+#: ../libpurple/protocols/jabber/auth.c:518
+#, c-format
+msgid "%s requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"
+msgstr "ఈ సర్వర్‌కు ఎన్ క్రిప్ట్ కాని కనెక్షన్ కన్నా సాధారణ టెక్స్ట్ ప్రమాణీకరణ అవసరం. దీనికి అనుమతించి ప్రమాణీకరణను కొనసాగించమంటారా?"
+
+#: ../libpurple/protocols/jabber/auth.c:325
+#: ../libpurple/protocols/jabber/auth.c:326
+#: ../libpurple/protocols/jabber/auth.c:520
+#: ../libpurple/protocols/jabber/auth.c:521
+#: ../libpurple/protocols/jabber/auth.c:614
+#: ../libpurple/protocols/jabber/auth.c:615
 msgid "Plaintext Authentication"
-msgstr "సాధారణ టెక్‌స్ట్ ప్రమాణీకరణ. "
-
-#: ../libpurple/protocols/jabber/auth.c:334
-#: ../libpurple/protocols/jabber/auth.c:523
-#: ../libpurple/protocols/jabber/auth.c:610
+msgstr "సాధారణ టెక్స్ట్ ప్రమాణీకరణ"
+
+#: ../libpurple/protocols/jabber/auth.c:340
+#: ../libpurple/protocols/jabber/auth.c:534
+#: ../libpurple/protocols/jabber/auth.c:627
 msgid "Server does not use any supported authentication method"
-msgstr " సెర్వర్ సపోర్టుతో కూడిన ఏ ప్రమాణీకరణను వాడడం లేదు."
-
-#. This should never happen!
-#: ../libpurple/protocols/jabber/auth.c:462
-#: ../libpurple/protocols/jabber/auth.c:561
-#: ../libpurple/protocols/jabber/auth.c:776
-#: ../libpurple/protocols/jabber/auth.c:917
-#: ../libpurple/protocols/jabber/auth.c:942
-#: ../libpurple/protocols/jabber/auth.c:961
-#: ../libpurple/protocols/jabber/jabber.c:123
+msgstr " సపోర్టు కలిగిన  ప్రమాణీకరణ  పద్ధతిని సర్వర్ వాడటం లేదు."
+
+#: ../libpurple/protocols/jabber/auth.c:472
+#: ../libpurple/protocols/jabber/auth.c:576
+#: ../libpurple/protocols/jabber/auth.c:795
+#: ../libpurple/protocols/jabber/auth.c:944
+#: ../libpurple/protocols/jabber/auth.c:971
+#: ../libpurple/protocols/jabber/auth.c:993
+#: ../libpurple/protocols/jabber/jabber.c:127
 msgid "Invalid response from server."
-msgstr "సెర్వర్‌నుండి విలువలేని బాధ్యత."
-
-#: ../libpurple/protocols/jabber/auth.c:600
-msgid ""
-"This server requires plaintext authentication over an unencrypted "
-"connection.  Allow this and continue authentication?"
-msgstr "సెర్వర్‌కు సంకేత భాషకన్నా సాధారణ టెక్‌స్ట్ అవసరం. దీనికి అనుమతించి ప్రమాణీకరణను కొనసాగించమంటారా?"
-
-#: ../libpurple/protocols/jabber/auth.c:797
-#: ../libpurple/protocols/jabber/auth.c:820
+msgstr "సర్వర్‌నుంచి చెల్లని ప్రతి స్పందన."
+
+#: ../libpurple/protocols/jabber/auth.c:616
+msgid "This server requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"
+msgstr "ఈ సర్వర్‌కు ఎన్ క్రిప్ట్ కాని కనెక్షన్ కన్నా సాధారణ టెక్స్ట్ ప్రమాణీకరణ అవసరం. దీనికి అనుమతించి ప్రమాణీకరణను కొనసాగించమంటారా?"
+
+#: ../libpurple/protocols/jabber/auth.c:818
+#: ../libpurple/protocols/jabber/auth.c:843
 msgid "Invalid challenge from server"
-msgstr "సెర్వర్‌నుండి విలువలేని సవాల్. "
-
-#: ../libpurple/protocols/jabber/auth.c:892
-#, fuzzy
+msgstr "సర్వర్‌నుంచి చెల్లని సవాలు "
+
+#: ../libpurple/protocols/jabber/auth.c:917
 msgid "SASL error"
-msgstr "చదువుటలో పొరపాటు. "
+msgstr "SASL పొరపాటు"
 
 #: ../libpurple/protocols/jabber/buddy.c:283
 #: ../libpurple/protocols/jabber/buddy.c:1219
-#: ../libpurple/protocols/sametime/sametime.c:4128
+#: ../libpurple/protocols/sametime/sametime.c:4174
 #: ../libpurple/protocols/silc/ops.c:986
 #: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
@@ -5040,7 +5306,7 @@
 msgstr "ఇచ్చిన పేరు "
 
 #: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/jabber.c:977
+#: ../libpurple/protocols/jabber/jabber.c:1004
 msgid "URL"
 msgstr "URL"
 
@@ -5057,12 +5323,12 @@
 #: ../libpurple/protocols/jabber/buddy.c:290
 #: ../libpurple/protocols/jabber/buddy.c:1285
 msgid "Locality"
-msgstr "నగరం "
+msgstr "ప్రదేశం "
 
 #: ../libpurple/protocols/jabber/buddy.c:291
 #: ../libpurple/protocols/jabber/buddy.c:1288
 msgid "Region"
-msgstr "రాష్ట్రం "
+msgstr "ప్రాంతం "
 
 #: ../libpurple/protocols/jabber/buddy.c:292
 #: ../libpurple/protocols/jabber/buddy.c:1291
@@ -5071,7 +5337,7 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:293
 #: ../libpurple/protocols/jabber/buddy.c:1295
-#: ../libpurple/protocols/silc/silc.c:1015
+#: ../libpurple/protocols/silc/silc.c:1158
 #: ../libpurple/protocols/silc10/silc.c:926
 msgid "Country"
 msgstr "దేశం "
@@ -5095,20 +5361,22 @@
 #: ../libpurple/protocols/jabber/buddy.c:299
 #: ../libpurple/protocols/jabber/buddy.c:1362
 msgid "Role"
-msgstr "కార్య భాగం "
+msgstr "చేస్తున్న పని "
 
 #: ../libpurple/protocols/jabber/buddy.c:300
 #: ../libpurple/protocols/jabber/buddy.c:1250
-#: ../libpurple/protocols/msn/msn.c:1658
-#: ../libpurple/protocols/oscar/oscar.c:3749
+#: ../libpurple/protocols/msn/msn.c:1806
+#: ../libpurple/protocols/msnp9/msn.c:1659
+#: ../libpurple/protocols/oscar/oscar.c:3759
 msgid "Birthday"
 msgstr "పుట్టినరోజు "
 
 #: ../libpurple/protocols/jabber/buddy.c:301
 #: ../libpurple/protocols/jabber/buddy.c:1365
 #: ../libpurple/protocols/jabber/chat.c:775
-#: ../libpurple/protocols/jabber/usermood.c:175 ../pidgin/gtkblist.c:3116
-#: ../pidgin/gtkprefs.c:739
+#: ../libpurple/protocols/jabber/usermood.c:193
+#: ../pidgin/gtkblist.c:3350
+#: ../pidgin/gtkprefs.c:740
 msgid "Description"
 msgstr "వివరణ"
 
@@ -5116,25 +5384,21 @@
 #: ../libpurple/protocols/jabber/buddy.c:723
 #, fuzzy
 msgid "Edit XMPP vCard"
-msgstr "జాబర్ కార్డ్‌ను ఎడిట్ చేయండి. "
+msgstr "జాబర్ vకార్డ్‌ను ఎడిట్ చేయండి"
 
 #: ../libpurple/protocols/jabber/buddy.c:724
-msgid ""
-"All items below are optional. Enter only the information with which you feel "
-"comfortable."
-msgstr "ఈ క్రింది హంశములన్నీ ఆప్షనల్. మీరు సంతృప్తికరమని భావించిన సమాచారాన్ని ఎంటర్ చేయండి. "
+msgid "All items below are optional. Enter only the information with which you feel comfortable."
+msgstr "ఈ కింది అంశములన్నీ ఐఛ్చికమైనవి. మీరు సంతృప్తికరమని భావించిన సమాచారాన్నే ఎంటర్ చేయండి. "
 
 #: ../libpurple/protocols/jabber/buddy.c:795
 #: ../libpurple/protocols/jabber/buddy.c:960
-#, fuzzy
 msgid "Client"
-msgstr "నగరం "
+msgstr "క్లైంటు"
 
 #: ../libpurple/protocols/jabber/buddy.c:799
 #: ../libpurple/protocols/jabber/buddy.c:964
-#, fuzzy
 msgid "Operating System"
-msgstr "ఆపరేటింగ్ సిస్టంను దాయండి."
+msgstr "ఆపరేటింగ్ సిస్టం"
 
 #: ../libpurple/protocols/jabber/buddy.c:815
 #: ../libpurple/protocols/jabber/buddy.c:975
@@ -5162,7 +5426,7 @@
 #: ../libpurple/protocols/jabber/buddy.c:983
 #, fuzzy
 msgid "Multi-User Chat"
-msgstr "కాలక్షేపరాయుని ఉపనామం "
+msgstr "చాట్ మారుపేరు"
 
 #: ../libpurple/protocols/jabber/buddy.c:825
 #: ../libpurple/protocols/jabber/buddy.c:985
@@ -5206,7 +5470,7 @@
 #: ../libpurple/protocols/jabber/buddy.c:999
 #, fuzzy
 msgid "In-Band Registration"
-msgstr "రిజిస్ట్రేషన్ పొరపాటు. "
+msgstr "నమోదులో పొరపాటు"
 
 #: ../libpurple/protocols/jabber/buddy.c:841
 #: ../libpurple/protocols/jabber/buddy.c:1001
@@ -5216,14 +5480,21 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:843
 #: ../libpurple/protocols/jabber/buddy.c:1003
+#, fuzzy
 msgid "User Avatar"
-msgstr ""
-
+msgstr "వినియోగదారు అన్వేషణ"
+
+# *< type
+# *< ui_requirement
+# *< flags
+# *< dependencies
+# *< priority
+# *< id
 #: ../libpurple/protocols/jabber/buddy.c:845
 #: ../libpurple/protocols/jabber/buddy.c:1005
 #, fuzzy
 msgid "Chat State Notifications"
-msgstr "బడ్డీ State Notification"
+msgstr "మిత్రుడి State Notification"
 
 #: ../libpurple/protocols/jabber/buddy.c:847
 #: ../libpurple/protocols/jabber/buddy.c:1007
@@ -5239,10 +5510,9 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:851
 #: ../libpurple/protocols/jabber/buddy.c:1011
-#: ../libpurple/protocols/sametime/sametime.c:3235
-#, fuzzy
+#: ../libpurple/protocols/sametime/sametime.c:3277
 msgid "File Transfer"
-msgstr "ఫైల్‌ ట్రాన్స్‌ఫర్స్ "
+msgstr "ఫైల్‌ బదిలీ"
 
 #: ../libpurple/protocols/jabber/buddy.c:853
 #: ../libpurple/protocols/jabber/buddy.c:1013
@@ -5271,7 +5541,7 @@
 #: ../libpurple/protocols/jabber/buddy.c:1021
 #, fuzzy
 msgid "User Tune"
-msgstr "వినియోగదారుని పేరు "
+msgstr "వినియోగదారు పేరు "
 
 #: ../libpurple/protocols/jabber/buddy.c:863
 #: ../libpurple/protocols/jabber/buddy.c:1023
@@ -5289,7 +5559,7 @@
 #: ../libpurple/protocols/jabber/buddy.c:1027
 #, fuzzy
 msgid "User Profile"
-msgstr "ప్రొఫైల్‌ను సెట్ చేయండి."
+msgstr "ప్రొఫైల్ "
 
 #: ../libpurple/protocols/jabber/buddy.c:869
 #: ../libpurple/protocols/jabber/buddy.c:1029
@@ -5306,7 +5576,7 @@
 #: ../libpurple/protocols/jabber/buddy.c:1033
 #, fuzzy
 msgid "User Nickname"
-msgstr "ఉపనామం "
+msgstr "వినియోగదారు పేరు "
 
 #: ../libpurple/protocols/jabber/buddy.c:875
 #: ../libpurple/protocols/jabber/buddy.c:1035
@@ -5338,7 +5608,7 @@
 #: ../libpurple/protocols/jabber/buddy.c:1045
 #, fuzzy
 msgid "Message Receipts"
-msgstr "సందేశం అందినది."
+msgstr "సందేశం అందినది"
 
 #: ../libpurple/protocols/jabber/buddy.c:887
 #: ../libpurple/protocols/jabber/buddy.c:1047
@@ -5346,6 +5616,7 @@
 msgid "Public Key Publishing"
 msgstr "పబ్లిక్ కీ బాబిల్ ప్రింట్ "
 
+# Build the user options frame.
 #: ../libpurple/protocols/jabber/buddy.c:889
 #: ../libpurple/protocols/jabber/buddy.c:1049
 #, fuzzy
@@ -5362,7 +5633,7 @@
 #: ../libpurple/protocols/jabber/buddy.c:1053
 #, fuzzy
 msgid "User Gaming"
-msgstr "వినియోగదారుని హద్దు "
+msgstr "వినియోగదారు పేరు "
 
 #: ../libpurple/protocols/jabber/buddy.c:895
 #: ../libpurple/protocols/jabber/buddy.c:1055
@@ -5372,8 +5643,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:897
 #: ../libpurple/protocols/jabber/buddy.c:1057
-#: ../libpurple/protocols/silc/ops.c:1596
-#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc/ops.c:1600
+#: ../libpurple/protocols/silc/ops.c:1605
 #: ../libpurple/protocols/silc10/ops.c:1612
 #: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping"
@@ -5422,36 +5693,35 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:921
 #: ../libpurple/protocols/jabber/buddy.c:1081
-#: ../libpurple/protocols/oscar/oscar.c:2906
+#: ../libpurple/protocols/oscar/oscar.c:2916
 msgid "Capabilities"
 msgstr "యోగ్యతలు "
 
 #: ../libpurple/protocols/jabber/buddy.c:933
-#: ../libpurple/protocols/jabber/libxmpp.c:206
+#: ../libpurple/protocols/jabber/libxmpp.c:209
 #: ../libpurple/protocols/jabber/si.c:859
 msgid "Resource"
-msgstr "మూలాధారం "
+msgstr "వనరు "
 
 #: ../libpurple/protocols/jabber/buddy.c:935
-#: ../libpurple/protocols/jabber/jabber.c:1531
-#: ../libpurple/protocols/jabber/jabber.c:1554
-#: ../libpurple/protocols/jabber/jabber.c:1577
-#: ../libpurple/protocols/jabber/jabber.c:1600
-#: ../libpurple/protocols/jabber/jabber.c:1623
-#, fuzzy
+#: ../libpurple/protocols/jabber/jabber.c:1569
+#: ../libpurple/protocols/jabber/jabber.c:1583
+#: ../libpurple/protocols/jabber/jabber.c:1597
+#: ../libpurple/protocols/jabber/jabber.c:1611
+#: ../libpurple/protocols/jabber/jabber.c:1625
 msgid "Priority"
-msgstr "పోర్ట్ "
+msgstr "ప్రాధాన్యత"
 
 #: ../libpurple/protocols/jabber/buddy.c:1237
 #: ../libpurple/protocols/silc/ops.c:994
 #: ../libpurple/protocols/silc10/ops.c:1028
 msgid "Middle Name"
-msgstr "మధ్యపేరు"
+msgstr "పేరులోని మధ్యభాగం"
 
 #: ../libpurple/protocols/jabber/buddy.c:1270
-#: ../libpurple/protocols/jabber/jabber.c:952
-#: ../libpurple/protocols/oscar/oscar.c:3788
-#: ../libpurple/protocols/oscar/oscar.c:3801
+#: ../libpurple/protocols/jabber/jabber.c:979
+#: ../libpurple/protocols/oscar/oscar.c:3798
+#: ../libpurple/protocols/oscar/oscar.c:3811
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1030
 #: ../libpurple/protocols/silc10/ops.c:1064
@@ -5470,954 +5740,934 @@
 msgid "Logo"
 msgstr "లోగో "
 
-#: ../libpurple/protocols/jabber/buddy.c:1942
+#: ../libpurple/protocols/jabber/buddy.c:1945
 msgid "Un-hide From"
-msgstr "ముందుకు రండి. "
-
-#: ../libpurple/protocols/jabber/buddy.c:1946
+msgstr "ముందుకు రండి"
+
+#: ../libpurple/protocols/jabber/buddy.c:1949
 msgid "Temporarily Hide From"
-msgstr "తాత్కాలికంగా దాగుకొనండి. "
-
+msgstr "తాత్కాలికంగా దాగండి"
+
+# && NOT ME
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1954
+#: ../libpurple/protocols/jabber/buddy.c:1957
 msgid "Cancel Presence Notification"
-msgstr "మీ అస్తిత్వపు సూచనను రద్దుచేయండి. "
-
-#: ../libpurple/protocols/jabber/buddy.c:1961
+msgstr "మీ అస్తిత్వపు సూచనను రద్దుచేయండి"
+
+#: ../libpurple/protocols/jabber/buddy.c:1964
 msgid "(Re-)Request authorization"
-msgstr "(రెండుసార్లు) ప్రమాణీకరణకోసం విజ్ఞప్తి చేయండి."
-
+msgstr "(Re-) ప్రమాణీకరణకోసం విజ్ఞప్తి చేయండి"
+
+# if(NOT ME)
+# shouldn't this just happen automatically when the buddy is
+# removed?
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1970
+#: ../libpurple/protocols/jabber/buddy.c:1973
 msgid "Unsubscribe"
-msgstr "Unsubscribe"
-
-#: ../libpurple/protocols/jabber/buddy.c:1985
+msgstr "తొలగించు"
+
+#: ../libpurple/protocols/jabber/buddy.c:1988
 #, fuzzy
 msgid "Log In"
-msgstr "లాగ్ ఇన్ "
-
-#: ../libpurple/protocols/jabber/buddy.c:1989
+msgstr "లాగ్ ఇన్ చేయబడింది"
+
+#: ../libpurple/protocols/jabber/buddy.c:1992
 #, fuzzy
 msgid "Log Out"
-msgstr "లాగ్ ఔట్ అయినది. "
-
-#: ../libpurple/protocols/jabber/buddy.c:2035
-#: ../libpurple/protocols/jabber/jabber.c:1553
+msgstr "సంభాషణలను లాగ్ చేయు"
+
+#: ../libpurple/protocols/jabber/buddy.c:2038
+#: ../libpurple/protocols/jabber/jabber.c:1582
 msgid "Chatty"
 msgstr "సంభాషణ "
 
-#: ../libpurple/protocols/jabber/buddy.c:2039
+#: ../libpurple/protocols/jabber/buddy.c:2042
 msgid "Extended Away"
-msgstr "దూరమైపోయినది."
-
-#: ../libpurple/protocols/jabber/buddy.c:2041
-#: ../libpurple/protocols/jabber/jabber.c:1622
+msgstr "దూరమైపోయినది"
+
+#: ../libpurple/protocols/jabber/buddy.c:2044
+#: ../libpurple/protocols/jabber/jabber.c:1624
 #: ../libpurple/protocols/oscar/oscar.c:727
-#: ../libpurple/protocols/oscar/oscar.c:5808
-#: ../libpurple/protocols/sametime/sametime.c:3297
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:5858
+#: ../libpurple/protocols/sametime/sametime.c:3339
 msgid "Do Not Disturb"
-msgstr "అంతరాయము కలిగించవద్దు."
-
-#: ../libpurple/protocols/jabber/buddy.c:2208
+msgstr "అంతరాయము కలిగించవద్దు"
+
+#: ../libpurple/protocols/jabber/buddy.c:2211
 msgid "JID"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:2212
-#: ../libpurple/protocols/jabber/buddy.c:2391
-#: ../libpurple/protocols/oscar/oscar.c:3711
+msgstr "JID"
+
+#: ../libpurple/protocols/jabber/buddy.c:2215
+#: ../libpurple/protocols/jabber/buddy.c:2404
+#: ../libpurple/protocols/oscar/oscar.c:3721
 msgid "Last Name"
-msgstr "చివరి పేరు "
-
-#: ../libpurple/protocols/jabber/buddy.c:2244
+msgstr "పేరులోని చివరిభాగం "
+
+#: ../libpurple/protocols/jabber/buddy.c:2247
 msgid "The following are the results of your search"
-msgstr ""
+msgstr "మీ అన్వేషణా ఫలితాలు ఇలా ఉన్నాయి"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:2319
-msgid ""
-"Find a contact by entering the search criteria in the given fields. Note: "
-"Each field supports wild card searches (%)"
-msgstr ""
-
-#  *< api_version
+#: ../libpurple/protocols/jabber/buddy.c:2332
+msgid "Find a contact by entering the search criteria in the given fields. Note: Each field supports wild card searches (%)"
+msgstr "కింది క్షేత్రాల్లో అన్వేషణా ప్రాధాన్యాన్ని ఎంటర్ చేయడం ద్వారా కాంటాక్టును కనుగొనండి. ప్రతి క్షేత్రం వైల్డ్ కార్డ్  అన్వేషణలకు సహకరిస్తుంది (%)"
+
+#: ../libpurple/protocols/jabber/buddy.c:2352
+msgid "Directory Query Failed"
+msgstr "డైరక్టరీ విచారణలో వైఫల్యం"
+
+#: ../libpurple/protocols/jabber/buddy.c:2353
+msgid "Could not query the directory server."
+msgstr "డైరెక్టరీ సర్వర్ ను విచారించలేకపోయాం."
+
+#. Try to translate the message (see static message
+#. list in jabber_user_dir_comments[])
+#: ../libpurple/protocols/jabber/buddy.c:2387
+#, c-format
+msgid "Server Instructions: %s"
+msgstr "సర్వర్ నిర్దేశాలు: %s"
+
+#: ../libpurple/protocols/jabber/buddy.c:2394
+#, fuzzy
+msgid "Fill in one or more fields to search for any matching XMPP users."
+msgstr "సరిపోలే జాబర్ వినియోగదారుల అన్వేషణ కోసం ఒకటి లేదా ఎక్కువ క్షేత్రాలను పూరించండి."
+
+#: ../libpurple/protocols/jabber/buddy.c:2414
+#: ../libpurple/protocols/novell/novell.c:1497
+#: ../libpurple/protocols/oscar/oscar.c:3724
+#: ../libpurple/protocols/oscar/oscar.c:3733
+msgid "E-Mail Address"
+msgstr "ఇ-మెయిల్ అడ్రస్ "
+
+#: ../libpurple/protocols/jabber/buddy.c:2423
+#: ../libpurple/protocols/jabber/buddy.c:2424
+#, fuzzy
+msgid "Search for XMPP users"
+msgstr "_అన్వేషించుము :"
+
+# "Search"
+#. "Search"
+#: ../libpurple/protocols/jabber/buddy.c:2425
+#: ../libpurple/protocols/qq/group.c:123
+#: ../libpurple/protocols/qq/group_im.c:147
+#: ../libpurple/protocols/qq/sys_msg.c:174
+#: ../libpurple/protocols/qq/sys_msg.c:250
+#: ../libpurple/protocols/qq/sys_msg.c:268
+#: ../libpurple/protocols/sametime/sametime.c:5657
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:356
+msgid "Search"
+msgstr "అన్వేషణ "
+
+#: ../libpurple/protocols/jabber/buddy.c:2440
+msgid "Invalid Directory"
+msgstr "చెల్లుబాటుకాని డైరెక్టరీ"
+
+#: ../libpurple/protocols/jabber/buddy.c:2457
+msgid "Enter a User Directory"
+msgstr "ఒక వినియోగదారు డైరెక్టరీని ఎంటర్ చేయండి"
+
+#: ../libpurple/protocols/jabber/buddy.c:2458
+msgid "Select a user directory to search"
+msgstr "అన్వేషణకోసం వినియోగదారు డైరెక్టరీని ఎంపికచేసుకోండి"
+
+#: ../libpurple/protocols/jabber/buddy.c:2461
+msgid "Search Directory"
+msgstr "డైరెక్టరీని అన్వేషించు"
+
+#: ../libpurple/protocols/jabber/chat.c:41
+#: ../libpurple/protocols/oscar/oscar.c:5342
+#: ../libpurple/protocols/yahoo/yahoochat.c:1048
+msgid "_Room:"
+msgstr "_రూమ్:"
+
+#: ../libpurple/protocols/jabber/chat.c:47
+msgid "_Server:"
+msgstr "_సర్వర్:"
+
+#: ../libpurple/protocols/jabber/chat.c:53
+msgid "_Handle:"
+msgstr "_హ్యాండిల్:"
+
+#: ../libpurple/protocols/jabber/chat.c:223
+#, c-format
+msgid "%s is not a valid room name"
+msgstr "%s చెల్లుబాటయ్యే రూమ్ పేరు కాదు"
+
+#: ../libpurple/protocols/jabber/chat.c:224
+msgid "Invalid Room Name"
+msgstr "చెల్లని రూమ్ పేరు"
+
+#: ../libpurple/protocols/jabber/chat.c:229
+#, c-format
+msgid "%s is not a valid server name"
+msgstr "%s చెల్లుబాటయ్యే సర్వర్‌ పేరు కాదు "
+
+#: ../libpurple/protocols/jabber/chat.c:230
+#: ../libpurple/protocols/jabber/chat.c:231
+msgid "Invalid Server Name"
+msgstr "చెల్లని సర్వర్ పేరు "
+
+#: ../libpurple/protocols/jabber/chat.c:235
+#, c-format
+msgid "%s is not a valid room handle"
+msgstr "%s చెల్లుబాటయ్యే రూమ్ హ్యాండిల్ కాదు"
+
+#: ../libpurple/protocols/jabber/chat.c:236
+#: ../libpurple/protocols/jabber/chat.c:237
+msgid "Invalid Room Handle"
+msgstr "చెల్లని రూమ్ హ్యాండిల్"
+
+#: ../libpurple/protocols/jabber/chat.c:396
+msgid "Configuration error"
+msgstr "కన్ఫిగరేషన్‌లో పొరపాటు"
+
+#: ../libpurple/protocols/jabber/chat.c:405
+#: ../libpurple/protocols/jabber/chat.c:548
+msgid "Unable to configure"
+msgstr "కన్ఫిగర్ చేయడంలో అశక్తత"
+
+#: ../libpurple/protocols/jabber/chat.c:420
+msgid "Room Configuration Error"
+msgstr "రూమ్ కన్ఫిగరేషన్‌లో పొరపాటు"
+
+#: ../libpurple/protocols/jabber/chat.c:421
+msgid "This room is not capable of being configured"
+msgstr "ఈ రూమ్ కు కన్ఫిగర్ చేసే   శక్తిలేదు "
+
+#: ../libpurple/protocols/jabber/chat.c:470
+#: ../libpurple/protocols/jabber/chat.c:539
+msgid "Registration error"
+msgstr "నమోదులో పొరపాటు"
+
+#: ../libpurple/protocols/jabber/chat.c:627
+msgid "Nick changing not supported in non-MUC chatrooms"
+msgstr " non-MUC సంభాషణ రూమ్ లలో ముద్దు పేరులో మార్పులకు సపోర్టు లేదు "
+
+#: ../libpurple/protocols/jabber/chat.c:678
+#: ../libpurple/protocols/jabber/chat.c:689
+#: ../libpurple/protocols/silc/ops.c:1460
+#: ../libpurple/protocols/silc10/ops.c:1451
+msgid "Error retrieving room list"
+msgstr "రూమ్ జాబితాను వెలికితీయడంలో పొరపాటు"
+
+#: ../libpurple/protocols/jabber/chat.c:737
+msgid "Invalid Server"
+msgstr "చెల్లని సర్వర్ "
+
+#: ../libpurple/protocols/jabber/chat.c:781
+msgid "Enter a Conference Server"
+msgstr "కాన్ఫరెన్స్  సర్వర్‌ను ఎంటర్ చేయండి"
+
+#: ../libpurple/protocols/jabber/chat.c:782
+msgid "Select a conference server to query"
+msgstr "ప్రశ్నించడానికి కాన్ఫరెన్స్ సర్వర్‌ను ఎంపిక చేయండి "
+
+#: ../libpurple/protocols/jabber/chat.c:785
+msgid "Find Rooms"
+msgstr "రూమ్ లను కనుగొనండి"
+
+#: ../libpurple/protocols/jabber/jabber.c:151
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:269
+#: ../libpurple/protocols/jabber/jabber.c:324
+#: ../libpurple/protocols/jabber/jabber.c:354
+msgid "Write error"
+msgstr "రైట్ చేయడంలో పొరపాటు"
+
+#: ../libpurple/protocols/jabber/jabber.c:424
+#: ../libpurple/protocols/jabber/jabber.c:463
+msgid "Read Error"
+msgstr "రీడ్ చేయడంలో పొరపాటు"
+
+#: ../libpurple/protocols/jabber/jabber.c:500
+#: ../libpurple/protocols/oscar/flap_connection.c:398
+#: ../libpurple/protocols/yahoo/yahoo.c:2562
+#: ../libpurple/protocols/yahoo/yahoo.c:2594
+#, c-format
+msgid ""
+"Could not establish a connection with the server:\n"
+"%s"
+msgstr ""
+"సర్వర్ తో కనెక్షన్ సాధ్యపడలేదు: \n"
+"%s"
+
+#: ../libpurple/protocols/jabber/jabber.c:550
+msgid "Unable to create socket"
+msgstr "సాకెట్‌ను సృష్టించలేదు"
+
+#: ../libpurple/protocols/jabber/jabber.c:598
+#: ../libpurple/protocols/jabber/jabber.c:1092
+#, fuzzy
+msgid "Invalid XMPP ID"
+msgstr "చెల్లుబాటుకాని ID"
+
+#: ../libpurple/protocols/jabber/jabber.c:605
+msgid "Invalid XMPP ID. Domain must be set."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:683
+#, c-format
+msgid "Registration of %s@%s successful"
+msgstr "%s@%s నమోదు విజయవంతమైనది"
+
+#: ../libpurple/protocols/jabber/jabber.c:689
+#, c-format
+msgid "Registration to %s successful"
+msgstr "%s@%s నమోదు విజయవంతమైనది"
+
+#: ../libpurple/protocols/jabber/jabber.c:691
+#: ../libpurple/protocols/jabber/jabber.c:692
+msgid "Registration Successful"
+msgstr " నమోదు విజయవంతమైనది"
+
+#: ../libpurple/protocols/jabber/jabber.c:700
+#: ../libpurple/protocols/jabber/jabber.c:701
+msgid "Registration Failed"
+msgstr " నమోదు విఫలమైనది"
+
+#: ../libpurple/protocols/jabber/jabber.c:719
+#, c-format
+msgid "Registration from %s successfully removed"
+msgstr "%s@%s నమోదు విజయవంతమైనది"
+
+#: ../libpurple/protocols/jabber/jabber.c:721
+#: ../libpurple/protocols/jabber/jabber.c:722
+#, fuzzy
+msgid "Unregistration Successful"
+msgstr " నమోదు విజయవంతమైనది"
+
+#: ../libpurple/protocols/jabber/jabber.c:730
+#: ../libpurple/protocols/jabber/jabber.c:731
+#, fuzzy
+msgid "Unregistration Failed"
+msgstr " నమోదు విఫలమైనది"
+
+#: ../libpurple/protocols/jabber/jabber.c:891
+#: ../libpurple/protocols/jabber/jabber.c:892
+msgid "Already Registered"
+msgstr "ఇప్పటికే నమోదైనది"
+
+#: ../libpurple/protocols/jabber/jabber.c:989
+#: ../libpurple/protocols/oscar/oscar.c:3800
+#: ../libpurple/protocols/oscar/oscar.c:3813
+msgid "State"
+msgstr "స్థితి "
+
+#: ../libpurple/protocols/jabber/jabber.c:994
+#, fuzzy
+msgid "Postal code"
+msgstr "పోస్టల్ కోడ్ "
+
+#: ../libpurple/protocols/jabber/jabber.c:999
+#: ../libpurple/protocols/silc/ops.c:1035
+#: ../libpurple/protocols/silc/silc.c:915
+#: ../libpurple/protocols/silc/util.c:563
+#: ../libpurple/protocols/silc10/ops.c:1069
+#: ../libpurple/protocols/silc10/silc.c:683
+#: ../libpurple/protocols/silc10/util.c:553
+msgid "Phone"
+msgstr "ఫోన్ "
+
+#: ../libpurple/protocols/jabber/jabber.c:1009
+msgid "Date"
+msgstr "తేదీ "
+
+# Register button
+#: ../libpurple/protocols/jabber/jabber.c:1014
+#, fuzzy
+msgid "Unregister"
+msgstr "నమోదు చేయండి "
+
+#: ../libpurple/protocols/jabber/jabber.c:1021
+#, fuzzy
+msgid "Please fill out the information below to change your account registration."
+msgstr "మీ కొత్త అకౌంటును నమోదు చేయడానికి ఈ కింది సమాచారాన్ని పూరించండి."
+
+#: ../libpurple/protocols/jabber/jabber.c:1024
+msgid "Please fill out the information below to register your new account."
+msgstr "మీ కొత్త అకౌంటును నమోదు చేయడానికి ఈ కింది సమాచారాన్ని పూరించండి."
+
+#: ../libpurple/protocols/jabber/jabber.c:1032
+#: ../libpurple/protocols/jabber/jabber.c:1033
+#, fuzzy
+msgid "Register New XMPP Account"
+msgstr "కొత్త జాబర్ అకౌంట్‌ను నమోదు చేయండి"
+
+# Register button
+#: ../libpurple/protocols/jabber/jabber.c:1034
+#: ../libpurple/protocols/jabber/jabber.c:1043
+msgid "Register"
+msgstr "నమోదు చేయండి "
+
+#: ../libpurple/protocols/jabber/jabber.c:1039
+#, c-format
+msgid "Change Account Registration at %s"
+msgstr "%s కోసం వినియోగదారు సమాచారాన్ని  మార్చండి. "
+
+#: ../libpurple/protocols/jabber/jabber.c:1040
+#, c-format
+msgid "Register New Account at %s"
+msgstr "కొత్త జాబర్ అకౌంట్‌ను నమోదు చేయండి"
+
+#: ../libpurple/protocols/jabber/jabber.c:1043
+msgid "Change Registration"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1151
+#: ../libpurple/protocols/jabber/jabber.c:1152
+#, fuzzy
+msgid "Error unregistering account"
+msgstr "అకౌంటు సమాచారాన్ని మార్చడంలో పొరపాటు. "
+
+#: ../libpurple/protocols/jabber/jabber.c:1157
+#: ../libpurple/protocols/jabber/jabber.c:1158
+#, fuzzy
+msgid "Account successfully unregistered"
+msgstr "మీరు  విజయవంతంగా Qunను సృష్టించగలిగారు"
+
+#: ../libpurple/protocols/jabber/jabber.c:1315
+msgid "Initializing Stream"
+msgstr "స్ట్రీమ్ ప్రారంభం"
+
+#: ../libpurple/protocols/jabber/jabber.c:1320
+#, fuzzy
+msgid "Initializing SSL/TLS"
+msgstr "స్ట్రీమ్ ప్రారంభం"
+
+#: ../libpurple/protocols/jabber/jabber.c:1324
+#: ../libpurple/protocols/msn/session.c:408
+#: ../libpurple/protocols/msnp9/session.c:361
+msgid "Authenticating"
+msgstr "ప్రమాణీకరణ "
+
+#: ../libpurple/protocols/jabber/jabber.c:1333
+msgid "Re-initializing Stream"
+msgstr "స్ట్రీమ్ ను పునఃప్రారంభస్తున్నది"
+
+#: ../libpurple/protocols/jabber/jabber.c:1427
+#: ../libpurple/protocols/jabber/jabber.c:1879
+#: ../libpurple/protocols/jabber/jabber.c:1922
+#: ../libpurple/protocols/jabber/jabber.c:1960
+#: ../libpurple/protocols/oscar/oscar.c:826
+#: ../libpurple/protocols/oscar/oscar.c:5652
+msgid "Not Authorized"
+msgstr "ప్రమాణీకరణ జరగలేదు "
+
+#: ../libpurple/protocols/jabber/jabber.c:1475
+msgid "Both"
+msgstr "రెండూ "
+
+#: ../libpurple/protocols/jabber/jabber.c:1477
+msgid "From (To pending)"
+msgstr "నుంచి (పెండింగ్‌కు)"
+
+#: ../libpurple/protocols/jabber/jabber.c:1479
+msgid "From"
+msgstr "నుంచి "
+
+#: ../libpurple/protocols/jabber/jabber.c:1482
+msgid "To"
+msgstr "కు "
+
+#: ../libpurple/protocols/jabber/jabber.c:1484
+msgid "None (To pending)"
+msgstr "ఎవరూ లేరు (To pending)"
+
+#: ../libpurple/protocols/jabber/jabber.c:1486
+#: ../pidgin/plugins/gevolution/eds-utils.c:73
+#: ../pidgin/plugins/gevolution/eds-utils.c:86
+msgid "None"
+msgstr "ఎవరూ లేరు"
+
+#: ../libpurple/protocols/jabber/jabber.c:1489
+msgid "Subscription"
+msgstr "చందా "
+
+#: ../libpurple/protocols/jabber/jabber.c:1499
+#: ../libpurple/protocols/jabber/jabber.c:1502
+#: ../libpurple/protocols/jabber/jabber.c:1571
+#: ../libpurple/protocols/jabber/jabber.c:1585
+#: ../libpurple/protocols/jabber/jabber.c:1599
+#: ../libpurple/protocols/jabber/jabber.c:1613
+#: ../libpurple/protocols/jabber/jabber.c:1627
+#: ../libpurple/protocols/jabber/usermood.c:184
+#: ../libpurple/protocols/silc/buddy.c:1560
+#: ../libpurple/protocols/silc/ops.c:1212
+#: ../libpurple/protocols/silc10/buddy.c:1560
+#: ../libpurple/protocols/silc10/ops.c:1207
+msgid "Mood"
+msgstr "స్వభావం "
+
+#: ../libpurple/protocols/jabber/jabber.c:1507
+#: ../libpurple/protocols/msn/msn.c:647
+#, fuzzy
+msgid "Current media"
+msgstr "ప్రస్తుత టోకెన్"
+
+#: ../libpurple/protocols/jabber/jabber.c:1572
+#: ../libpurple/protocols/jabber/jabber.c:1586
+#: ../libpurple/protocols/jabber/jabber.c:1600
+#: ../libpurple/protocols/jabber/jabber.c:1614
+#: ../libpurple/protocols/jabber/jabber.c:1628
+#, fuzzy
+msgid "Mood Text"
+msgstr "రక్తం గ్రూపు"
+
+#: ../libpurple/protocols/jabber/jabber.c:1574
+#: ../libpurple/protocols/jabber/jabber.c:1588
+#: ../libpurple/protocols/jabber/jabber.c:1602
+#: ../libpurple/protocols/jabber/jabber.c:1616
+#: ../libpurple/protocols/jabber/jabber.c:1630
+#, fuzzy
+msgid "Allow Buzz"
+msgstr "అనుమతించు"
+
+#: ../libpurple/protocols/jabber/jabber.c:1648
+#, fuzzy
+msgid "Tune Artist"
+msgstr "ఆర్టిస్టులు"
+
+#: ../libpurple/protocols/jabber/jabber.c:1649
+#, fuzzy
+msgid "Tune Title"
+msgstr "శీర్షిక "
+
+#: ../libpurple/protocols/jabber/jabber.c:1650
+msgid "Tune Album"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1651
+msgid "Tune Genre"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1652
+#, fuzzy
+msgid "Tune Comment"
+msgstr "మిత్రుని వ్యాఖ్య "
+
+#: ../libpurple/protocols/jabber/jabber.c:1653
+msgid "Tune Track"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1654
+msgid "Tune Time"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1655
+msgid "Tune Year"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1656
+msgid "Tune URL"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:1672
+msgid "Password Changed"
+msgstr "పాస్‌వర్డ్ మారినది"
+
+#: ../libpurple/protocols/jabber/jabber.c:1673
+msgid "Your password has been changed."
+msgstr "మీ పాస్‌వర్డ్ మారినది. "
+
+#: ../libpurple/protocols/jabber/jabber.c:1679
+#: ../libpurple/protocols/jabber/jabber.c:1680
+msgid "Error changing password"
+msgstr "పాసవర్డ్‌ను మార్చుతున్నప్పుడు పొరపాటు "
+
+#: ../libpurple/protocols/jabber/jabber.c:1737
+msgid "Password (again)"
+msgstr "పాస్‌వర్డ్ (మరోసారి)"
+
+# if (js->protocol_options & CHANGE_PASSWORD) {
+#: ../libpurple/protocols/jabber/jabber.c:1743
+#: ../libpurple/protocols/jabber/jabber.c:1744
+#, fuzzy
+msgid "Change XMPP Password"
+msgstr "పాస్‌వర్డ్‌ను మార్చండి."
+
+#: ../libpurple/protocols/jabber/jabber.c:1744
+msgid "Please enter your new password"
+msgstr "దయచేసి మీ కొత్త పాస్‌వర్డ్‌ను ఎంటర్ చేయండి"
+
+#: ../libpurple/protocols/jabber/jabber.c:1758
+#: ../libpurple/protocols/oscar/oscar.c:6438
+#: ../libpurple/protocols/silc/silc.c:1236
+#: ../libpurple/protocols/silc10/silc.c:1007
+msgid "Set User Info..."
+msgstr "వినియోగదారు సమాచారాన్ని సెట్ చేయండి ..."
+
+#. if (js->protocol_options & CHANGE_PASSWORD) {
+#: ../libpurple/protocols/jabber/jabber.c:1763
+#: ../libpurple/protocols/oscar/oscar.c:6449
+#: ../libpurple/protocols/silc/silc.c:1232
+#: ../libpurple/protocols/silc10/silc.c:1003
+msgid "Change Password..."
+msgstr "పాస్‌వర్డ్‌ను మార్చండి ..."
+
+#. }
+#: ../libpurple/protocols/jabber/jabber.c:1768
+msgid "Search for Users..."
+msgstr "వినియోగదారులకోసం అన్వేషించండి..."
+
+#: ../libpurple/protocols/jabber/jabber.c:1859
+msgid "Bad Request"
+msgstr "సరైన అభ్యర్థన కాదు "
+
+#: ../libpurple/protocols/jabber/jabber.c:1861
+msgid "Conflict"
+msgstr "వైరుధ్యం "
+
+#: ../libpurple/protocols/jabber/jabber.c:1863
+msgid "Feature Not Implemented"
+msgstr "ఫీచర్‌ను అమలుపర్చలేదు"
+
+#: ../libpurple/protocols/jabber/jabber.c:1865
+msgid "Forbidden"
+msgstr "వర్జించినది "
+
+#: ../libpurple/protocols/jabber/jabber.c:1867
+msgid "Gone"
+msgstr "వెళ్లిపోయింది "
+
+#: ../libpurple/protocols/jabber/jabber.c:1869
+#: ../libpurple/protocols/jabber/jabber.c:1950
+msgid "Internal Server Error"
+msgstr "ఇంటర్నల్ సర్వర్ లో పొరపాటు"
+
+#: ../libpurple/protocols/jabber/jabber.c:1871
+msgid "Item Not Found"
+msgstr "ఐటమ్ దొరకలేదు"
+
+#: ../libpurple/protocols/jabber/jabber.c:1873
+#, fuzzy
+msgid "Malformed XMPP ID"
+msgstr "Malformed Jabber ID"
+
+#: ../libpurple/protocols/jabber/jabber.c:1875
+msgid "Not Acceptable"
+msgstr "అంగీకరించదగినది కాదు"
+
+#: ../libpurple/protocols/jabber/jabber.c:1877
+msgid "Not Allowed"
+msgstr "అనుమతించబడలేదు"
+
+#: ../libpurple/protocols/jabber/jabber.c:1881
+msgid "Payment Required"
+msgstr "చెల్లింపు అవసరం"
+
+#: ../libpurple/protocols/jabber/jabber.c:1883
+msgid "Recipient Unavailable"
+msgstr "స్వీకరణదారు దొరకలేదు"
+
+#: ../libpurple/protocols/jabber/jabber.c:1887
+msgid "Registration Required"
+msgstr "నమోదు అవసరం"
+
+#: ../libpurple/protocols/jabber/jabber.c:1889
+msgid "Remote Server Not Found"
+msgstr "రిమోట్ సర్వర్ కనిపించలేదు"
+
+#: ../libpurple/protocols/jabber/jabber.c:1891
+msgid "Remote Server Timeout"
+msgstr "రిమోట్ సర్వర్ సమయం అయిపోయినది"
+
+#: ../libpurple/protocols/jabber/jabber.c:1893
+msgid "Server Overloaded"
+msgstr "సర్వర్‌ ఓవర్‌లోడ్ అయినది"
+
+#: ../libpurple/protocols/jabber/jabber.c:1895
+msgid "Service Unavailable"
+msgstr "సర్వీస్ దొరుకుటలేదు"
+
+#: ../libpurple/protocols/jabber/jabber.c:1897
+msgid "Subscription Required"
+msgstr "చందా అవసరం"
+
+#: ../libpurple/protocols/jabber/jabber.c:1899
+msgid "Unexpected Request"
+msgstr "ఆశించని మనవి"
+
+#: ../libpurple/protocols/jabber/jabber.c:1907
+msgid "Authorization Aborted"
+msgstr "ఆథరైజేషన్ వదిలివేయబడింది"
+
+#: ../libpurple/protocols/jabber/jabber.c:1909
+msgid "Incorrect encoding in authorization"
+msgstr "ప్రమాణీకరణలో తప్పుడు ఎన్‌కోడింగ్"
+
+#: ../libpurple/protocols/jabber/jabber.c:1911
+msgid "Invalid authzid"
+msgstr "చెల్లని ప్రమాణీకరణ"
+
+#: ../libpurple/protocols/jabber/jabber.c:1913
+msgid "Invalid Authorization Mechanism"
+msgstr "చెల్లని ప్రమాణీకరణ యంత్రాంగం"
+
+#: ../libpurple/protocols/jabber/jabber.c:1916
+msgid "Authorization mechanism too weak"
+msgstr "ప్రమాణీకరణ యంత్రాంగం చాలా బలహీనంగా ఉంది "
+
+#: ../libpurple/protocols/jabber/jabber.c:1924
+msgid "Temporary Authentication Failure"
+msgstr "తాత్కాలిక ప్రమాణీకరణ లో వైఫల్యం"
+
+#: ../libpurple/protocols/jabber/jabber.c:1927
+msgid "Authentication Failure"
+msgstr "ప్రమాణీకరణలో వైఫల్యం"
+
+#: ../libpurple/protocols/jabber/jabber.c:1935
+msgid "Bad Format"
+msgstr "తప్పుడు ఫార్మాట్ "
+
+#: ../libpurple/protocols/jabber/jabber.c:1937
+msgid "Bad Namespace Prefix"
+msgstr "తప్పుడు నేమ్‌స్పేస్ ప్రిఫిక్స్"
+
+#: ../libpurple/protocols/jabber/jabber.c:1940
+msgid "Resource Conflict"
+msgstr "మూలాధారంలో వైరుధ్యం"
+
+#: ../libpurple/protocols/jabber/jabber.c:1942
+#: ../libpurple/protocols/silc/silc.c:350
+#: ../libpurple/protocols/silc10/ops.c:1720
+msgid "Connection Timeout"
+msgstr "కనెక్షన్ సమయం ముగిసింది"
+
+#: ../libpurple/protocols/jabber/jabber.c:1944
+msgid "Host Gone"
+msgstr "హోస్ట్ వెళ్లిపోయారు"
+
+# #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
+# gnome-session/gsm-client-row.c:43
+# #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
+#: ../libpurple/protocols/jabber/jabber.c:1946
+msgid "Host Unknown"
+msgstr "అజ్ఞాత హోస్ట్"
+
+#: ../libpurple/protocols/jabber/jabber.c:1948
+msgid "Improper Addressing"
+msgstr "అనుచిత నివేదన"
+
+#: ../libpurple/protocols/jabber/jabber.c:1952
+msgid "Invalid ID"
+msgstr "చెల్లుబాటుకాని ID"
+
+#: ../libpurple/protocols/jabber/jabber.c:1954
+msgid "Invalid Namespace"
+msgstr "చెల్లుబాటుకాని నేమ్‌స్పేస్"
+
+#: ../libpurple/protocols/jabber/jabber.c:1956
+msgid "Invalid XML"
+msgstr "చెల్లుబాటుకాని XML"
+
+#: ../libpurple/protocols/jabber/jabber.c:1958
+msgid "Non-matching Hosts"
+msgstr "సరిపోలని హోస్టులు"
+
+#: ../libpurple/protocols/jabber/jabber.c:1962
+msgid "Policy Violation"
+msgstr "విధాన ఉల్లంఘన "
+
+# *< api_version
 #  *< type
 #  *< ui_requirement
 #  *< flags
 #  *< dependencies
 #  *< priority
 #  *< id
-#: ../libpurple/protocols/jabber/buddy.c:2339
-#, fuzzy
-msgid "Directory Query Failed"
-msgstr "డైరెక్ట్ కనెక్షన్ వైఫల్యం "
-
-#: ../libpurple/protocols/jabber/buddy.c:2340
-#, fuzzy
-msgid "Could not query the directory server."
-msgstr "ఫైల్ ట్రాన్స్‌ఫర్‌ను ప్రారంభించుటకు సాధ్యం కాదు. "
-
-#. Try to translate the message (see static message
-#. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:2374
-#, fuzzy, c-format
-msgid "Server Instructions: %s"
-msgstr "సెర్వర్ సమాచారం. "
-
-#: ../libpurple/protocols/jabber/buddy.c:2381
-msgid "Fill in one or more fields to search for any matching XMPP users."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:2401
-#: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3714
-#: ../libpurple/protocols/oscar/oscar.c:3723
-msgid "E-Mail Address"
-msgstr "ఇ-మెయిల్ అడ్రస్ "
-
-#: ../libpurple/protocols/jabber/buddy.c:2410
-#: ../libpurple/protocols/jabber/buddy.c:2411
-#, fuzzy
-msgid "Search for XMPP users"
-msgstr "_అన్వేషించుము :"
-
-#. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:2412
-#: ../libpurple/protocols/qq/group.c:123
-#: ../libpurple/protocols/qq/group_im.c:147
-#: ../libpurple/protocols/qq/sys_msg.c:174
-#: ../libpurple/protocols/qq/sys_msg.c:250
-#: ../libpurple/protocols/qq/sys_msg.c:268
-#: ../libpurple/protocols/sametime/sametime.c:5611
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:356
-msgid "Search"
-msgstr "అన్వేషణ "
-
-#: ../libpurple/protocols/jabber/buddy.c:2427
-#, fuzzy
-msgid "Invalid Directory"
-msgstr "విలువలేని పొరపాటు "
-
-#: ../libpurple/protocols/jabber/buddy.c:2444
-#, fuzzy
-msgid "Enter a User Directory"
-msgstr "డైరెక్టరీని పంపలేదు."
-
-#: ../libpurple/protocols/jabber/buddy.c:2445
-#, fuzzy
-msgid "Select a user directory to search"
-msgstr "ప్రశ్నించడానికి సమావేశ సెర్వర్‌ను సెలక్ట్ చేయండి. "
-
-#: ../libpurple/protocols/jabber/buddy.c:2448
-#, fuzzy
-msgid "Search Directory"
-msgstr "_అన్వేషించుము :"
-
-#: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5294
-#: ../libpurple/protocols/yahoo/yahoochat.c:1048
-msgid "_Room:"
-msgstr "_గది:"
-
-#: ../libpurple/protocols/jabber/chat.c:47
-msgid "_Server:"
-msgstr "_సెర్వర్:"
-
-#: ../libpurple/protocols/jabber/chat.c:53
-msgid "_Handle:"
-msgstr "_హాండిల్:"
-
-#: ../libpurple/protocols/jabber/chat.c:223
-#, c-format
-msgid "%s is not a valid room name"
-msgstr "%s విలువైన గదిపేరు కాదు. "
-
-#: ../libpurple/protocols/jabber/chat.c:224
-msgid "Invalid Room Name"
-msgstr "విలువలేని గదిపేరు."
-
-#: ../libpurple/protocols/jabber/chat.c:229
-#, c-format
-msgid "%s is not a valid server name"
-msgstr "%s విలువైన సెర్వర్‌ పేరు కాదు. "
-
-#: ../libpurple/protocols/jabber/chat.c:230
-#: ../libpurple/protocols/jabber/chat.c:231
-msgid "Invalid Server Name"
-msgstr "విలువలేని సెర్వర్ పేరు. "
-
-#: ../libpurple/protocols/jabber/chat.c:235
-#, c-format
-msgid "%s is not a valid room handle"
-msgstr "%s విలువైన రూమ్ హాండిల్ కాదు. "
-
-#: ../libpurple/protocols/jabber/chat.c:236
-#: ../libpurple/protocols/jabber/chat.c:237
-msgid "Invalid Room Handle"
-msgstr "విలువలేని రూమ్ హాండిల్. "
-
-#: ../libpurple/protocols/jabber/chat.c:396
-msgid "Configuration error"
-msgstr "కన్ఫిగరేషన్‌లో పొరపాటు. "
-
-#: ../libpurple/protocols/jabber/chat.c:405
-#: ../libpurple/protocols/jabber/chat.c:548
-msgid "Unable to configure"
-msgstr "కన్ఫిగర్ చేయడంలో అశక్తత. "
-
-#: ../libpurple/protocols/jabber/chat.c:420
-msgid "Room Configuration Error"
-msgstr "గది కన్ఫిగరేషన్‌లో పొరపాటు. "
-
-#: ../libpurple/protocols/jabber/chat.c:421
-msgid "This room is not capable of being configured"
-msgstr "గది కన్ఫిగర్ చేయడానికి శక్తిలేదు. "
-
-#: ../libpurple/protocols/jabber/chat.c:470
-#: ../libpurple/protocols/jabber/chat.c:539
-msgid "Registration error"
-msgstr "రెజిస్ట్రేషన్‌ పొరపాటు. "
-
-#: ../libpurple/protocols/jabber/chat.c:627
-msgid "Nick changing not supported in non-MUC chatrooms"
-msgstr " non-MUC సంభాషణ గదుల్లో ఉపనామముల మార్పులకు సపోర్టు లేదు. "
-
-#: ../libpurple/protocols/jabber/chat.c:678
-#: ../libpurple/protocols/jabber/chat.c:689
-#: ../libpurple/protocols/silc/ops.c:1456
-#: ../libpurple/protocols/silc10/ops.c:1451
-#, fuzzy
-msgid "Error retrieving room list"
-msgstr "రూమ్ లిస్టును పొందడంలో పొరపాటు."
-
-#: ../libpurple/protocols/jabber/chat.c:737
-msgid "Invalid Server"
-msgstr "విలువలేని సెర్వర్. "
-
-#: ../libpurple/protocols/jabber/chat.c:781
-msgid "Enter a Conference Server"
-msgstr "సమావేశ సెర్వర్‌లోనికి ప్రవేశించండి."
-
-#: ../libpurple/protocols/jabber/chat.c:782
-msgid "Select a conference server to query"
-msgstr "ప్రశ్నించడానికి సమావేశ సెర్వర్‌ను సెలక్ట్ చేయండి. "
-
-#: ../libpurple/protocols/jabber/chat.c:785
-msgid "Find Rooms"
-msgstr "గదులను కనుగొనండి. "
-
-#: ../libpurple/protocols/jabber/jabber.c:92
-msgid "Error initializing session"
-msgstr "సెషన్ ప్రారంభించడంలో పొరపాటు. "
-
-#: ../libpurple/protocols/jabber/jabber.c:145
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:259
-#: ../libpurple/protocols/jabber/jabber.c:312
-#: ../libpurple/protocols/jabber/jabber.c:340
-msgid "Write error"
-msgstr "వ్రాయడంలో పొరపాటు."
-
-#: ../libpurple/protocols/jabber/jabber.c:408
-#: ../libpurple/protocols/jabber/jabber.c:445
-msgid "Read Error"
-msgstr "చదవడంలో పొరపాటు. "
-
-#: ../libpurple/protocols/jabber/jabber.c:482
-#: ../libpurple/protocols/oscar/flap_connection.c:394
-#: ../libpurple/protocols/yahoo/yahoo.c:2558
-#: ../libpurple/protocols/yahoo/yahoo.c:2590
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:529
-msgid "Unable to create socket"
-msgstr "సాకెట్‌ను సృష్టించలేదు. "
-
-#: ../libpurple/protocols/jabber/jabber.c:575
-#: ../libpurple/protocols/jabber/jabber.c:1063
-#, fuzzy
-msgid "Invalid XMPP ID"
-msgstr "విలువలేని ID."
-
-#: ../libpurple/protocols/jabber/jabber.c:580
-msgid "Invalid XMPP ID. Domain must be set."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:656
-#, c-format
-msgid "Registration of %s@%s successful"
-msgstr "%s@%s రెజిస్ట్రేషన్ విజయవంతమైనది."
-
-#: ../libpurple/protocols/jabber/jabber.c:662
-#, fuzzy, c-format
-msgid "Registration to %s successful"
-msgstr "%s@%s రెజిస్ట్రేషన్ విజయవంతమైనది."
-
-#: ../libpurple/protocols/jabber/jabber.c:664
-#: ../libpurple/protocols/jabber/jabber.c:665
-msgid "Registration Successful"
-msgstr " రెజిస్ట్రేషన్ విజయవంతమైనది."
-
-#: ../libpurple/protocols/jabber/jabber.c:673
-#: ../libpurple/protocols/jabber/jabber.c:674
-msgid "Registration Failed"
-msgstr " రెజిస్ట్రేషన్ విఫలమైనది."
-
-#: ../libpurple/protocols/jabber/jabber.c:692
-#, fuzzy, c-format
-msgid "Registration from %s successfully removed"
-msgstr "%s@%s రెజిస్ట్రేషన్ విజయవంతమైనది."
-
-#: ../libpurple/protocols/jabber/jabber.c:694
-#: ../libpurple/protocols/jabber/jabber.c:695
-#, fuzzy
-msgid "Unregistration Successful"
-msgstr " రెజిస్ట్రేషన్ విజయవంతమైనది."
-
-#: ../libpurple/protocols/jabber/jabber.c:703
-#: ../libpurple/protocols/jabber/jabber.c:704
-#, fuzzy
-msgid "Unregistration Failed"
-msgstr " రెజిస్ట్రేషన్ విఫలమైనది."
-
-#: ../libpurple/protocols/jabber/jabber.c:864
-#: ../libpurple/protocols/jabber/jabber.c:865
-msgid "Already Registered"
-msgstr "మునుపే రెజిస్టర్ ఐనది. "
-
-#: ../libpurple/protocols/jabber/jabber.c:962
-#: ../libpurple/protocols/oscar/oscar.c:3790
-#: ../libpurple/protocols/oscar/oscar.c:3803
-msgid "State"
-msgstr "స్థితి "
-
-#: ../libpurple/protocols/jabber/jabber.c:967
-#, fuzzy
-msgid "Postal code"
-msgstr "పోస్టల్ కోడ్ "
-
-#: ../libpurple/protocols/jabber/jabber.c:972
-#: ../libpurple/protocols/silc/ops.c:1035
-#: ../libpurple/protocols/silc/silc.c:772
-#: ../libpurple/protocols/silc/util.c:557
-#: ../libpurple/protocols/silc10/ops.c:1069
-#: ../libpurple/protocols/silc10/silc.c:683
-#: ../libpurple/protocols/silc10/util.c:553
-msgid "Phone"
-msgstr "ఫోన్ "
-
-#: ../libpurple/protocols/jabber/jabber.c:982
-msgid "Date"
-msgstr "తేదీ "
-
-#: ../libpurple/protocols/jabber/jabber.c:987
-#, fuzzy
-msgid "Unregister"
-msgstr "రిజిస్టర్ "
-
-#: ../libpurple/protocols/jabber/jabber.c:994
-#, fuzzy
-msgid ""
-"Please fill out the information below to change your account registration."
-msgstr "మీ కొత్త ఖాతాను రెజిస్టర్ చేయడానికి ఈ క్రింద సమాచారాన్ని పూరించండి."
-
-#: ../libpurple/protocols/jabber/jabber.c:997
-msgid "Please fill out the information below to register your new account."
-msgstr "మీ కొత్త ఖాతాను రెజిస్టర్ చేయడానికి ఈ క్రింద సమాచారాన్ని పూరించండి."
-
-#: ../libpurple/protocols/jabber/jabber.c:1005
-#: ../libpurple/protocols/jabber/jabber.c:1006
-#, fuzzy
-msgid "Register New XMPP Account"
-msgstr "కొత్త జాబర్ ఎకౌంట్‌ను రిజిస్టర్ చేయండి."
-
-#: ../libpurple/protocols/jabber/jabber.c:1007
-#: ../libpurple/protocols/jabber/jabber.c:1016
-msgid "Register"
-msgstr "రిజిస్టర్ "
-
-#: ../libpurple/protocols/jabber/jabber.c:1012
-#, fuzzy, c-format
-msgid "Change Account Registration at %s"
-msgstr "వినియోగదారుని సమాచారాన్ని %s కోసం మార్చండి. "
-
-#: ../libpurple/protocols/jabber/jabber.c:1013
-#, fuzzy, c-format
-msgid "Register New Account at %s"
-msgstr "కొత్త జాబర్ ఎకౌంట్‌ను రిజిస్టర్ చేయండి."
-
-#: ../libpurple/protocols/jabber/jabber.c:1016
-#, fuzzy
-msgid "Change Registration"
-msgstr "రిజిస్ట్రేషన్ పొరపాటు. "
-
-#: ../libpurple/protocols/jabber/jabber.c:1120
-#: ../libpurple/protocols/jabber/jabber.c:1121
-#, fuzzy
-msgid "Error unregistering account"
-msgstr "ఖాతా సమాచారాన్ని మార్చడంలో పొరపాటు. "
-
-#: ../libpurple/protocols/jabber/jabber.c:1126
-#: ../libpurple/protocols/jabber/jabber.c:1127
-msgid "Account successfully unregistered"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1284
-msgid "Initializing Stream"
-msgstr "ప్రవాహం ప్రారంభం. "
-
-#: ../libpurple/protocols/jabber/jabber.c:1289
-#, fuzzy
-msgid "Initializing SSL/TLS"
-msgstr "ప్రవాహం ప్రారంభం. "
-
-#: ../libpurple/protocols/jabber/jabber.c:1293
-#: ../libpurple/protocols/msn/session.c:351
-msgid "Authenticating"
-msgstr "ప్రమాణీకరణ చేయుచున్నది."
-
-#: ../libpurple/protocols/jabber/jabber.c:1302
-msgid "Re-initializing Stream"
-msgstr "ప్రవాహాన్ని పునఃప్రారంభస్తున్నది. "
-
-#: ../libpurple/protocols/jabber/jabber.c:1396
-#: ../libpurple/protocols/jabber/jabber.c:1865
-#: ../libpurple/protocols/jabber/jabber.c:1909
-#: ../libpurple/protocols/jabber/jabber.c:1945
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:5602
-msgid "Not Authorized"
-msgstr "అధికారము పొందని "
-
-#: ../libpurple/protocols/jabber/jabber.c:1442
-msgid "Both"
-msgstr "రెండూ "
-
-#: ../libpurple/protocols/jabber/jabber.c:1444
-msgid "From (To pending)"
-msgstr "కు (పెండింగ్‌కు)"
-
-#: ../libpurple/protocols/jabber/jabber.c:1446
-msgid "From"
-msgstr "నుంచి "
-
-#: ../libpurple/protocols/jabber/jabber.c:1449
-msgid "To"
-msgstr "కు "
-
-#: ../libpurple/protocols/jabber/jabber.c:1451
-msgid "None (To pending)"
-msgstr "ఎవరూ లేరు (To pending)"
-
-#: ../libpurple/protocols/jabber/jabber.c:1453
-#: ../pidgin/plugins/gevolution/eds-utils.c:73
-#: ../pidgin/plugins/gevolution/eds-utils.c:86
-msgid "None"
-msgstr "ఎవరూ లేరు."
-
-#: ../libpurple/protocols/jabber/jabber.c:1456
-msgid "Subscription"
-msgstr "చందా "
-
-#: ../libpurple/protocols/jabber/jabber.c:1466
-#: ../libpurple/protocols/jabber/jabber.c:1469
-#: ../libpurple/protocols/jabber/jabber.c:1533
-#: ../libpurple/protocols/jabber/jabber.c:1556
-#: ../libpurple/protocols/jabber/jabber.c:1579
-#: ../libpurple/protocols/jabber/jabber.c:1602
-#: ../libpurple/protocols/jabber/jabber.c:1625
-#: ../libpurple/protocols/jabber/usermood.c:166
-#: ../libpurple/protocols/silc/buddy.c:1557
-#: ../libpurple/protocols/silc/ops.c:1212
-#: ../libpurple/protocols/silc10/buddy.c:1557
-#: ../libpurple/protocols/silc10/ops.c:1207
-msgid "Mood"
-msgstr "స్వభావం "
-
-#: ../libpurple/protocols/jabber/jabber.c:1534
-#: ../libpurple/protocols/jabber/jabber.c:1557
-#: ../libpurple/protocols/jabber/jabber.c:1580
-#: ../libpurple/protocols/jabber/jabber.c:1603
-#: ../libpurple/protocols/jabber/jabber.c:1626
-#, fuzzy
-msgid "Mood Text"
-msgstr "స్వభావం "
-
-#: ../libpurple/protocols/jabber/jabber.c:1535
-#: ../libpurple/protocols/jabber/jabber.c:1558
-#: ../libpurple/protocols/jabber/jabber.c:1581
-#: ../libpurple/protocols/jabber/jabber.c:1604
-#: ../libpurple/protocols/jabber/jabber.c:1627
-msgid "Tune Artist"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1536
-#: ../libpurple/protocols/jabber/jabber.c:1559
-#: ../libpurple/protocols/jabber/jabber.c:1582
-#: ../libpurple/protocols/jabber/jabber.c:1605
-#: ../libpurple/protocols/jabber/jabber.c:1628
-#, fuzzy
-msgid "Tune Title"
-msgstr "టైటిల్ "
-
-#: ../libpurple/protocols/jabber/jabber.c:1537
-#: ../libpurple/protocols/jabber/jabber.c:1560
-#: ../libpurple/protocols/jabber/jabber.c:1583
-#: ../libpurple/protocols/jabber/jabber.c:1606
-#: ../libpurple/protocols/jabber/jabber.c:1629
-msgid "Tune Album"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1538
-#: ../libpurple/protocols/jabber/jabber.c:1561
-#: ../libpurple/protocols/jabber/jabber.c:1584
-#: ../libpurple/protocols/jabber/jabber.c:1607
-#: ../libpurple/protocols/jabber/jabber.c:1630
-msgid "Tune Genre"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1539
-#: ../libpurple/protocols/jabber/jabber.c:1562
-#: ../libpurple/protocols/jabber/jabber.c:1585
-#: ../libpurple/protocols/jabber/jabber.c:1608
-#: ../libpurple/protocols/jabber/jabber.c:1631
-#, fuzzy
-msgid "Tune Comment"
-msgstr "మిత్రుని వ్యాఖ్య "
-
-#: ../libpurple/protocols/jabber/jabber.c:1540
-#: ../libpurple/protocols/jabber/jabber.c:1563
-#: ../libpurple/protocols/jabber/jabber.c:1586
-#: ../libpurple/protocols/jabber/jabber.c:1609
-#: ../libpurple/protocols/jabber/jabber.c:1632
-msgid "Tune Track"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1541
-#: ../libpurple/protocols/jabber/jabber.c:1564
-#: ../libpurple/protocols/jabber/jabber.c:1587
-#: ../libpurple/protocols/jabber/jabber.c:1610
-#: ../libpurple/protocols/jabber/jabber.c:1633
-#, fuzzy
-msgid "Tune Time"
-msgstr "సమయం"
-
-#: ../libpurple/protocols/jabber/jabber.c:1542
-#: ../libpurple/protocols/jabber/jabber.c:1565
-#: ../libpurple/protocols/jabber/jabber.c:1588
-#: ../libpurple/protocols/jabber/jabber.c:1611
-#: ../libpurple/protocols/jabber/jabber.c:1634
-msgid "Tune Year"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1543
-#: ../libpurple/protocols/jabber/jabber.c:1566
-#: ../libpurple/protocols/jabber/jabber.c:1589
-#: ../libpurple/protocols/jabber/jabber.c:1612
-#: ../libpurple/protocols/jabber/jabber.c:1635
-msgid "Tune URL"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1545
-#: ../libpurple/protocols/jabber/jabber.c:1568
-#: ../libpurple/protocols/jabber/jabber.c:1591
-#: ../libpurple/protocols/jabber/jabber.c:1614
-#: ../libpurple/protocols/jabber/jabber.c:1637
-#, fuzzy
-msgid "Allow Buzz"
-msgstr "అనుమతించు"
-
-#: ../libpurple/protocols/jabber/jabber.c:1665
-msgid "Password Changed"
-msgstr "పాస్‌వర్డ్ మారినది. "
-
-#: ../libpurple/protocols/jabber/jabber.c:1666
-msgid "Your password has been changed."
-msgstr "మీ పాస్‌వర్డ్ మారినది. "
-
-#: ../libpurple/protocols/jabber/jabber.c:1670
-#: ../libpurple/protocols/jabber/jabber.c:1671
-msgid "Error changing password"
-msgstr "పాసవర్డ్‌ను మార్చుతున్నప్పుడు పొరపాటు "
-
-#: ../libpurple/protocols/jabber/jabber.c:1728
-msgid "Password (again)"
-msgstr "పాస్‌వర్డ‌ (మరోసారి)"
-
-#: ../libpurple/protocols/jabber/jabber.c:1734
-#: ../libpurple/protocols/jabber/jabber.c:1735
-#, fuzzy
-msgid "Change XMPP Password"
-msgstr "పాస్‌వర్డ్‌ను మార్చండి."
-
-#: ../libpurple/protocols/jabber/jabber.c:1735
-msgid "Please enter your new password"
-msgstr "దయచేసి మీ పాస్‌వర్డ్‌ను ఎంటర్ చేయండి."
-
-#: ../libpurple/protocols/jabber/jabber.c:1749
-#: ../libpurple/protocols/oscar/oscar.c:6388
-#: ../libpurple/protocols/silc/silc.c:1093
-#: ../libpurple/protocols/silc10/silc.c:1004
-msgid "Set User Info..."
-msgstr "వినియోగదారుని సమాచారం సెట్ చేయుము ..."
-
-#. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1754
-#: ../libpurple/protocols/oscar/oscar.c:6399
-#: ../libpurple/protocols/silc/silc.c:1089
-#: ../libpurple/protocols/silc10/silc.c:1000
-msgid "Change Password..."
-msgstr "పాస్‌వర్డ్‌ను మార్చండి ..."
-
-#. }
-#: ../libpurple/protocols/jabber/jabber.c:1759
-#, fuzzy
-msgid "Search for Users..."
-msgstr "_అన్వేషించుము :"
-
-#: ../libpurple/protocols/jabber/jabber.c:1845
-msgid "Bad Request"
-msgstr "అవాంఛనీయ మనవి. "
-
-#: ../libpurple/protocols/jabber/jabber.c:1847
-msgid "Conflict"
-msgstr "వైరుధ్యం "
-
-#: ../libpurple/protocols/jabber/jabber.c:1849
-msgid "Feature Not Implemented"
-msgstr "ఫీచర్‌ను అమలుపర్చలేదు. "
-
-#: ../libpurple/protocols/jabber/jabber.c:1851
-msgid "Forbidden"
-msgstr "వర్జించిన "
-
-#: ../libpurple/protocols/jabber/jabber.c:1853
-msgid "Gone"
-msgstr "వెళ్లిపోయిన "
-
-#: ../libpurple/protocols/jabber/jabber.c:1855
-#: ../libpurple/protocols/jabber/jabber.c:1935
-msgid "Internal Server Error"
-msgstr "ఇంటర్నల్ సెర్వర్ పొరపాటు"
-
-#: ../libpurple/protocols/jabber/jabber.c:1857
-msgid "Item Not Found"
-msgstr "ఐటమ్ దొరకలేదు. "
-
-#: ../libpurple/protocols/jabber/jabber.c:1859
-#, fuzzy
-msgid "Malformed XMPP ID"
-msgstr "Malformed Jabber ID"
-
-#: ../libpurple/protocols/jabber/jabber.c:1861
-msgid "Not Acceptable"
-msgstr "అంగీకరించదగినది కాదు. "
-
-#: ../libpurple/protocols/jabber/jabber.c:1863
-msgid "Not Allowed"
-msgstr "అనుమతించబడలేదు."
-
-#: ../libpurple/protocols/jabber/jabber.c:1867
-msgid "Payment Required"
-msgstr "చెల్లింపు అవసరం. "
-
-#: ../libpurple/protocols/jabber/jabber.c:1869
-msgid "Recipient Unavailable"
-msgstr "స్వీకరణదారుడు దొరకలేదు. "
-
-#: ../libpurple/protocols/jabber/jabber.c:1873
-msgid "Registration Required"
-msgstr "రెజిస్ట్రేషన్ అవసరం. "
-
-#: ../libpurple/protocols/jabber/jabber.c:1875
-msgid "Remote Server Not Found"
-msgstr "రిమోట్ సెర్వర్ కనిపించలేదు. "
-
-#: ../libpurple/protocols/jabber/jabber.c:1877
-msgid "Remote Server Timeout"
-msgstr "రిమోట్ సెర్వర్ సమయం అయిపోయినది. "
-
-#: ../libpurple/protocols/jabber/jabber.c:1879
-msgid "Server Overloaded"
-msgstr "సెర్వర్‌కు ఓవర్‌లోడ్ అయినది. "
-
-#: ../libpurple/protocols/jabber/jabber.c:1881
-msgid "Service Unavailable"
-msgstr "సర్వీస్ దొరుకుటలేదు. "
-
-#: ../libpurple/protocols/jabber/jabber.c:1883
-msgid "Subscription Required"
-msgstr "సబ్‌స్క్రిప్షన్ అవసరం. "
-
-#: ../libpurple/protocols/jabber/jabber.c:1885
-msgid "Unexpected Request"
-msgstr "ఆశించని మనవి."
-
-#: ../libpurple/protocols/jabber/jabber.c:1892
-msgid "Authorization Aborted"
-msgstr "ఆథరైజేషన్ వదిలివేయబడింది. "
-
-#: ../libpurple/protocols/jabber/jabber.c:1894
-msgid "Incorrect encoding in authorization"
-msgstr "ప్రమాణీకరణలో పొరపాటు ఎన్‌కోడింగ్. "
-
-#: ../libpurple/protocols/jabber/jabber.c:1897
-msgid "Invalid authzid"
-msgstr "Invalid authzid"
-
-#: ../libpurple/protocols/jabber/jabber.c:1900
-msgid "Invalid Authorization Mechanism"
-msgstr "విలువలేని ఆథరైజేషన్ మెకానిజం. "
-
-#: ../libpurple/protocols/jabber/jabber.c:1903
-msgid "Authorization mechanism too weak"
-msgstr "అథరైజేషన్ మెకానిజం చాలా బలహీనంగా ఉంది. "
-
-#: ../libpurple/protocols/jabber/jabber.c:1911
-msgid "Temporary Authentication Failure"
-msgstr "తాత్కాలిక ప్రమాణీకరణ వైఫల్యం. "
-
-#: ../libpurple/protocols/jabber/jabber.c:1914
-msgid "Authentication Failure"
-msgstr "ప్రమాణీకరణ వైఫల్యం. "
-
-#: ../libpurple/protocols/jabber/jabber.c:1920
-msgid "Bad Format"
-msgstr "తప్పు ఫార్మాట్ "
-
-#: ../libpurple/protocols/jabber/jabber.c:1922
-msgid "Bad Namespace Prefix"
-msgstr "తప్పుడు నేమ్‌స్పేస్ ఉపసర్గ "
-
-#: ../libpurple/protocols/jabber/jabber.c:1925
-msgid "Resource Conflict"
-msgstr "మూలాధారంలో వైరుధ్యం. "
-
-#: ../libpurple/protocols/jabber/jabber.c:1927
-#: ../libpurple/protocols/silc/silc.c:244
-#: ../libpurple/protocols/silc10/ops.c:1720
-msgid "Connection Timeout"
-msgstr "కనెక్షన్ సమయం ముగిసింది. "
-
-#: ../libpurple/protocols/jabber/jabber.c:1929
-msgid "Host Gone"
-msgstr "హోస్ట వెళ్లిపోయినాడు. "
-
-# #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
-# gnome-session/gsm-client-row.c:43
-# #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
-# gnome-session/gsm-client-row.c:43
-#: ../libpurple/protocols/jabber/jabber.c:1931
-msgid "Host Unknown"
-msgstr "అజ్ఞాత హోస్ట్. "
-
-#: ../libpurple/protocols/jabber/jabber.c:1933
-msgid "Improper Addressing"
-msgstr "అనుచిత నివేదన. "
-
-#: ../libpurple/protocols/jabber/jabber.c:1937
-msgid "Invalid ID"
-msgstr "విలువలేని ID."
-
-#: ../libpurple/protocols/jabber/jabber.c:1939
-msgid "Invalid Namespace"
-msgstr "విలువలేని నేమ్‌స్పేస్. "
-
-#: ../libpurple/protocols/jabber/jabber.c:1941
-msgid "Invalid XML"
-msgstr "విలువలేని XML."
-
-#: ../libpurple/protocols/jabber/jabber.c:1943
-msgid "Non-matching Hosts"
-msgstr "నాన్-మాచింగ్ హోస్ట్స్"
-
-#: ../libpurple/protocols/jabber/jabber.c:1947
-msgid "Policy Violation"
-msgstr "నీతి ఉల్లంఘన "
-
-#  *< api_version
+#: ../libpurple/protocols/jabber/jabber.c:1964
+msgid "Remote Connection Failed"
+msgstr "రిమోట్ కనెక్షన్ వైఫల్యం "
+
+# *< api_version
 #  *< type
 #  *< ui_requirement
 #  *< flags
 #  *< dependencies
 #  *< priority
 #  *< id
-#: ../libpurple/protocols/jabber/jabber.c:1949
-msgid "Remote Connection Failed"
-msgstr "రిమోట్ కనెక్షన్ వైఫల్యం "
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-#: ../libpurple/protocols/jabber/jabber.c:1951
+#: ../libpurple/protocols/jabber/jabber.c:1966
 msgid "Resource Constraint"
 msgstr "మూలాధారానికి ఆటంకం "
 
-#: ../libpurple/protocols/jabber/jabber.c:1953
+#: ../libpurple/protocols/jabber/jabber.c:1968
 msgid "Restricted XML"
-msgstr "హద్దుల్లో XML"
-
-#: ../libpurple/protocols/jabber/jabber.c:1955
+msgstr "నియంత్రిత XML"
+
+#: ../libpurple/protocols/jabber/jabber.c:1970
 msgid "See Other Host"
 msgstr "మరో హోస్ట్‌ను చూడండి "
 
-#: ../libpurple/protocols/jabber/jabber.c:1957
+#: ../libpurple/protocols/jabber/jabber.c:1972
 msgid "System Shutdown"
-msgstr "సిస్టం షట్‌డౌన్."
-
-#: ../libpurple/protocols/jabber/jabber.c:1959
+msgstr "సిస్టం షట్‌డౌన్ అయింది"
+
+#: ../libpurple/protocols/jabber/jabber.c:1974
 msgid "Undefined Condition"
-msgstr "అజ్ఞాత పరిస్థితి. "
-
-#: ../libpurple/protocols/jabber/jabber.c:1961
+msgstr "అజ్ఞాత పరిస్థితి"
+
+#: ../libpurple/protocols/jabber/jabber.c:1976
 msgid "Unsupported Encoding"
-msgstr "సపోర్టులేని ఎన్‌కోడింగ్. "
-
-#: ../libpurple/protocols/jabber/jabber.c:1963
+msgstr "సపోర్టులేని ఎన్‌కోడింగ్"
+
+#: ../libpurple/protocols/jabber/jabber.c:1978
 msgid "Unsupported Stanza Type"
-msgstr "సపోర్టులేని పద్యపాదముల వలె "
-
-#: ../libpurple/protocols/jabber/jabber.c:1965
+msgstr "సపోర్టులేని స్టాంజాటైప్"
+
+#: ../libpurple/protocols/jabber/jabber.c:1980
 msgid "Unsupported Version"
 msgstr "సపోర్టులేని వెర్షన్ "
 
-#: ../libpurple/protocols/jabber/jabber.c:1967
+#: ../libpurple/protocols/jabber/jabber.c:1982
 msgid "XML Not Well Formed"
-msgstr "XMLను సరిగా రూపొందించలేదు. "
-
-#: ../libpurple/protocols/jabber/jabber.c:1969
+msgstr "XMLను సరిగా రూపొందించలేదు"
+
+#: ../libpurple/protocols/jabber/jabber.c:1984
 msgid "Stream Error"
-msgstr "ప్రవాహ పొరపాటు. "
-
-#: ../libpurple/protocols/jabber/jabber.c:2052
+msgstr "స్ట్రీమ్ పొరపాటు"
+
+#: ../libpurple/protocols/jabber/jabber.c:2069
 #, c-format
 msgid "Unable to ban user %s"
-msgstr "వినియోగదారుని %s నిషేధించుటకు అసమర్థత."
-
-#: ../libpurple/protocols/jabber/jabber.c:2072
-#, fuzzy, c-format
+msgstr "వినియోగదారు %s ను నిషేధించలేదు"
+
+#: ../libpurple/protocols/jabber/jabber.c:2089
+#, c-format
 msgid "Unknown affiliation: \"%s\""
-msgstr "అజ్ఞాత కమాండ్: %s"
-
-#: ../libpurple/protocols/jabber/jabber.c:2077
-#, fuzzy, c-format
+msgstr "అజ్ఞాత అనుసంధానం: \"%s\""
+
+#: ../libpurple/protocols/jabber/jabber.c:2094
+#, c-format
 msgid "Unable to affiliate user %s as \"%s\""
-msgstr "వినియోగదారుని ఆహ్వానించలేని అసమర్థత (%s)."
-
-#: ../libpurple/protocols/jabber/jabber.c:2096
-#, fuzzy, c-format
+msgstr "వినియోగదారు %s ను \"%s\" గా అనుసంధానించలేకపోతున్నాం"
+
+#: ../libpurple/protocols/jabber/jabber.c:2113
+#, c-format
 msgid "Unknown role: \"%s\""
-msgstr "అజ్ఞాత కమాండ్: %s"
-
-#: ../libpurple/protocols/jabber/jabber.c:2101
-#, fuzzy, c-format
+msgstr "అజ్ఞాత భూమిక: \"%s\""
+
+#: ../libpurple/protocols/jabber/jabber.c:2118
+#, c-format
 msgid "Unable to set role \"%s\" for user: %s"
-msgstr "సందేశం పంపడం సాధ్యంకాదు: %s"
-
-#: ../libpurple/protocols/jabber/jabber.c:2154
+msgstr "వినియోగదారు: %s కోసం \"%s\" పాత్రను సెట్ చేయలేకపోతున్నాం "
+
+#: ../libpurple/protocols/jabber/jabber.c:2171
 #, c-format
 msgid "Unable to kick user %s"
-msgstr "వినియోగదారుని %s తన్నలేని అసమర్థత. "
-
-#: ../libpurple/protocols/jabber/jabber.c:2185
-#, fuzzy, c-format
+msgstr "వినియోగదారు %s ను కిక్ చేయలేదు "
+
+#: ../libpurple/protocols/jabber/jabber.c:2202
+#, c-format
 msgid "Unable to ping user %s"
-msgstr "వినియోగదారుని %s నిషేధించుటకు అసమర్థత."
-
-#: ../libpurple/protocols/jabber/jabber.c:2207
-#: ../libpurple/protocols/jabber/jabber.c:2217
+msgstr "వినియోగదారు %s ను నిషేధించలేదు"
+
+#: ../libpurple/protocols/jabber/jabber.c:2220
+#: ../libpurple/protocols/jabber/jabber.c:2231
 #, c-format
 msgid "Unable to buzz, because there is nothing known about user %s."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2213
+#: ../libpurple/protocols/jabber/jabber.c:2226
 #, c-format
 msgid "Unable to buzz, because user %s might be offline."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2239
-#, fuzzy, c-format
-msgid "Unable to buzz, because the user %s does not support it."
-msgstr "ఎంపికచేసిన ఫైల్ (%s) అస్తిత్వంలో లేదు. అందుచేత శబ్దమును పలికించలేదు. "
-
-#: ../libpurple/protocols/jabber/jabber.c:2253
-msgid "config:  Configure a chat room."
-msgstr "కన్ఫిగరేషన్: ఒక సంభాషణ గదిని కన్ఫిగర్ చేయుము. "
-
 #: ../libpurple/protocols/jabber/jabber.c:2257
-msgid "configure:  Configure a chat room."
-msgstr "కన్ఫిగర్: సంభాషణ గదిని రూపొందించుము. "
-
-#: ../libpurple/protocols/jabber/jabber.c:2266
-msgid "part [room]:  Leave the room."
-msgstr "వదులుము [గది]: గదిని వీడి పొమ్ము. "
-
-#: ../libpurple/protocols/jabber/jabber.c:2271
-msgid "register:  Register with a chat room."
-msgstr "రిజిస్టర్: సంభాషణ గదితో రిజిస్టర్ చేసికొమ్ము."
-
-#: ../libpurple/protocols/jabber/jabber.c:2277
-msgid "topic [new topic]:  View or change the topic."
-msgstr "విషయం [కొత్త విషయం]: చానల్ విషయాన్ని దర్శించండి లేదా టాపిక్‌ను మార్చండి. "
-
-#: ../libpurple/protocols/jabber/jabber.c:2283
-msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
-msgstr "నిషేధం &lt;ఉపయోగకర్త&gt; [గది]:  ఒక వినియోగదారుని గదినుండి నిషేధించుము."
-
-#: ../libpurple/protocols/jabber/jabber.c:2289
-msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:2295
-msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:2301
-#, fuzzy
-msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
-msgstr "invite &lt;వినియోగదారుడు&gt; [గది]:  వినియోగదారుని గదిలోకి ఆహ్వానించుము."
-
-#: ../libpurple/protocols/jabber/jabber.c:2307
-msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
-msgstr "join: &lt;గది&gt; [సెర్వర్]:  ఈ సెర్వర్‌పై సంభాషణలో చేరండి."
+#, c-format
+msgid "Unable to buzz, because the user %s does not support it."
+msgstr "ఎంపికచేసిన ఫైల్ (%s) అస్తిత్వంలో లేదు. అందుచేత శబ్దమును పలికించలేదు. "
+
+#: ../libpurple/protocols/jabber/jabber.c:2279
+#: ../libpurple/protocols/yahoo/yahoo.c:4130
+#, fuzzy
+msgid "Buzz"
+msgstr "బజ్!!"
+
+#: ../libpurple/protocols/jabber/jabber.c:2280
+#: ../libpurple/protocols/jabber/message.c:308
+#: ../libpurple/protocols/yahoo/yahoo.c:4131
+#, c-format
+msgid "%s has buzzed you!"
+msgstr "%s మీకు [%s] ను చేర్చారు"
+
+#: ../libpurple/protocols/jabber/jabber.c:2281
+#: ../libpurple/protocols/yahoo/yahoo.c:4132
+#, c-format
+msgid "Buzzing %s..."
+msgstr ""
 
 #: ../libpurple/protocols/jabber/jabber.c:2313
+msgid "config:  Configure a chat room."
+msgstr "కన్ఫిగరేషన్:  సంభాషణ రూమ్ ను కన్ఫిగర్ చేయండి."
+
+#: ../libpurple/protocols/jabber/jabber.c:2317
+msgid "configure:  Configure a chat room."
+msgstr "కన్ఫిగర్: సంభాషణ రూమ్ ను కన్ఫిగర్ చేయండి. "
+
+#: ../libpurple/protocols/jabber/jabber.c:2326
+msgid "part [room]:  Leave the room."
+msgstr "part [room]: రూమ్ ను వదలండి.  "
+
+#: ../libpurple/protocols/jabber/jabber.c:2331
+msgid "register:  Register with a chat room."
+msgstr "నమోదు: సంభాషణ రూమ్ తో నమోదు చేసుకోండి."
+
+#: ../libpurple/protocols/jabber/jabber.c:2337
+msgid "topic [new topic]:  View or change the topic."
+msgstr "విషయం [కొత్త విషయం]: విషయాన్ని చూడండి లేదా  మార్చండి. "
+
+#: ../libpurple/protocols/jabber/jabber.c:2343
+msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
+msgstr "ban &lt;user&gt; [room]:   వినియోగదారును రూమ్ నుంచి  నిషేధించండి."
+
+#: ../libpurple/protocols/jabber/jabber.c:2349
+msgid "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's affiliation with the room."
+msgstr "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: రూమ్ తో వినియోగదారు అనుసంధానాన్ని సెట్ చేయండి."
+
+#: ../libpurple/protocols/jabber/jabber.c:2355
+msgid "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's role in the room."
+msgstr "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: వినియోగదారు పాత్రను రూమ్ తో సెట్ చేయండి."
+
+#: ../libpurple/protocols/jabber/jabber.c:2361
+msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
+msgstr "invite &lt;user&gt; [message]:  వినియోగదారును రూమ్ కు ఆహ్వానించండి."
+
+#: ../libpurple/protocols/jabber/jabber.c:2367
+msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
+msgstr "join: &lt;room&gt; [server]: ఈ సర్వర్‌పై సంభాషణలో చేరండి."
+
+#: ../libpurple/protocols/jabber/jabber.c:2373
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
-msgstr "kick &lt;వినియోగదారుడు&gt; [గది]:  ఒక వినియోగదారుని గదినుండి తన్ని తరిమేయండి."
-
-#: ../libpurple/protocols/jabber/jabber.c:2318
-msgid ""
-"msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
-msgstr "msg &lt;వినియోగదారుడు&gt; &lt;సందేశం&gt;:  మరో వినియోగదారునికి ప్రైవేట్ సందేశాన్నివ్వండి."
-
-#: ../libpurple/protocols/jabber/jabber.c:2324
+msgstr "kick &lt;user&gt; [room]:  వినియోగదారును రూమ్ నుంచి కిక్ చేయండి."
+
+#: ../libpurple/protocols/jabber/jabber.c:2378
+msgid "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
+msgstr "msg &lt;user&gt; &lt;message&gt;: మరో వినియోగదారుకు ప్రైవేట్ సందేశం పంపండి."
+
+#: ../libpurple/protocols/jabber/jabber.c:2384
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:2329
-#: ../libpurple/protocols/yahoo/yahoo.c:4145
-#, fuzzy
+#: ../libpurple/protocols/jabber/jabber.c:2389
+#: ../libpurple/protocols/yahoo/yahoo.c:4156
 msgid "buzz: Buzz a user to get their attention"
-msgstr "బజ్: ఒక కాంటాక్ట్‌కు బజ్ శబ్దం పంపండి. వారిని లక్ష్యాన్ని మీ వైపు మరలించండి.  "
-
+msgstr "బజ్: వినియోగదారు దృష్టిని ఆకట్టుకోవడానికి బజ్ పంపండి     "
+
+# *< type
+# *< ui_requirement
+# *< flags
+# *< dependencies
+# *< priority
+# *< id
+# *< name
+# *< version
+# *  summary
+# *  description
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6435,149 +6685,137 @@
 msgstr "MSN ప్రొటోకాల్ ప్లగ్‌ఇన్ "
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:202 ../pidgin/gtkaccount.c:506
+#: ../libpurple/protocols/jabber/libxmpp.c:205
+#: ../pidgin/gtkaccount.c:509
 #, fuzzy
 msgid "Domain"
 msgstr "రొమేనియన్ "
 
-#: ../libpurple/protocols/jabber/libxmpp.c:210
+#: ../libpurple/protocols/jabber/libxmpp.c:213
 msgid "Require SSL/TLS"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/libxmpp.c:214
-#, fuzzy
+#: ../libpurple/protocols/jabber/libxmpp.c:217
 msgid "Force old (port 5223) SSL"
-msgstr "Force old SSL"
-
-#: ../libpurple/protocols/jabber/libxmpp.c:219
+msgstr "Force old (port 5223) SSL"
+
+#: ../libpurple/protocols/jabber/libxmpp.c:222
 msgid "Allow plaintext auth over unencrypted streams"
-msgstr "రహస్యముకాని ప్రవాహముపై సాధారణ టెక్‌స్ట్‌ను అనుమతించుము. "
-
-#: ../libpurple/protocols/jabber/libxmpp.c:224
-#: ../libpurple/protocols/myspace/myspace.c:3277
-#: ../libpurple/protocols/simple/simple.c:1902
-#, fuzzy
+msgstr "ఎన్ క్రిప్టుకాని స్ట్రీమ్స్ పై ప్లెయిన్ టెక్ట్స్ ప్రమాణీకరణను అనుమతించండి"
+
+#: ../libpurple/protocols/jabber/libxmpp.c:227
+#: ../libpurple/protocols/myspace/myspace.c:3305
+#: ../libpurple/protocols/simple/simple.c:2089
 msgid "Connect port"
-msgstr "కనెక్ట్ "
-
+msgstr "పోర్ట్ కు కనెక్ట్ చేయండి"
+
+# Account options
 #. TODO: default to automatically try different ports. Make the user be
 #. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
-#: ../libpurple/protocols/jabber/libxmpp.c:228
-#: ../libpurple/protocols/myspace/myspace.c:3274
-#: ../libpurple/protocols/silc/silc.c:1914
-#: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
+#: ../libpurple/protocols/jabber/libxmpp.c:231
+#: ../libpurple/protocols/myspace/myspace.c:3302
+#: ../libpurple/protocols/silc/silc.c:2057
+#: ../libpurple/protocols/silc10/silc.c:1860
+#: ../pidgin/gtkaccount.c:840
 msgid "Connect server"
-msgstr "సెర్వర్‌ను కనెక్ట్ చేయుము. "
-
-#  Remove on type button
+msgstr "సర్వర్‌ను కనెక్ట్ చేయండి"
+
 #: ../libpurple/protocols/jabber/message.c:106
-#, fuzzy, c-format
+#, c-format
 msgid "%s has left the conversation."
-msgstr "%s ఈ సంభాషణకు ఆహ్వానించబడినారు."
-
-#: ../libpurple/protocols/jabber/message.c:161
+msgstr "%s తన సంభాషణను ముగించారు."
+
+#: ../libpurple/protocols/jabber/message.c:162
 #, c-format
 msgid "Message from %s"
-msgstr "%s నుండి సందేశం "
-
-#: ../libpurple/protocols/jabber/message.c:225
+msgstr "%s నుంచి సందేశం "
+
+#: ../libpurple/protocols/jabber/message.c:226
 #, c-format
 msgid "%s has set the topic to: %s"
-msgstr "%s ఈ విషయానికి టాపిక్‌ను సెట్ చేశాడు: %s"
-
-#: ../libpurple/protocols/jabber/message.c:227
+msgstr "%s:  కు%s విషయాన్ని  సెట్ చేశారు "
+
+#: ../libpurple/protocols/jabber/message.c:228
 #, c-format
 msgid "The topic is: %s"
 msgstr "విషయం: %s"
 
-#: ../libpurple/protocols/jabber/message.c:275
+#: ../libpurple/protocols/jabber/message.c:276
 #, c-format
 msgid "Message delivery to %s failed: %s"
-msgstr "%s కు సందేశం పంపడం విఫలమైంది: %s"
-
-#: ../libpurple/protocols/jabber/message.c:278
+msgstr "%s కు సందేశం పంపడంలో వైఫల్యం: %s"
+
+#: ../libpurple/protocols/jabber/message.c:279
 #, fuzzy
 msgid "XMPP Message Error"
-msgstr "Jabber Message పొరపాటు."
-
-#: ../libpurple/protocols/jabber/message.c:307
-#: ../libpurple/protocols/yahoo/yahoo.c:4120
-#, fuzzy, c-format
-msgid "%s has buzzed you!"
-msgstr "వినియోగదారుడు మిమ్మల్ని ఆటంకపర్చినాడు."
-
-#: ../libpurple/protocols/jabber/message.c:407
+msgstr "జాబర్ సందేశంలో పొరపాటు"
+
+#: ../libpurple/protocols/jabber/message.c:408
 #, c-format
 msgid " (Code %s)"
 msgstr " (కోడ్ %s)"
 
-#: ../libpurple/protocols/jabber/parser.c:196
+#: ../libpurple/protocols/jabber/parser.c:198
 msgid "XML Parse error"
-msgstr "XML పదవిభజనలో పొరపాటు. "
-
-#: ../libpurple/protocols/jabber/presence.c:427
+msgstr "XML పదవివరణలో పొరపాటు"
+
+#: ../libpurple/protocols/jabber/presence.c:435
 msgid "Unknown Error in presence"
-msgstr "ప్రత్యక్షంలో అజ్ఞాత పొరపాటు. "
-
-#: ../libpurple/protocols/jabber/presence.c:508
-#: ../libpurple/protocols/jabber/presence.c:509
-msgid "Create New Room"
-msgstr "కొత్త గదిని సృష్టించండి."
-
-#: ../libpurple/protocols/jabber/presence.c:510
-msgid ""
-"You are creating a new room.  Would you like to configure it, or accept the "
-"default settings?"
-msgstr ""
-"మీరు కొత్తగదిని సృష్టిస్తున్నారు. మీరు కన్ఫిగర్ చేయాలని కోరుకుంటున్నారా లేక డిఫాల్ట్ సెట్టింగులను "
-"ఆమోదిస్తున్నారా?"
+msgstr "అస్తిత్వంలో అజ్ఞాత పొరపాటు"
 
 #: ../libpurple/protocols/jabber/presence.c:516
-#, fuzzy
+#: ../libpurple/protocols/jabber/presence.c:517
+msgid "Create New Room"
+msgstr "కొత్త రూమ్ ను  సృష్టించండి"
+
+#: ../libpurple/protocols/jabber/presence.c:518
+msgid "You are creating a new room.  Would you like to configure it, or accept the default settings?"
+msgstr "మీరు కొత్తరూమ్ ను సృష్టిస్తున్నారు. దాన్ని కన్ఫిగర్ చేయాలా లేక డిఫాల్ట్ సెట్టింగులను ఆమోదిస్తున్నారా?"
+
+#: ../libpurple/protocols/jabber/presence.c:524
 msgid "_Configure Room"
-msgstr "Configure Room"
-
-#: ../libpurple/protocols/jabber/presence.c:517
-#, fuzzy
+msgstr "_కన్ఫిగర్ రూమ్"
+
+#: ../libpurple/protocols/jabber/presence.c:525
 msgid "_Accept Defaults"
-msgstr "డిఫాల్ట్స్‌ను ఆమోదించుము "
-
-#: ../libpurple/protocols/jabber/presence.c:559
+msgstr "_పొరపాట్లను ఆమోదించు "
+
+#: ../libpurple/protocols/jabber/presence.c:567
 #, c-format
 msgid "Error in chat %s"
-msgstr "సంభాషణలో %s పొరపాటు "
-
-#: ../libpurple/protocols/jabber/presence.c:563
+msgstr "సంభాషణ %sలో పొరపాటు "
+
+#: ../libpurple/protocols/jabber/presence.c:571
 #, c-format
 msgid "Error joining chat %s"
-msgstr "%s సంభాషణలో పాల్గొనుటలో పొరపాటు."
+msgstr "సంభాషణ %sలో పాల్గొనడంలో పొరపాటు"
 
 #: ../libpurple/protocols/jabber/si.c:775
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
-msgstr "ఫైలును %sకు పంపలేదు. వినియోగదారుడు ఫైల్ ట్రాన్స్‌ఫర్లను సపోర్టుచేయుట లేదు. "
+msgstr " %sకు ఫైలును పంపడంలో అశక్తత, ఫైలు బదిలీకి వినియోగదారు సహకారం లభించడంలేదు"
 
 #: ../libpurple/protocols/jabber/si.c:776
 #: ../libpurple/protocols/jabber/si.c:777
 #: ../libpurple/protocols/jabber/si.c:845
 msgid "File Send Failed"
-msgstr "ఫైల్ పంపడంలో వైఫల్యం. "
+msgstr "ఫైల్ ను పంపడంలో వైఫల్యం"
 
 #: ../libpurple/protocols/jabber/si.c:838
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send file to %s, invalid JID"
-msgstr "%s को संदेश भेजने में असमर्थ"
+msgstr "%s కు సందేశం పంపడంలో వైఫల్యం."
 
 #: ../libpurple/protocols/jabber/si.c:840
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send file to %s, user is not online"
-msgstr "ఫైలును %sకు పంపలేదు. వినియోగదారుడు ఫైల్ ట్రాన్స్‌ఫర్లను సపోర్టుచేయుట లేదు. "
+msgstr " %sకు ఫైలును పంపడంలో అశక్తత, ఫైలు బదిలీకి వినియోగదారు సహకారం లభించడంలేదు"
 
 #: ../libpurple/protocols/jabber/si.c:842
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
-msgstr "ఫైలును %sకు పంపలేదు. వినియోగదారుడు ఫైల్ ట్రాన్స్‌ఫర్లను సపోర్టుచేయుట లేదు. "
+msgstr " %sకు ఫైలును పంపడంలో అశక్తత, ఫైలు బదిలీకి వినియోగదారు సహకారం లభించడంలేదు"
 
 #: ../libpurple/protocols/jabber/si.c:857
 #, c-format
@@ -6589,783 +6827,871 @@
 msgid "Select a Resource"
 msgstr "ఫైలును సెలక్ట్ చేయుము."
 
-#: ../libpurple/protocols/jabber/usermood.c:179
-#: ../libpurple/protocols/jabber/usermood.c:180
+#: ../libpurple/protocols/jabber/usermood.c:197
+#: ../libpurple/protocols/jabber/usermood.c:198
 #, fuzzy
 msgid "Edit User Mood"
 msgstr "వినియోగదారుని మోడ్స్ "
 
-#: ../libpurple/protocols/jabber/usermood.c:181
+#: ../libpurple/protocols/jabber/usermood.c:199
 msgid "Please select your mood from the list."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/usermood.c:183
+#: ../libpurple/protocols/jabber/usermood.c:201
 #: ../libpurple/protocols/jabber/usernick.c:78
 #, fuzzy
 msgid "Set"
 msgstr "_సెట్ చేయండి"
 
-#: ../libpurple/protocols/jabber/usermood.c:191
+#: ../libpurple/protocols/jabber/usermood.c:209
 #, fuzzy
 msgid "Set Mood..."
-msgstr "ఫైలును సేవ్ చేయుము..."
+msgstr "ఫోల్డర్ ను ఎంపికచేయు..."
 
 #: ../libpurple/protocols/jabber/usernick.c:76
-#, fuzzy
 msgid "Set User Nickname"
-msgstr "వినియోగదారుని హద్దును సెట్ చేయుము. "
+msgstr ""
 
 #: ../libpurple/protocols/jabber/usernick.c:76
-#, fuzzy
 msgid "Please specify a new nickname for you."
-msgstr "సెలక్ట్ చేసిన గ్రూపుకు కొత్త పేరిమ్ము "
+msgstr ""
 
 #: ../libpurple/protocols/jabber/usernick.c:77
-msgid ""
-"This information is visible to all contacts on your contact list, so choose "
-"something appropriate."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/usernick.c:99
+msgid "This information is visible to all contacts on your contact list, so choose something appropriate."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usernick.c:100
 #, fuzzy
 msgid "Set Nickname..."
-msgstr "ఉపనామం "
-
-#  And now for the buttons
+msgstr "ముద్దుపేరు "
+
 #: ../libpurple/protocols/jabber/xdata.c:378
 #, fuzzy
 msgid "Actions"
-msgstr "ఖాతాలు"
+msgstr "చర్య"
 
 #: ../libpurple/protocols/jabber/xdata.c:380
 #, fuzzy
 msgid "Select an action"
 msgstr "ఫైలును సెలక్ట్ చేయుము."
 
-#: ../libpurple/protocols/msn/dialog.c:110
+#: ../libpurple/protocols/msn/contact.c:712
+#, fuzzy
+msgid "Unable to retrieve MSN Address Book"
+msgstr "నోట్స్ అడ్రస్ బుక్ ను ఎంపిక చేయండి"
+
+#: ../libpurple/protocols/msn/dialog.c:118
+#: ../libpurple/protocols/msnp9/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
-msgstr "%s లో మిత్రుల లిస్టును సమ్మిళితం చేయడంలో ఆవృత్తి (%s)"
-
-#: ../libpurple/protocols/msn/dialog.c:116
-#, c-format
-msgid ""
-"%s on the local list is inside the group \"%s\" but not on the server list. "
-"Do you want this buddy to be added?"
-msgstr ""
-"%s మీ స్థానిక లిస్టులో ఉన్నది \"%s\" కాని సెర్వర్ లిస్టులో లేదు. ఈ మిత్రుని మీరు లిస్టులో "
-"చేర్చదల్చుకున్నారా?"
+msgstr "%s (%s)లో మిత్రుల జాబితాను సమ్మిళితం చేసే విషయం"
 
 #: ../libpurple/protocols/msn/dialog.c:124
-#, c-format
-msgid ""
-"%s is on the local list but not on the server list. Do you want this buddy "
-"to be added?"
-msgstr "%s స్థానిక లిస్టులో ఉన్నది, కాని సెర్వర్‌లో లేదు. ఈ మిత్రుని మీరు లిస్టులో చేర్చదల్చుకున్నారా?"
+#: ../libpurple/protocols/msnp9/dialog.c:116
+#, c-format
+msgid "%s on the local list is inside the group \"%s\" but not on the server list. Do you want this buddy to be added?"
+msgstr "%s  స్థానిక జాబితాపై గ్రూప్ \"%s\"లో ఉంది కానీ సర్వర్ జాబితాలో లేదు. మీరు ఈ మిత్రుణ్ని చేర్చదల్చుకున్నారా?"
+
+#: ../libpurple/protocols/msn/dialog.c:132
+#: ../libpurple/protocols/msnp9/dialog.c:124
+#, c-format
+msgid "%s is on the local list but not on the server list. Do you want this buddy to be added?"
+msgstr "%s స్థానిక జాబితాలో ఉన్నది కానీ సర్వర్‌ జాబితాలో లేదు. మీరు మిత్రుణ్ని  చేర్చదల్చుకున్నారా?"
 
 #: ../libpurple/protocols/msn/error.c:36
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:36
 msgid "Unable to parse message"
-msgstr "సందేశాన్ని పద విశ్లేషణ చేయడంలో అసమర్థత."
+msgstr "సందేశాన్ని పద విశ్లేషణ చేయడంలో అశక్తత"
 
 #: ../libpurple/protocols/msn/error.c:41
-#, fuzzy, c-format
+#: ../libpurple/protocols/msnp9/error.c:41
 msgid "Syntax Error (probably a client bug)"
-msgstr "వాక్యవిన్యాసంలో పొరపాటు (గెయిమ్ పొరపాటు కావచ్చు)."
+msgstr "వాక్యవిన్యాసంలో పొరపాటు (క్లయింట్ బగ్ కావచ్చు)"
 
 #: ../libpurple/protocols/msn/error.c:46
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:46
 msgid "Invalid e-mail address"
-msgstr "విలువలేని ఇ-మెయిల్ అడ్రస్ "
+msgstr "చెల్లని ఇ-మెయిల్ అడ్రస్ "
 
 #: ../libpurple/protocols/msn/error.c:49
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:49
 msgid "User does not exist"
-msgstr "వినియోగదారుడు అస్తిత్వంలో లేడు."
+msgstr "వినియోగదారు అస్తిత్వంలో లేరు"
 
 #: ../libpurple/protocols/msn/error.c:53
-#, fuzzy, c-format
+#: ../libpurple/protocols/msnp9/error.c:53
 msgid "Fully qualified domain name missing"
-msgstr "పూర్తిగా అర్హతలు పొందిన డొమైన్ పేరు మిస్ అయినది."
+msgstr "పూర్తిగా అర్హమైన డొమైన్  పేరు అదృశ్యం"
 
 #: ../libpurple/protocols/msn/error.c:56
-#, fuzzy, c-format
+#: ../libpurple/protocols/msnp9/error.c:56
 msgid "Already logged in"
-msgstr "ముందే లాగ్ అయినది. "
+msgstr "ఇప్పటికే లాగ్ అయివున్నది "
 
 #: ../libpurple/protocols/msn/error.c:59
-#, fuzzy, c-format
+#: ../libpurple/protocols/msnp9/error.c:59
 msgid "Invalid screen name"
-msgstr "విలువలేని వినియోగదారుని పేరు. "
+msgstr "చెల్లుబాటుకాని స్క్రీన్ పేరు"
 
 #: ../libpurple/protocols/msn/error.c:62
-#, fuzzy, c-format
+#: ../libpurple/protocols/msnp9/error.c:62
 msgid "Invalid friendly name"
-msgstr "పనికిరాని మిత్రుని పేరు. "
+msgstr "చెల్లుబాటుకాని మిత్రుని పేరు"
 
 #: ../libpurple/protocols/msn/error.c:65
-#, fuzzy, c-format
+#: ../libpurple/protocols/msnp9/error.c:65
 msgid "List full"
-msgstr "పూర్తి లిస్టు "
+msgstr "జాబితా నిండింది "
 
 #: ../libpurple/protocols/msn/error.c:68
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:68
 msgid "Already there"
-msgstr "ఇంతకుమునుపే ఉన్నది. "
+msgstr "ఇంతకుమునుపే ఉన్నది"
 
 #: ../libpurple/protocols/msn/error.c:72
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:72
 msgid "Not on list"
-msgstr "లిస్టులో లేదు. "
+msgstr "జాబితా లో లేదు "
 
 #: ../libpurple/protocols/msn/error.c:75
+#: ../libpurple/protocols/msnp9/error.c:75
 #: ../libpurple/protocols/zephyr/zephyr.c:756
-#, c-format
 msgid "User is offline"
-msgstr "వినియోగదారుడు ఆఫ్‌లైన్‌లో ఉన్నాడు. "
+msgstr "వినియోగదారు ఆఫ్‌లైన్‌లో ఉన్నారు"
 
 #: ../libpurple/protocols/msn/error.c:78
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:78
 msgid "Already in the mode"
-msgstr "ముందే మోడ్‌లో ఉన్నారు."
+msgstr "ముందే మోడ్‌లో ఉన్నారు"
 
 #: ../libpurple/protocols/msn/error.c:82
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:82
 msgid "Already in opposite list"
-msgstr "ముందే వ్యతిరేక లిస్టులో ఉన్నారు."
+msgstr "ముందే వ్యతిరేక జాబితాలో ఉన్నారు"
 
 #: ../libpurple/protocols/msn/error.c:86
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:86
 msgid "Too many groups"
-msgstr "చాలా గ్రూపులున్నాయి. "
+msgstr "చాలా గ్రూపులున్నాయి"
 
 #: ../libpurple/protocols/msn/error.c:89
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:89
 msgid "Invalid group"
-msgstr "పనికిరాని గ్రూప్ "
+msgstr "చెల్లని గ్రూప్ "
 
 #: ../libpurple/protocols/msn/error.c:92
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:92
 msgid "User not in group"
-msgstr "వినియోగదారుడు గ్రూపులో లేడు.  "
+msgstr "వినియోగదారు గ్రూపులో లేరు "
 
 #: ../libpurple/protocols/msn/error.c:95
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:95
 msgid "Group name too long"
-msgstr "గ్రూప్ పేరు పెద్దదిగా ఉంది."
+msgstr "గ్రూప్ పేరు పెద్దదిగా ఉంది"
 
 #: ../libpurple/protocols/msn/error.c:98
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:98
 msgid "Cannot remove group zero"
-msgstr "సున్న గ్రూపును తొలిగించలేము."
+msgstr "సున్నా గ్రూపును తొలిగించలేము"
 
 #: ../libpurple/protocols/msn/error.c:103
-#, fuzzy, c-format
+#: ../libpurple/protocols/msnp9/error.c:103
 msgid "Tried to add a user to a group that doesn't exist"
-msgstr "అస్తిత్వంలోలేని గ్రూపును సంప్రదించుటకు ప్రయత్నించారు."
+msgstr "అస్తిత్వంలోలేని గ్రూపునకు వినియోగదారును చేర్చేయత్నం "
 
 #: ../libpurple/protocols/msn/error.c:107
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:107
 msgid "Switchboard failed"
 msgstr "స్విచ్‌బోర్డు వైఫల్యం "
 
 #: ../libpurple/protocols/msn/error.c:111
-#, fuzzy, c-format
+#: ../libpurple/protocols/msnp9/error.c:111
 msgid "Notify transfer failed"
-msgstr "ట్రాన్స్‌ఫర్ సూచన వైఫల్యం "
+msgstr "బదిలీ వైఫల్యాన్ని సూచించు "
 
 #: ../libpurple/protocols/msn/error.c:116
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:116
 msgid "Required fields missing"
-msgstr "కావలసిన క్షేత్రాలు మిస్ అయినవి."
+msgstr "కావలసిన క్షేత్రాలు అదృశ్యం "
 
 #: ../libpurple/protocols/msn/error.c:120
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:120
 msgid "Too many hits to a FND"
-msgstr "ఒక FND కి అనేక దెబ్బలు "
+msgstr " FND కి అనేక హిట్స్ ఉన్నాయి "
 
 #: ../libpurple/protocols/msn/error.c:124
+#: ../libpurple/protocols/msnp9/error.c:124
 #: ../libpurple/protocols/oscar/oscar.c:120
-#, c-format
 msgid "Not logged in"
-msgstr "లాగ్ ఇన్ చేయలేదు."
+msgstr "లాగ్ ఇన్ చేయలేదు"
 
 #: ../libpurple/protocols/msn/error.c:128
-#, fuzzy, c-format
+#: ../libpurple/protocols/msnp9/error.c:128
 msgid "Service temporarily unavailable"
-msgstr "సర్వీస్ తాత్కాలికంగా లభించడంలేదు. "
+msgstr "సర్వీస్ తాత్కాలికంగా అందుబాటులో లేదు "
 
 #: ../libpurple/protocols/msn/error.c:131
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:131
 msgid "Database server error"
-msgstr "డాటాబేస్ సెర్వర్ పొరపాటు. "
+msgstr "డాటాబేస్ సర్వర్ లో పొరపాటు"
 
 #: ../libpurple/protocols/msn/error.c:135
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:135
 msgid "Command disabled"
-msgstr "కమాండ్ అశక్తమొనర్చబడినది."
+msgstr "కమాండ్ పని చేయడం లేదు"
 
 #: ../libpurple/protocols/msn/error.c:139
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:139
 msgid "File operation error"
-msgstr "ఫైల్ నిర్వహణలో పొరపాటు. "
+msgstr "ఫైలు నిర్వహణలో పొరపాటు"
 
 #: ../libpurple/protocols/msn/error.c:143
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:143
 msgid "Memory allocation error"
-msgstr "మెమొరీ విభాగ నిర్ణయంలో పొరపాటు. "
+msgstr "మెమొరీ కేటాయింపులో  పొరపాటు "
 
 #: ../libpurple/protocols/msn/error.c:147
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:147
 msgid "Wrong CHL value sent to server"
-msgstr "CHL విలువ పొరపాటుగా సెర్వర్‌కు పంపబడింది."
+msgstr "సర్వర్‌కు తప్పుడు CHL విలువ   పంపబడింది"
 
 #: ../libpurple/protocols/msn/error.c:152
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:152
 msgid "Server busy"
-msgstr "సెర్వర్‌ కాళీగా లేదు. "
+msgstr "సర్వర్‌ ఖాళీగా లేదు"
 
 #: ../libpurple/protocols/msn/error.c:155
 #: ../libpurple/protocols/msn/error.c:170
 #: ../libpurple/protocols/msn/error.c:230
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:155
+#: ../libpurple/protocols/msnp9/error.c:170
+#: ../libpurple/protocols/msnp9/error.c:230
 msgid "Server unavailable"
-msgstr "సెర్వర్ లభించుటలేదు."
-
-#  ---------- "Notification Methods" ----------
+msgstr "సర్వర్ అందుబాటులో లేదు"
+
+# ---------- "Notification Methods" ----------
 #: ../libpurple/protocols/msn/error.c:158
-#, fuzzy, c-format
+#: ../libpurple/protocols/msnp9/error.c:158
 msgid "Peer notification server down"
-msgstr "Peer Notification సెర్వర్ డౌన్."
+msgstr "పీర్ నోటిఫికేషన్ సర్వర్ డౌన్ లో ఉంది"
 
 #: ../libpurple/protocols/msn/error.c:162
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:162
 msgid "Database connect error"
-msgstr "డాటాబేస్ కనెక్షన్‌లో పొరపాటు. "
+msgstr "డాటాబేస్ కనెక్షన్‌లో పొరపాటు"
 
 #: ../libpurple/protocols/msn/error.c:167
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:167
 msgid "Server is going down (abandon ship)"
-msgstr "సెర్వర్ ఆగబోతున్నది (నావను విడిచిపెట్టుము)."
+msgstr "సర్వర్ ఆగబోతున్నది (abandon ship)"
 
 #: ../libpurple/protocols/msn/error.c:174
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:174
 msgid "Error creating connection"
-msgstr "కనెక్షన్ సృష్టిలో పొరపాటు. "
+msgstr "కనెక్షన్ ఏర్పాటులో పొరపాటు"
 
 #: ../libpurple/protocols/msn/error.c:179
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:179
 msgid "CVR parameters are either unknown or not allowed"
-msgstr "CVR పేరామీటర్లు తెలియవు లేదా అనుమతించబడవు."
+msgstr "CVR పరిధులు తెలియవు లేదా వాటికి అనుమతిలేదు"
 
 #: ../libpurple/protocols/msn/error.c:183
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:183
 msgid "Unable to write"
-msgstr "వ్రాయడానికి అసమర్థత "
+msgstr "రైట్ చేయడంలో అశక్తత"
 
 #: ../libpurple/protocols/msn/error.c:186
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:186
 msgid "Session overload"
-msgstr "సెషన్ ఓవర్‌లోడ్ అయినది."
+msgstr "సెషన్ ఓవర్‌లోడ్ అయినది"
 
 #: ../libpurple/protocols/msn/error.c:190
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:190
 msgid "User is too active"
-msgstr "వినియోగదారుడు మంచి హుషారుగా ఉన్నాడు."
+msgstr "వినియోగదారు  క్రియాశీలముగా ఉన్నారు"
 
 #: ../libpurple/protocols/msn/error.c:193
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:193
 msgid "Too many sessions"
-msgstr "చాలా సెషన్లు "
+msgstr " సెషన్లు చాలా "
 
 #: ../libpurple/protocols/msn/error.c:196
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:196
 msgid "Passport not verified"
-msgstr "పాస్‌పోర్టును వెరిఫై చేయలేదు."
+msgstr "పాస్‌పోర్టును పరిశీలించలేదు "
 
 #: ../libpurple/protocols/msn/error.c:199
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:199
 msgid "Bad friend file"
-msgstr "అబద్ధపు మిత్రుని ఫైల్."
+msgstr " మిత్రుని ఫైలు సరిగాలేదు"
 
 #: ../libpurple/protocols/msn/error.c:203
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:203
 msgid "Not expected"
-msgstr "ఆశించలేదు."
+msgstr "ఆశించినది కాదు "
 
 #: ../libpurple/protocols/msn/error.c:209
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:209
 msgid "Friendly name changes too rapidly"
-msgstr "స్నేహపాత్రమైన పేరు అతి త్వరగా మారుతుంది."
+msgstr "స్నేహపాత్రమైన పేరు  త్వరగా మారుతోంది"
 
 #: ../libpurple/protocols/msn/error.c:218
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:218
 msgid "Server too busy"
-msgstr "సెర్వర్‌కు కాళీ లేదు."
+msgstr "సర్వర్‌ ఖాళీ లేదు"
 
 #: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1380
-#: ../libpurple/protocols/silc/silc.c:233
+#: ../libpurple/protocols/msnp9/error.c:222
+#: ../libpurple/protocols/oscar/oscar.c:1377
+#: ../libpurple/protocols/silc/silc.c:338
 #: ../libpurple/protocols/silc10/ops.c:1709
-#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1380
-#, c-format
+#: ../libpurple/protocols/toc/toc.c:728
+#: ../libpurple/proxy.c:1393
 msgid "Authentication failed"
 msgstr "ప్రమాణీకరణ వైఫల్యం "
 
 #: ../libpurple/protocols/msn/error.c:225
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:225
 msgid "Not allowed when offline"
-msgstr "మీరు ఆఫ్‌లైన్‌లో ఉన్నప్పుడు అనుమతి లేదు."
+msgstr "ఆఫ్‌లైన్‌లో ఉన్నప్పుడు అనుమతి లేదు"
 
 #: ../libpurple/protocols/msn/error.c:233
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:233
 msgid "Not accepting new users"
-msgstr "కొత్త వినియోగదారులను అంగీకరించుట లేదు. "
+msgstr "కొత్త వినియోగదారులను అంగీకరించడం లేదు"
 
 #: ../libpurple/protocols/msn/error.c:237
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:237
 msgid "Kids Passport without parental consent"
-msgstr "తల్లిదండ్రుల ఆమోదం లేకుండా పిల్లలకు పాస్‌పోర్టు "
+msgstr "తల్లిదండ్రుల ఆమోదం లేకుండా పిల్లల పాస్‌పోర్టు "
 
 #: ../libpurple/protocols/msn/error.c:241
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:241
 msgid "Passport account not yet verified"
-msgstr "పాస్‌పోర్టు ఎకౌంట్‌ను ఇంకా వెరిఫై చేయలేదు. "
+msgstr "పాస్‌పోర్టు అకౌంట్‌ను ఇంకా పరిశీలించలేదు "
 
 #: ../libpurple/protocols/msn/error.c:244
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:244
 msgid "Bad ticket"
-msgstr "పనికిరాని టికెట్ "
+msgstr "టికెట్ సరైనది కాదు"
 
 #: ../libpurple/protocols/msn/error.c:249
+#: ../libpurple/protocols/msnp9/error.c:249
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "అజ్ఞాత పొరపాటు కోడ్  %d"
 
 #: ../libpurple/protocols/msn/error.c:263
+#: ../libpurple/protocols/msnp9/error.c:263
 #, c-format
 msgid "MSN Error: %s\n"
-msgstr "MSN Error: %s\n"
+msgstr "MSN పొరపాటు: %s\n"
 
 #: ../libpurple/protocols/msn/msn.c:130
+#: ../libpurple/protocols/msnp9/msn.c:130
 msgid "Nudge"
 msgstr ""
 
 #: ../libpurple/protocols/msn/msn.c:131
-#, fuzzy, c-format
+#: ../libpurple/protocols/msnp9/msn.c:131
+#, c-format
 msgid "%s has nudged you!"
-msgstr "%s దూరం వెళ్లిపోయినారు."
+msgstr "%s మీకు [%s] ను చేర్చారు"
 
 #: ../libpurple/protocols/msn/msn.c:132
+#: ../libpurple/protocols/msnp9/msn.c:132
 #, c-format
 msgid "Nudging %s..."
 msgstr ""
 
 #: ../libpurple/protocols/msn/msn.c:174
+#: ../libpurple/protocols/msnp9/msn.c:174
 msgid "Your new MSN friendly name is too long."
-msgstr "మీ MSN స్నేహశీల పేరు చాలా పొడవుగా ఉంది. "
-
-#: ../libpurple/protocols/msn/msn.c:282
+msgstr "మీ కొత్త MSN స్నేహపూర్వక పేరు చాలా పొడవుగా ఉంది. "
+
+#: ../libpurple/protocols/msn/msn.c:286
+#: ../libpurple/protocols/msnp9/msn.c:282
 msgid "Set your friendly name."
-msgstr "మీ స్నేహశీల పేరును సెట్ చేయండి."
-
-#: ../libpurple/protocols/msn/msn.c:283
+msgstr "మీ స్నేహ పూర్వక పేరును సెట్ చేయండి."
+
+#: ../libpurple/protocols/msn/msn.c:287
+#: ../libpurple/protocols/msnp9/msn.c:283
 msgid "This is the name that other MSN buddies will see you as."
-msgstr "ఇతర MSN మిత్రులు మిమ్మల్ని ఈ పేరుతో పిలుస్తారు."
-
-#: ../libpurple/protocols/msn/msn.c:301
+msgstr "ఇతర MSN మిత్రులు మిమ్మల్ని పిలిచే పేరు ఇది."
+
+#: ../libpurple/protocols/msn/msn.c:305
+#: ../libpurple/protocols/msnp9/msn.c:301
 msgid "Set your home phone number."
 msgstr "మీ ఇంటి ఫోన్ నెంబరును సెట్ చేయండి."
 
-#: ../libpurple/protocols/msn/msn.c:318
+#: ../libpurple/protocols/msn/msn.c:322
+#: ../libpurple/protocols/msnp9/msn.c:318
 msgid "Set your work phone number."
 msgstr "మీ వర్క్ ఫోన్ నెంబరును సెట్ చేయండి."
 
-#: ../libpurple/protocols/msn/msn.c:335
+#: ../libpurple/protocols/msn/msn.c:339
+#: ../libpurple/protocols/msnp9/msn.c:335
 msgid "Set your mobile phone number."
 msgstr "మీ మొబైల్ ఫోన్ నెంబరును సెట్ చేయండి."
 
-#: ../libpurple/protocols/msn/msn.c:350
+#: ../libpurple/protocols/msn/msn.c:354
+#: ../libpurple/protocols/msnp9/msn.c:350
 msgid "Allow MSN Mobile pages?"
 msgstr "MSN Mobile పేజీలను అనుమతిస్తారా?"
 
-#: ../libpurple/protocols/msn/msn.c:351
-msgid ""
-"Do you want to allow or disallow people on your buddy list to send you MSN "
-"Mobile pages to your cell phone or other mobile device?"
-msgstr ""
-"MSN Mobile పేజీలను మీ సెల్‌ఫోనుకు పంపడానికి లేదా ఇతర మొబైల్ పరికరానికి పంపడానికి ప్రజలను మీ మిత్రుల "
-"లిస్టులో అనుమతిస్తారా?"
-
-#: ../libpurple/protocols/msn/msn.c:357
+#: ../libpurple/protocols/msn/msn.c:355
+#: ../libpurple/protocols/msnp9/msn.c:351
+msgid "Do you want to allow or disallow people on your buddy list to send you MSN Mobile pages to your cell phone or other mobile device?"
+msgstr "MSN Mobile పేజీలను మీ సెల్‌ఫోనుకు లేదా ఇతర మొబైల్ పరికరానికి పంపడానికి  మీ మిత్రుల జాబితాలో ఉన్నవారికి అనుమతించదలచుకున్నారా, లేదా?"
+
+#: ../libpurple/protocols/msn/msn.c:361
+#: ../libpurple/protocols/msnp9/msn.c:357
 msgid "Allow"
 msgstr "అనుమతించు"
 
-#: ../libpurple/protocols/msn/msn.c:358
+#: ../libpurple/protocols/msn/msn.c:362
+#: ../libpurple/protocols/msnp9/msn.c:358
 msgid "Disallow"
 msgstr "నిరాకరించు"
 
-#: ../libpurple/protocols/msn/msn.c:374
+#: ../libpurple/protocols/msn/msn.c:378
+#: ../libpurple/protocols/msnp9/msn.c:374
 msgid "This Hotmail account may not be active."
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:400
+msgstr "ఈ హాట్ మెయిల్ అకౌంటు సచేతనంగా లేకపోవచ్చు."
+
+#: ../libpurple/protocols/msn/msn.c:404
+#: ../libpurple/protocols/msnp9/msn.c:400
 msgid "Send a mobile message."
 msgstr "ఒక మొబైల్ సందేశాన్ని పంపండి. "
 
-#: ../libpurple/protocols/msn/msn.c:402
+#: ../libpurple/protocols/msn/msn.c:406
+#: ../libpurple/protocols/msnp9/msn.c:402
 msgid "Page"
 msgstr "పేజీ "
 
-#: ../libpurple/protocols/msn/msn.c:549
-msgid "Has you"
-msgstr "మీరు "
-
-#: ../libpurple/protocols/msn/msn.c:579 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:3077
-#: ../libpurple/protocols/yahoo/yahoo.c:3761
+#: ../libpurple/protocols/msn/msn.c:688
+#: ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/msnp9/msn.c:583
+#: ../libpurple/protocols/msnp9/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:3088
+#: ../libpurple/protocols/yahoo/yahoo.c:3772
 msgid "Be Right Back"
 msgstr "కొద్ది సమయంలో మరలి వచ్చు "
 
-#: ../libpurple/protocols/msn/msn.c:583 ../libpurple/protocols/msn/state.c:31
-#: ../libpurple/protocols/novell/novell.c:2822
-#: ../libpurple/protocols/novell/novell.c:2952
-#: ../libpurple/protocols/silc/buddy.c:1480
+# type = gaim_status_type_new_with_attrs(GAIM_STATUS_UNAVAILABLE, "not-available", "Not Available",
+# TRUE, TRUE, FALSE, "message", _("Message"),
+# gaim_value_new(GAIM_TYPE_STRING), NULL);
+# types = g_list_append(types, type);
+#: ../libpurple/protocols/msn/msn.c:694
+#: ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/msnp9/msn.c:587
+#: ../libpurple/protocols/msnp9/state.c:31
+#: ../libpurple/protocols/novell/novell.c:2839
+#: ../libpurple/protocols/novell/novell.c:2969
+#: ../libpurple/protocols/silc/buddy.c:1483
 #: ../libpurple/protocols/silc/silc.c:56
-#: ../libpurple/protocols/silc10/buddy.c:1480
+#: ../libpurple/protocols/silc10/buddy.c:1483
 #: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:3079
-#: ../libpurple/protocols/yahoo/yahoo.c:3764
+#: ../libpurple/protocols/yahoo/yahoo.c:3090
+#: ../libpurple/protocols/yahoo/yahoo.c:3775
 msgid "Busy"
-msgstr "కాళీ లేదు."
-
-#: ../libpurple/protocols/msn/msn.c:587
-#: ../libpurple/protocols/yahoo/yahoo.c:3087
-#: ../libpurple/protocols/yahoo/yahoo.c:3776
+msgstr "ఖాళీ లేదు"
+
+#: ../libpurple/protocols/msn/msn.c:699
+#: ../libpurple/protocols/msnp9/msn.c:591
+#: ../libpurple/protocols/yahoo/yahoo.c:3098
+#: ../libpurple/protocols/yahoo/yahoo.c:3787
 #, fuzzy
 msgid "On the Phone"
 msgstr "ఫోనులో "
 
-#: ../libpurple/protocols/msn/msn.c:591
-#: ../libpurple/protocols/yahoo/yahoo.c:3091
-#: ../libpurple/protocols/yahoo/yahoo.c:3782
-#, fuzzy
+#: ../libpurple/protocols/msn/msn.c:704
+#: ../libpurple/protocols/msnp9/msn.c:595
+#: ../libpurple/protocols/yahoo/yahoo.c:3102
+#: ../libpurple/protocols/yahoo/yahoo.c:3793
 msgid "Out to Lunch"
-msgstr " మధ్యాహ్న భోజనానికి వెళ్లినారు."
-
-#: ../libpurple/protocols/msn/msn.c:619
-#, fuzzy
+msgstr "లంచ్ కు  వెళ్లారు"
+
+#: ../libpurple/protocols/msn/msn.c:723
+#, fuzzy
+msgid "Artist"
+msgstr "ఆర్టిస్టులు"
+
+#: ../libpurple/protocols/msn/msn.c:724
+#, fuzzy
+msgid "Album"
+msgstr "Adium"
+
+#: ../libpurple/protocols/msn/msn.c:742
+#: ../libpurple/protocols/msnp9/msn.c:623
 msgid "Set Friendly Name..."
-msgstr "స్నేహమయ పేరు "
-
-#: ../libpurple/protocols/msn/msn.c:624
+msgstr "ఇష్టపడే పేరు "
+
+#: ../libpurple/protocols/msn/msn.c:747
+#: ../libpurple/protocols/msnp9/msn.c:628
 #, fuzzy
 msgid "Set Home Phone Number..."
 msgstr "ఇంటి ఫోన్ నెంబరును సెట్ చేయండి."
 
-#: ../libpurple/protocols/msn/msn.c:628
+#: ../libpurple/protocols/msn/msn.c:751
+#: ../libpurple/protocols/msnp9/msn.c:632
 #, fuzzy
 msgid "Set Work Phone Number..."
 msgstr "వర్క్ ఫోన్ నెంబరును సెట్ చేయండి."
 
-#: ../libpurple/protocols/msn/msn.c:632
+#: ../libpurple/protocols/msn/msn.c:755
+#: ../libpurple/protocols/msnp9/msn.c:636
 #, fuzzy
 msgid "Set Mobile Phone Number..."
 msgstr "మొబైల్ ఫోన్ నెంబరును సెట్ చేయండి."
 
-#: ../libpurple/protocols/msn/msn.c:638
-#, fuzzy
+#: ../libpurple/protocols/msn/msn.c:761
+#: ../libpurple/protocols/msnp9/msn.c:642
 msgid "Enable/Disable Mobile Devices..."
-msgstr "మొబైల్ సర్వీసులను ఎనేబుల్/డిజేబుల్ చేయు "
-
-#: ../libpurple/protocols/msn/msn.c:643
-#, fuzzy
+msgstr "మొబైల్ పరికరాలను పని చేయించడం/పని చేయించకపోవడం "
+
+#: ../libpurple/protocols/msn/msn.c:766
+#: ../libpurple/protocols/msnp9/msn.c:647
 msgid "Allow/Disallow Mobile Pages..."
-msgstr "మొబైల్ పేజీలు అనుమతించు/నిరాకరించు"
-
-#: ../libpurple/protocols/msn/msn.c:654
+msgstr "మొబైల్ పేజీలను అనుమతించడం/నిరాకరించడం"
+
+#: ../libpurple/protocols/msn/msn.c:777
+#: ../libpurple/protocols/msnp9/msn.c:658
 msgid "Open Hotmail Inbox"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:678
+msgstr "హాట్ మెయిల్ ఇన్ బాక్స్ ను తెరవండి."
+
+#: ../libpurple/protocols/msn/msn.c:801
+#: ../libpurple/protocols/msnp9/msn.c:682
 msgid "Send to Mobile"
-msgstr "మొబైల్‌కు పంపండి."
-
-#: ../libpurple/protocols/msn/msn.c:688
-#: ../libpurple/protocols/novell/novell.c:3408
+msgstr "మొబైల్‌కు పంపండి"
+
+#: ../libpurple/protocols/msn/msn.c:811
+#: ../libpurple/protocols/msnp9/msn.c:692
+#: ../libpurple/protocols/novell/novell.c:3425
 msgid "Initiate _Chat"
-msgstr "_సంభాషణను ప్రారంభించండి."
-
-#: ../libpurple/protocols/msn/msn.c:726
-#, fuzzy
+msgstr "_సంభాషణను ప్రారంభించండి"
+
+#: ../libpurple/protocols/msn/msn.c:849
+#: ../libpurple/protocols/msnp9/msn.c:731
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
-msgstr ""
-"MSNకు SSL సపోర్టు అవసరం. దయచేసి సపోర్టుచేసిన SSL libraryని ఇన్‌స్టాల్ చేయండి. ఇతర వివరములకు "
-"http://gaim.sf.net/faq-ssl.php దర్శించండి. "
-
-#: ../libpurple/protocols/msn/msn.c:754
+msgstr "MSNకోసం SSL సహకారం అవసరం. దయచేసి సహకరించే SSL లైబ్రరీని ఏర్పాటు చేయండి."
+
+#: ../libpurple/protocols/msn/msn.c:879
+#: ../libpurple/protocols/msnp9/msn.c:761
 msgid "Failed to connect to server."
-msgstr "సెర్వర్‌కు కనెక్ట్ చేయడంలో వైఫల్యం. "
-
-#: ../libpurple/protocols/msn/msn.c:1510 ../libpurple/protocols/msn/msn.c:1858
+msgstr "సర్వర్‌కు కనెక్ట్ చేయడంలో వైఫల్యం. "
+
+#: ../libpurple/protocols/msn/msn.c:1663
+#: ../libpurple/protocols/msn/msn.c:2006
+#: ../libpurple/protocols/msnp9/msn.c:1516
+#: ../libpurple/protocols/msnp9/msn.c:1859
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
-msgstr "ప్రొఫైల్‌ను బయటకు తీసుకురావడంలో పొరపాటు."
-
-#: ../libpurple/protocols/msn/msn.c:1581 ../pidgin/plugins/convcolors.c:309
-#: ../pidgin/plugins/pidginrc.c:366
-#, fuzzy
+msgstr "ప్రొఫైల్‌ను బయటకు తీసుకురావడంలో పొరపాటు"
+
+#: ../libpurple/protocols/msn/msn.c:1729
+#: ../libpurple/protocols/msnp9/msn.c:1582
+#: ../pidgin/plugins/convcolors.c:309
+#: ../pidgin/plugins/pidginrc.c:360
 msgid "General"
-msgstr "లింగము"
-
-#: ../libpurple/protocols/msn/msn.c:1588
-#: ../libpurple/protocols/myspace/user.c:110
-#: ../libpurple/protocols/oscar/oscar.c:3755
+msgstr "సాధారణ"
+
+#: ../libpurple/protocols/msn/msn.c:1736
+#: ../libpurple/protocols/msnp9/msn.c:1589
+#: ../libpurple/protocols/myspace/user.c:115
+#: ../libpurple/protocols/oscar/oscar.c:3765
 #: ../libpurple/protocols/qq/buddy_info.c:45
-#: ../libpurple/protocols/qq/qq.c:221
+#: ../libpurple/protocols/qq/qq.c:222
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "వయసు "
 
-#: ../libpurple/protocols/msn/msn.c:1590
+#: ../libpurple/protocols/msn/msn.c:1738
+#: ../libpurple/protocols/msnp9/msn.c:1591
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr "వృత్తి"
 
-#: ../libpurple/protocols/msn/msn.c:1591
-#: ../libpurple/protocols/myspace/user.c:119
-#: ../libpurple/protocols/novell/novell.c:1478
+#: ../libpurple/protocols/msn/msn.c:1739
+#: ../libpurple/protocols/msnp9/msn.c:1592
+#: ../libpurple/protocols/myspace/user.c:123
+#: ../libpurple/protocols/novell/novell.c:1487
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
 #: ../libpurple/protocols/zephyr/zephyr.c:798
 #: ../libpurple/protocols/zephyr/zephyr.c:1215
 msgid "Location"
 msgstr "ప్రదేశం"
 
-#: ../libpurple/protocols/msn/msn.c:1596 ../libpurple/protocols/msn/msn.c:1788
-#: ../libpurple/protocols/msn/msn.c:1794 ../libpurple/protocols/msn/msn.c:1801
+#: ../libpurple/protocols/msn/msn.c:1744
+#: ../libpurple/protocols/msn/msn.c:1936
+#: ../libpurple/protocols/msn/msn.c:1942
+#: ../libpurple/protocols/msn/msn.c:1949
+#: ../libpurple/protocols/msnp9/msn.c:1597
+#: ../libpurple/protocols/msnp9/msn.c:1789
+#: ../libpurple/protocols/msnp9/msn.c:1795
+#: ../libpurple/protocols/msnp9/msn.c:1802
 msgid "Hobbies and Interests"
 msgstr "అభిరుచులు మరియు అభిలాషలు"
 
-#: ../libpurple/protocols/msn/msn.c:1602 ../libpurple/protocols/msn/msn.c:1722
-#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1735
-#: ../libpurple/protocols/msn/msn.c:1743 ../libpurple/protocols/msn/msn.c:1750
+#: ../libpurple/protocols/msn/msn.c:1750
+#: ../libpurple/protocols/msn/msn.c:1870
+#: ../libpurple/protocols/msn/msn.c:1876
+#: ../libpurple/protocols/msn/msn.c:1883
+#: ../libpurple/protocols/msn/msn.c:1891
+#: ../libpurple/protocols/msn/msn.c:1898
+#: ../libpurple/protocols/msnp9/msn.c:1603
+#: ../libpurple/protocols/msnp9/msn.c:1723
+#: ../libpurple/protocols/msnp9/msn.c:1729
+#: ../libpurple/protocols/msnp9/msn.c:1736
+#: ../libpurple/protocols/msnp9/msn.c:1744
+#: ../libpurple/protocols/msnp9/msn.c:1751
 msgid "A Little About Me"
-msgstr "నా గురించి కొంచెం "
-
-#: ../libpurple/protocols/msn/msn.c:1619
+msgstr "నా గురించి కొద్దిగా "
+
+#: ../libpurple/protocols/msn/msn.c:1767
+#: ../libpurple/protocols/msnp9/msn.c:1620
 msgid "Social"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:1621
+msgstr "సామాజిక"
+
+#: ../libpurple/protocols/msn/msn.c:1769
+#: ../libpurple/protocols/msnp9/msn.c:1622
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "వివాహమైనదా లేదా"
 
-#: ../libpurple/protocols/msn/msn.c:1622
-#, fuzzy
+#: ../libpurple/protocols/msn/msn.c:1770
+#: ../libpurple/protocols/msnp9/msn.c:1623
 msgid "Interests"
-msgstr "_చేర్చండి."
-
-#: ../libpurple/protocols/msn/msn.c:1623
-#, fuzzy
+msgstr "అభిరుచులు"
+
+#: ../libpurple/protocols/msn/msn.c:1771
+#: ../libpurple/protocols/msnp9/msn.c:1624
 msgid "Pets"
-msgstr "పోర్ట్స్ "
-
-# #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
-# gnome-session/gsm-client-row.c:43
-# #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
-# gnome-session/gsm-client-row.c:43
-#: ../libpurple/protocols/msn/msn.c:1624
-#, fuzzy
+msgstr "పెంపుడు ప్రాణులు"
+
+#: ../libpurple/protocols/msn/msn.c:1772
+#: ../libpurple/protocols/msnp9/msn.c:1625
 msgid "Hometown"
-msgstr "అజ్ఞాత హోస్ట్. "
-
-#: ../libpurple/protocols/msn/msn.c:1625
+msgstr "స్వంత ఊరు"
+
+#: ../libpurple/protocols/msn/msn.c:1773
+#: ../libpurple/protocols/msnp9/msn.c:1626
 msgid "Places Lived"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:1626
+msgstr "నివసించిన ప్రదేశాలు"
+
+#: ../libpurple/protocols/msn/msn.c:1774
+#: ../libpurple/protocols/msnp9/msn.c:1627
 msgid "Fashion"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:1627
+msgstr "ఫ్యాషన్"
+
+#: ../libpurple/protocols/msn/msn.c:1775
+#: ../libpurple/protocols/msnp9/msn.c:1628
 msgid "Humor"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:1628
+msgstr "హాస్యం"
+
+#: ../libpurple/protocols/msn/msn.c:1776
+#: ../libpurple/protocols/msnp9/msn.c:1629
 msgid "Music"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:1629 ../libpurple/protocols/msn/msn.c:1810
-#: ../libpurple/protocols/msn/msn.c:1816
+msgstr "సంగీతం"
+
+#: ../libpurple/protocols/msn/msn.c:1777
+#: ../libpurple/protocols/msn/msn.c:1958
+#: ../libpurple/protocols/msn/msn.c:1964
+#: ../libpurple/protocols/msnp9/msn.c:1630
+#: ../libpurple/protocols/msnp9/msn.c:1811
+#: ../libpurple/protocols/msnp9/msn.c:1817
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Favorite Quote"
-msgstr "మనసు కిష్టమైన ఉదాహరణ "
-
-#  And now for the buttons
-#: ../libpurple/protocols/msn/msn.c:1646
-#, fuzzy
+msgstr "మనసు కిష్టమైన సూక్తి "
+
+#: ../libpurple/protocols/msn/msn.c:1794
+#: ../libpurple/protocols/msnp9/msn.c:1647
 msgid "Contact Info"
-msgstr "ఖాతా వివరణ"
-
-#: ../libpurple/protocols/msn/msn.c:1647
-#, fuzzy
+msgstr "కాంటాక్టు వివరాలు"
+
+#: ../libpurple/protocols/msn/msn.c:1795
+#: ../libpurple/protocols/msnp9/msn.c:1648
 msgid "Personal"
-msgstr "వ్యక్తిగత టైటిల్ "
-
-#: ../libpurple/protocols/msn/msn.c:1650
+msgstr "వ్యక్తిగతం"
+
+#: ../libpurple/protocols/msn/msn.c:1798
+#: ../libpurple/protocols/msnp9/msn.c:1651
 msgid "Significant Other"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:1651
-#, fuzzy
+msgstr "ఇంకేదైనా విశేషం"
+
+#: ../libpurple/protocols/msn/msn.c:1799
+#: ../libpurple/protocols/msnp9/msn.c:1652
 msgid "Home Phone"
-msgstr "గృహ పేజీ "
-
-#: ../libpurple/protocols/msn/msn.c:1652
-#, fuzzy
+msgstr "ఇంటి ఫోను"
+
+#: ../libpurple/protocols/msn/msn.c:1800
+#: ../libpurple/protocols/msnp9/msn.c:1653
 msgid "Home Phone 2"
-msgstr "ఇంటి ఫోన్ నెంబరును సెట్ చేయండి."
-
-#: ../libpurple/protocols/msn/msn.c:1653
-#: ../libpurple/protocols/oscar/oscar.c:3793
+msgstr "ఇంటి ఫోను 2"
+
+#: ../libpurple/protocols/msn/msn.c:1801
+#: ../libpurple/protocols/msnp9/msn.c:1654
+#: ../libpurple/protocols/oscar/oscar.c:3803
 msgid "Home Address"
 msgstr "ఇంటి అడ్రస్ "
 
-#: ../libpurple/protocols/msn/msn.c:1654
-#, fuzzy
+#: ../libpurple/protocols/msn/msn.c:1802
+#: ../libpurple/protocols/msnp9/msn.c:1655
 msgid "Personal Mobile"
-msgstr "వ్యక్తిగత టైటిల్ "
-
-#: ../libpurple/protocols/msn/msn.c:1655
-#, fuzzy
+msgstr "వ్యక్తిగత మొబైల్"
+
+#: ../libpurple/protocols/msn/msn.c:1803
+#: ../libpurple/protocols/msnp9/msn.c:1656
 msgid "Home Fax"
-msgstr "గృహ పేజీ "
-
-#: ../libpurple/protocols/msn/msn.c:1656
-#, fuzzy
+msgstr "ఇంటిలోని ఫ్యాక్స్"
+
+#: ../libpurple/protocols/msn/msn.c:1804
+#: ../libpurple/protocols/msnp9/msn.c:1657
 msgid "Personal E-Mail"
-msgstr "వ్యక్తిగత టైటిల్ "
-
-#: ../libpurple/protocols/msn/msn.c:1657
-#, fuzzy
+msgstr "వ్యక్తిగత ఇ-మెయిల్"
+
+#: ../libpurple/protocols/msn/msn.c:1805
+#: ../libpurple/protocols/msnp9/msn.c:1658
 msgid "Personal IM"
-msgstr "వ్యక్తిగత టైటిల్ "
-
-#: ../libpurple/protocols/msn/msn.c:1659
+msgstr "వ్యక్తిగత IM"
+
+#: ../libpurple/protocols/msn/msn.c:1807
+#: ../libpurple/protocols/msnp9/msn.c:1660
 msgid "Anniversary"
-msgstr ""
+msgstr "వార్షికోత్సవం"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1675
+#: ../libpurple/protocols/msn/msn.c:1823
+#: ../libpurple/protocols/msnp9/msn.c:1676
 msgid "Work"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:1677
+msgstr "పనిచేసే చోటు"
+
+#: ../libpurple/protocols/msn/msn.c:1825
+#: ../libpurple/protocols/msnp9/msn.c:1678
 #: ../libpurple/protocols/silc/ops.c:1010
 #: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "జాబ్ టైటిల్ "
 
-#: ../libpurple/protocols/msn/msn.c:1678
-#: ../libpurple/protocols/oscar/oscar.c:3814
+#: ../libpurple/protocols/msn/msn.c:1826
+#: ../libpurple/protocols/msnp9/msn.c:1679
+#: ../libpurple/protocols/oscar/oscar.c:3824
 msgid "Company"
 msgstr "సంస్థ"
 
-#: ../libpurple/protocols/msn/msn.c:1679
-#: ../libpurple/protocols/novell/novell.c:1480
+#: ../libpurple/protocols/msn/msn.c:1827
+#: ../libpurple/protocols/msnp9/msn.c:1680
+#: ../libpurple/protocols/novell/novell.c:1489
 msgid "Department"
-msgstr "శాఖ "
-
-#: ../libpurple/protocols/msn/msn.c:1680
-#, fuzzy
+msgstr "విభాగం "
+
+#: ../libpurple/protocols/msn/msn.c:1828
+#: ../libpurple/protocols/msnp9/msn.c:1681
 msgid "Profession"
-msgstr "ప్రగతి "
-
-#: ../libpurple/protocols/msn/msn.c:1681
-#, fuzzy
+msgstr "వృత్తి"
+
+#: ../libpurple/protocols/msn/msn.c:1829
+#: ../libpurple/protocols/msnp9/msn.c:1682
 msgid "Work Phone"
-msgstr "ఫోన్ "
-
-#: ../libpurple/protocols/msn/msn.c:1682
-#, fuzzy
+msgstr "పనిచేసే దగ్గరి ఫోను"
+
+#: ../libpurple/protocols/msn/msn.c:1830
+#: ../libpurple/protocols/msnp9/msn.c:1683
 msgid "Work Phone 2"
-msgstr "వర్క్ ఫోన్ నెంబరును సెట్ చేయండి."
-
-#: ../libpurple/protocols/msn/msn.c:1683
-#: ../libpurple/protocols/oscar/oscar.c:3806
+msgstr "పనిచేసేదగ్గరి ఫోను 2"
+
+#: ../libpurple/protocols/msn/msn.c:1831
+#: ../libpurple/protocols/msnp9/msn.c:1684
+#: ../libpurple/protocols/oscar/oscar.c:3816
 msgid "Work Address"
 msgstr "పని అడ్రస్ "
 
-#: ../libpurple/protocols/msn/msn.c:1684
-#, fuzzy
+#: ../libpurple/protocols/msn/msn.c:1832
+#: ../libpurple/protocols/msnp9/msn.c:1685
 msgid "Work Mobile"
-msgstr "మొబైల్‌కు పంపండి."
-
-#: ../libpurple/protocols/msn/msn.c:1685
-#, fuzzy
+msgstr "పనిచేసేదగ్గరి మొబైల్"
+
+#: ../libpurple/protocols/msn/msn.c:1833
+#: ../libpurple/protocols/msnp9/msn.c:1686
 msgid "Work Pager"
-msgstr "వెబ్ పేజీ "
-
-#: ../libpurple/protocols/msn/msn.c:1686
+msgstr "పనిచేసేదగ్గరి పేజర్"
+
+#: ../libpurple/protocols/msn/msn.c:1834
+#: ../libpurple/protocols/msnp9/msn.c:1687
 msgid "Work Fax"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:1687
-#, fuzzy
+msgstr "పనిచేసేదగ్గరి ఫ్యాక్స్ "
+
+#: ../libpurple/protocols/msn/msn.c:1835
+#: ../libpurple/protocols/msnp9/msn.c:1688
 msgid "Work E-Mail"
-msgstr "ఇ-మెయిల్ "
-
-#: ../libpurple/protocols/msn/msn.c:1688
+msgstr "పనిచేసేదగ్గరి ఇ-మెయిల్"
+
+#: ../libpurple/protocols/msn/msn.c:1836
+#: ../libpurple/protocols/msnp9/msn.c:1689
 msgid "Work IM"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:1689
-#, fuzzy
+msgstr "పనిచేసేదగ్గరి IM"
+
+#: ../libpurple/protocols/msn/msn.c:1837
+#: ../libpurple/protocols/msnp9/msn.c:1690
 msgid "Start Date"
-msgstr "స్థితి "
-
-#: ../libpurple/protocols/msn/msn.c:1759 ../libpurple/protocols/msn/msn.c:1765
-#: ../libpurple/protocols/msn/msn.c:1772 ../libpurple/protocols/msn/msn.c:1779
+msgstr "ప్రారంభ తేది"
+
+#: ../libpurple/protocols/msn/msn.c:1907
+#: ../libpurple/protocols/msn/msn.c:1913
+#: ../libpurple/protocols/msn/msn.c:1920
+#: ../libpurple/protocols/msn/msn.c:1927
+#: ../libpurple/protocols/msnp9/msn.c:1760
+#: ../libpurple/protocols/msnp9/msn.c:1766
+#: ../libpurple/protocols/msnp9/msn.c:1773
+#: ../libpurple/protocols/msnp9/msn.c:1780
 msgid "Favorite Things"
 msgstr "మనసు కిష్టమైన విషయాలు "
 
-#: ../libpurple/protocols/msn/msn.c:1824
+#: ../libpurple/protocols/msn/msn.c:1972
+#: ../libpurple/protocols/msnp9/msn.c:1825
 msgid "Last Updated"
-msgstr "చివరి మార్పు చేర్పులు "
-
-#: ../libpurple/protocols/msn/msn.c:1835
+msgstr "చివరిసారి మార్పు చేర్పులు "
+
+#: ../libpurple/protocols/msn/msn.c:1983
+#: ../libpurple/protocols/msnp9/msn.c:1836
 #: ../libpurple/protocols/qq/buddy_info.c:60
 #: ../libpurple/protocols/silc/ops.c:1026
 #: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "హోం పేజీ "
 
-#: ../libpurple/protocols/msn/msn.c:1859
+#: ../libpurple/protocols/msn/msn.c:2007
+#: ../libpurple/protocols/msnp9/msn.c:1860
 msgid "The user has not created a public profile."
-msgstr "వినియోగదారుడు పబ్లిక్ ప్రొఫైల్‌ను సృష్టించలేదు."
-
-#: ../libpurple/protocols/msn/msn.c:1860
-msgid ""
-"MSN reported not being able to find the user's profile. This either means "
-"that the user does not exist, or that the user exists but has not created a "
-"public profile."
-msgstr "వినియోగదారుని ప్రొఫైల్ దొరకలేదని MSN రిపోర్టు చేస్తున్నది. "
-
-#: ../libpurple/protocols/msn/msn.c:1864
-#, fuzzy
-msgid ""
-"Could not find any information in the user's profile. The user most likely "
-"does not exist."
-msgstr ""
-"వినియోగదారుని ప్రొఫైల్‌లో గెయిమ్‌కు ఏ సమాచారమూ కనిపించలేదు. వినియోగాదారుడు అస్తిత్వంలో ఉండకపోవచ్చును. "
-
-#: ../libpurple/protocols/msn/msn.c:1872
+msgstr "వినియోగదారు పబ్లిక్ ప్రొఫైల్‌ను సృష్టించలేదు."
+
+#: ../libpurple/protocols/msn/msn.c:2008
+#: ../libpurple/protocols/msnp9/msn.c:1861
+msgid "MSN reported not being able to find the user's profile. This either means that the user does not exist, or that the user exists but has not created a public profile."
+msgstr "వినియోగదారు ప్రొఫైల్ దొరకలేదని MSN రిపోర్టు చేస్తున్నది. దీని అర్థమేమంటే వినియోగదారు అస్తిత్వంలో లేరని, లేదా పబ్లిక్ ప్రొఫైలును సృష్టించ లేదని."
+
+#: ../libpurple/protocols/msn/msn.c:2012
+#: ../libpurple/protocols/msnp9/msn.c:1865
+msgid "Could not find any information in the user's profile. The user most likely does not exist."
+msgstr "వినియోగదారు ప్రొఫైల్‌లో  ఎలాంటి సమాచారమూ లేదు. వినియోగాదారు అస్తిత్వంలో లేకపోవచ్చు. "
+
+#: ../libpurple/protocols/msn/msn.c:2020
+#: ../libpurple/protocols/msnp9/msn.c:1873
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "URL ప్రొఫైల్"
 
+# *< type
+# *< ui_requirement
+# *< flags
+# *< dependencies
+# *< priority
+# *< id
+# *< name
+# *< version
+# *  summary
+# *  description
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7376,514 +7702,594 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2158 ../libpurple/protocols/msn/msn.c:2160
-#, fuzzy
-msgid "MSN Protocol Plugin"
-msgstr "AIM/ICQ ప్రొటోకాల్ ప్లగ్‌ఇన్ "
-
-#: ../libpurple/protocols/msn/msn.c:2194
+#: ../libpurple/protocols/msn/msn.c:2307
+#: ../libpurple/protocols/msn/msn.c:2309
+#, fuzzy
+msgid "Windows Live Messenger Protocol Plugin"
+msgstr "Novell GroupWise Messenger Protocol Plugin"
+
+#: ../libpurple/protocols/msn/msn.c:2344
+#: ../libpurple/protocols/msnp9/msn.c:2195
 msgid "Use HTTP Method"
-msgstr "HTTP మెథడ్‌ను ఉపయోగించుము. "
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-#: ../libpurple/protocols/msn/msn.c:2199
+msgstr "HTTP మెథడ్‌ను ఉపయోగించండి"
+
+#: ../libpurple/protocols/msn/msn.c:2349
+#: ../libpurple/protocols/msnp9/msn.c:2200
 #, fuzzy
 msgid "HTTP Method Server"
-msgstr "IPC టెస్ట్ సెర్వర్ "
-
-#: ../libpurple/protocols/msn/msn.c:2204
+msgstr "HTTP మెథడ్‌ను ఉపయోగించండి"
+
+#: ../libpurple/protocols/msn/msn.c:2354
+#: ../libpurple/protocols/msnp9/msn.c:2205
 msgid "Show custom smileys"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:2212
-#, fuzzy
+msgstr "కస్టమ్ స్మైలీలను చూపించు"
+
+#: ../libpurple/protocols/msn/msn.c:2362
+#: ../libpurple/protocols/msnp9/msn.c:2213
 msgid "nudge: nudge a user to get their attention"
-msgstr "బజ్: ఒక కాంటాక్ట్‌కు బజ్ శబ్దం పంపండి. వారిని లక్ష్యాన్ని మీ వైపు మరలించండి.  "
-
-#: ../libpurple/protocols/msn/nexus.c:146
+msgstr "పలకరించు: వినియోగదారును ఆకట్టుకోవడానికి పలకరించు"
+
+#: ../libpurple/protocols/msn/nexus.c:70
+msgid "Windows Live ID authentication:Unable to connect"
+msgstr ""
+
+#. we must have failed!
+#: ../libpurple/protocols/msn/nexus.c:126
+msgid "Windows Live ID authentication: cannot find authenticate token in server response"
+msgstr ""
+
+#: ../libpurple/protocols/msn/nexus.c:172
+#, fuzzy
+msgid "Windows Live ID authentication Failed"
+msgstr "సామాన్య ప్రమాణీకరణ వైఫల్యం!"
+
+#: ../libpurple/protocols/msn/notification.c:185
+#: ../libpurple/protocols/msnp9/notification.c:178
+#, c-format
+msgid "%s is not a valid group."
+msgstr "%s చెల్లుబాటయ్యే గ్రూప్ కాదు. "
+
+# #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
+# gnome-session/gsm-client-row.c:43
+# #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
+#: ../libpurple/protocols/msn/notification.c:191
+#: ../libpurple/protocols/msn/notification.c:931
+#: ../libpurple/protocols/msn/session.c:387
+#: ../libpurple/protocols/msnp9/notification.c:184
+#: ../libpurple/protocols/msnp9/notification.c:532
+#: ../libpurple/protocols/msnp9/session.c:340
+msgid "Unknown error."
+msgstr "అజ్ఞాత పొరపాటు."
+
+#: ../libpurple/protocols/msn/notification.c:194
+#: ../libpurple/protocols/msnp9/notification.c:187
+#, c-format
+msgid "%s on %s (%s)"
+msgstr " %s (%s) మీద %s "
+
+#: ../libpurple/protocols/msn/notification.c:509
+#, c-format
+msgid "%s just sent you a Nudge!"
+msgstr "%s ఇప్పుడే మీకొక పలకరింపును పంపారు!"
+
+# #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
+# gnome-session/gsm-client-row.c:43
+# #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
+#: ../libpurple/protocols/msn/notification.c:836
+#, c-format
+msgid "Unknown error (%d)"
+msgstr "అజ్ఞాత పొరపాటు"
+
+#: ../libpurple/protocols/msn/notification.c:837
+#: ../libpurple/protocols/sametime/sametime.c:4471
+msgid "Unable to add user"
+msgstr "వినియోగదారును చేర్చలేని స్థితి "
+
+#: ../libpurple/protocols/msn/notification.c:897
+#: ../libpurple/protocols/msnp9/notification.c:498
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr " %s (%s) మీద వినియోగదారును చేర్చడంలో అశక్తత"
+
+#: ../libpurple/protocols/msn/notification.c:901
+#: ../libpurple/protocols/msnp9/notification.c:502
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "%s (%s) మీద వినియోగదారును నిలువరించడంలో అశక్తత "
+
+#: ../libpurple/protocols/msn/notification.c:905
+#: ../libpurple/protocols/msnp9/notification.c:506
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "%s(%s) పై వినియోగదారును అనుమతించడంలో అశక్తత "
+
+#: ../libpurple/protocols/msn/notification.c:913
+#: ../libpurple/protocols/msnp9/notification.c:514
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s ను చేర్చడం కుదరలేదు, ఎందుకంటే మీ మిత్రుల జాబితా నిండినది."
+
+#: ../libpurple/protocols/msn/notification.c:922
+#: ../libpurple/protocols/msnp9/notification.c:523
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s చెల్లుబాటయ్యే పాస్‌పోర్ట్ అకౌంట్ కాదు."
+
+#: ../libpurple/protocols/msn/notification.c:927
+#: ../libpurple/protocols/msnp9/notification.c:528
+msgid "Service Temporarily Unavailable."
+msgstr "సర్వీస్ తాత్కాలికంగా అందుబాటులో లేదు. "
+
+#: ../libpurple/protocols/msn/notification.c:1263
+#: ../libpurple/protocols/msnp9/notification.c:851
+msgid "Unable to rename group"
+msgstr "గ్రూపునకు కొత్తపేరునివ్వడంలో అశక్తత"
+
+#: ../libpurple/protocols/msn/notification.c:1318
+#: ../libpurple/protocols/msnp9/notification.c:906
+msgid "Unable to delete group"
+msgstr "గ్రూపును తొలగించడంలో అశక్తత"
+
+#: ../libpurple/protocols/msn/notification.c:1931
+#: ../libpurple/protocols/msnp9/notification.c:1325
+#, c-format
+msgid ""
+"The MSN server will shut down for maintenance in %d minute. You will automatically be signed out at that time.  Please finish any conversations in progress.\n"
+"\n"
+"After the maintenance has been completed, you will be able to successfully sign in."
+msgid_plural ""
+"The MSN server will shut down for maintenance in %d minutes. You will automatically be signed out at that time.  Please finish any conversations in progress.\n"
+"\n"
+"After the maintenance has been completed, you will be able to successfully sign in."
+msgstr[0] ""
+"MSN సెర్వర్ %d నిమిషాల్లో మెయింటెనెన్స్ కోసం షట్‌డౌన్ అవుతుంది. అప్పుడు మీ సంభాషణ ఆటోమేటిక్‌గా ఆగిపోతుంది.  మీరు జరుపుతున్న సంభాషణలను ముగించండి.\n"
+"\n"
+" "
+msgstr[1] ""
+"MSN సెర్వర్ %d నిమిషాల్లో మెయింటెనెన్స్ కోసం షట్‌డౌన్ అవుతుంది. అప్పుడు మీ సంభాషణ ఆటోమేటిక్‌గా ఆగిపోతుంది.  మీరు జరుపుతున్న సంభాషణలను ముగించండి.\n"
+"\n"
+" "
+
 #: ../libpurple/protocols/msn/servconn.c:135
+#: ../libpurple/protocols/msnp9/nexus.c:146
+#: ../libpurple/protocols/msnp9/servconn.c:133
 #: ../libpurple/protocols/qq/qq_proxy.c:242
-#: ../libpurple/protocols/qq/qq_proxy.c:321
-#: ../libpurple/protocols/qq/qq_proxy.c:366
-#: ../libpurple/protocols/qq/qq_proxy.c:399
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:63
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:163
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:187
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:200
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:229
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:243
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:268
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:302
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:332
+#: ../libpurple/protocols/qq/qq_proxy.c:324
+#: ../libpurple/protocols/qq/qq_proxy.c:369
+#: ../libpurple/protocols/qq/qq_proxy.c:402
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:64
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:167
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:191
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:204
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:233
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:247
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:272
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:307
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:338
 #: ../libpurple/protocols/yahoo/yahoochat.c:1416
 #: ../libpurple/protocols/yahoo/yahoochat.c:1442
 msgid "Unable to connect"
-msgstr "కనెక్ట్ చేయుటకు శక్తి లేదు."
-
-#: ../libpurple/protocols/msn/notification.c:178
-#, c-format
-msgid "%s is not a valid group."
-msgstr "%s విలువగల గ్రూప్ కాదు. "
+msgstr "కనెక్ట్ చేయడంలో అశక్తత "
+
+#: ../libpurple/protocols/msn/servconn.c:137
+#: ../libpurple/protocols/msnp9/servconn.c:135
+msgid "Writing error"
+msgstr "రైట్ చేయడంలో పొరపాటు"
+
+#: ../libpurple/protocols/msn/servconn.c:139
+#: ../libpurple/protocols/msnp9/servconn.c:137
+msgid "Reading error"
+msgstr "రీడ్ చేయడంలో పొరపాటు"
 
 # #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
 # gnome-session/gsm-client-row.c:43
 # #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
-# gnome-session/gsm-client-row.c:43
-#: ../libpurple/protocols/msn/notification.c:184
-#: ../libpurple/protocols/msn/notification.c:532
-#: ../libpurple/protocols/msn/session.c:330
-msgid "Unknown error."
-msgstr "అజ్ఞాత తప్పు."
-
-#: ../libpurple/protocols/msn/notification.c:187
-#, c-format
-msgid "%s on %s (%s)"
-msgstr " %s (%s) మీద %s "
-
-#: ../libpurple/protocols/msn/notification.c:498
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "వినియోగదారుని %s (%s) మీద చేర్చడంలో అశక్తత. "
-
-#: ../libpurple/protocols/msn/notification.c:502
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "%s వినియోగదారుని నిషేధించడంలో అసమర్థత (%s)."
-
-#: ../libpurple/protocols/msn/notification.c:506
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "%s వినియోగదారుని అనుమతించడంలో అసమర్థత (%s)."
-
-#: ../libpurple/protocols/msn/notification.c:514
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "%s ని చేర్చడం కుదరలేదు, ఎందుకంటే మీ మిత్రుల లిస్టు పూర్తైనది."
-
-#: ../libpurple/protocols/msn/notification.c:523
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s విలువైన పాస్‌పోర్ట్ ఎకౌంట్ కాదు."
-
-#: ../libpurple/protocols/msn/notification.c:528
-#, fuzzy
-msgid "Service Temporarily Unavailable."
-msgstr "సర్వీస్ తాత్కాలికంగా లభించడంలేదు. "
-
-#: ../libpurple/protocols/msn/notification.c:851
-msgid "Unable to rename group"
-msgstr "గ్రూపుకు కొత్తపేరు నివ్వడంలో అసమర్థత."
-
-#: ../libpurple/protocols/msn/notification.c:906
-msgid "Unable to delete group"
-msgstr "గ్రూపును తొలగించడంలో అసమర్థత. "
-
-#: ../libpurple/protocols/msn/notification.c:1325
-#, c-format
-msgid ""
-"The MSN server will shut down for maintenance in %d minute. You will "
-"automatically be signed out at that time.  Please finish any conversations "
-"in progress.\n"
-"\n"
-"After the maintenance has been completed, you will be able to successfully "
-"sign in."
-msgid_plural ""
-"The MSN server will shut down for maintenance in %d minutes. You will "
-"automatically be signed out at that time.  Please finish any conversations "
-"in progress.\n"
-"\n"
-"After the maintenance has been completed, you will be able to successfully "
-"sign in."
-msgstr[0] ""
-"MSN సెర్వర్ %d నిమిషాల్లో మెయింటెనెన్స్ కోసం షట్‌డౌన్ అవుతుంది. అప్పుడు మీ సంభాషణ ఆటోమేటిక్‌గా ఆగిపోతుంది.  "
-"మీరు జరుపుతున్న సంభాషణలను ముగించండి.\n"
-"\n"
-" "
-msgstr[1] ""
-"MSN సెర్వర్ %d నిమిషాల్లో మెయింటెనెన్స్ కోసం షట్‌డౌన్ అవుతుంది. అప్పుడు మీ సంభాషణ ఆటోమేటిక్‌గా ఆగిపోతుంది.  "
-"మీరు జరుపుతున్న సంభాషణలను ముగించండి.\n"
-"\n"
-" "
-
-#: ../libpurple/protocols/msn/servconn.c:137
-msgid "Writing error"
-msgstr "వ్రాయునప్పుడు పొరపాటు."
-
-#: ../libpurple/protocols/msn/servconn.c:139
-msgid "Reading error"
-msgstr "చదవడంలో పొరపాటు."
-
-# #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
-# gnome-session/gsm-client-row.c:43
-# #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
-# gnome-session/gsm-client-row.c:43
 #: ../libpurple/protocols/msn/servconn.c:146
-#, fuzzy, c-format
+#: ../libpurple/protocols/msnp9/servconn.c:144
+#, c-format
 msgid ""
 "Connection error from %s server:\n"
 "%s"
 msgstr ""
-"%s సెర్వర్‌నుండి కనెక్షన్ పొరపాటు (%s):\n"
-"%s"
-
-#: ../libpurple/protocols/msn/session.c:299
+"%s సర్వర్:\n"
+"%s నుంచి కనెక్షన్ లో పొరపాటు "
+
+#: ../libpurple/protocols/msn/session.c:349
+#: ../libpurple/protocols/msnp9/session.c:302
 msgid "Our protocol is not supported by the server."
-msgstr "మన ప్రొటోకాల్‌ను సెర్వర్ సపోర్ట్ చేయడంలేదు."
-
-#: ../libpurple/protocols/msn/session.c:303
+msgstr "మన ప్రొటోకాల్‌ను సర్వర్ సపోర్ట్ చేయడంలేదు."
+
+#: ../libpurple/protocols/msn/session.c:354
+#: ../libpurple/protocols/msnp9/session.c:307
 msgid "Error parsing HTTP."
-msgstr "HTTP పదవిశ్లేషణ చేయుటలో పొరపాటు."
-
-#: ../libpurple/protocols/msn/session.c:307
-#: ../libpurple/protocols/oscar/flap_connection.c:384
-#: ../libpurple/protocols/yahoo/yahoo.c:205
+msgstr "HTTP పదవిశ్లేషణ లో పొరపాటు."
+
+# MSG_SERVER_GHOST
+# Looks like someone logged in as us! =-O
+#: ../libpurple/protocols/msn/session.c:358
+#: ../libpurple/protocols/msnp9/session.c:311
+#: ../libpurple/protocols/oscar/flap_connection.c:387
+#: ../libpurple/protocols/yahoo/yahoo.c:207
 msgid "You have signed on from another location."
-msgstr "మీరు మరో ప్రదేశంనుండి సైన్ ఆన్ చేసినారు."
-
-#: ../libpurple/protocols/msn/session.c:310
+msgstr "మీరు మరో ప్రదేశంనుండి సైన్ ఆన్ చేశారు."
+
+#: ../libpurple/protocols/msn/session.c:364
+#: ../libpurple/protocols/msnp9/session.c:317
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
-msgstr "MSN సెర్వర్లు తాత్కాలికంగా దొరకడం లేదు. దయచేసి వేచిచూసి మరల ప్రయత్నం చేయండి."
-
-#: ../libpurple/protocols/msn/session.c:315
+msgstr "MSN సర్వర్లు తాత్కాలికంగా అందుబాటులో లేవు. దయచేసి కొంతసేపు ఆగి మళ్ళీ ప్రయత్నించండి. "
+
+#: ../libpurple/protocols/msn/session.c:370
+#: ../libpurple/protocols/msnp9/session.c:323
 msgid "The MSN servers are going down temporarily."
-msgstr "MSN సెర్వర్లు తాత్కాలికంగా కొంచెంసేపు ఆగిపోవును. "
-
-#: ../libpurple/protocols/msn/session.c:320
+msgstr "MSN సర్వర్లు తాత్కాలికంగా కొంచెంసేపు ఆగిపోనున్నాయి. "
+
+#: ../libpurple/protocols/msn/session.c:375
+#: ../libpurple/protocols/msnp9/session.c:328
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "ప్రమాణీకరణలో అసమర్థత: %s"
 
-#: ../libpurple/protocols/msn/session.c:325
-msgid ""
-"Your MSN buddy list is temporarily unavailable. Please wait and try again."
-msgstr "మీ MSN మిత్రుల లిస్టు తాత్కాలికంగా లభించుటలేదు. దయచేసి వేచి చూసి మరల ప్రయత్నించండి. "
-
-#: ../libpurple/protocols/msn/session.c:346
-#: ../libpurple/protocols/msn/session.c:348
+#: ../libpurple/protocols/msn/session.c:381
+#: ../libpurple/protocols/msnp9/session.c:334
+msgid "Your MSN buddy list is temporarily unavailable. Please wait and try again."
+msgstr "మీ MSN మిత్రుల జాబితా తాత్కాలికంగా అందుబాటులో లేదు. దయచేసి కొంచెం సేపుఆగి  మళ్ళీ ప్రయత్నించండి. "
+
+#: ../libpurple/protocols/msn/session.c:403
+#: ../libpurple/protocols/msn/session.c:405
+#: ../libpurple/protocols/msnp9/session.c:356
+#: ../libpurple/protocols/msnp9/session.c:358
 msgid "Handshaking"
 msgstr "హాండ్‌షేకింగ్ "
 
-#: ../libpurple/protocols/msn/session.c:349
+#: ../libpurple/protocols/msn/session.c:406
+#: ../libpurple/protocols/msnp9/session.c:359
 msgid "Starting authentication"
-msgstr "ప్రమాణీకరణ మొదలగుచున్నది. "
-
-#: ../libpurple/protocols/msn/session.c:350
+msgstr "ప్రమాణీకరణ మొదలవుతోంది"
+
+#: ../libpurple/protocols/msn/session.c:407
+#: ../libpurple/protocols/msnp9/session.c:360
 msgid "Getting cookie"
-msgstr "కుకీని తీసుకువస్తున్నది. "
-
-#: ../libpurple/protocols/msn/session.c:352
+msgstr "కుకీని పొందుతోంది"
+
+#: ../libpurple/protocols/msn/session.c:409
+#: ../libpurple/protocols/msnp9/session.c:362
 msgid "Sending cookie"
-msgstr "కుకీని పంపుతున్నది. "
-
-#: ../libpurple/protocols/msn/session.c:353
+msgstr "కుకీని పంపుతోంది"
+
+#: ../libpurple/protocols/msn/session.c:410
+#: ../libpurple/protocols/msnp9/session.c:363
 msgid "Retrieving buddy list"
-msgstr "మిత్రుల లిస్టును బయటకు తీస్తున్నది."
+msgstr "మిత్రుల జాబితాను వెలికి తీస్తోంది "
 
 #: ../libpurple/protocols/msn/state.c:34
+#: ../libpurple/protocols/msnp9/state.c:34
 msgid "Away From Computer"
-msgstr "కంప్యూటర్‌నుండి దూరంగా "
+msgstr "కంప్యూటర్‌నుంచి దూరంగా "
 
 #: ../libpurple/protocols/msn/state.c:35
+#: ../libpurple/protocols/msnp9/state.c:35
 msgid "On The Phone"
 msgstr "ఫోనులో "
 
 #: ../libpurple/protocols/msn/state.c:36
+#: ../libpurple/protocols/msnp9/state.c:36
 msgid "Out To Lunch"
-msgstr " మధ్యాహ్న భోజనానికి వెళ్లినారు."
-
-#: ../libpurple/protocols/msn/switchboard.c:400
+msgstr " లంచ్ కు వెళ్లారు"
+
+#: ../libpurple/protocols/msn/switchboard.c:398
+#: ../libpurple/protocols/msnp9/switchboard.c:400
 msgid "Message may have not been sent because a timeout occurred:"
-msgstr "సమయం సమాప్తమైనది కావున మీ సందేశం వెళ్లియుండక పోవచ్చు : "
-
-#: ../libpurple/protocols/msn/switchboard.c:408
+msgstr "సమయం సమాప్తం కావడం వల్ల మీ సందేశం వెళ్లిఉండక పోవచ్చు :"
+
+#: ../libpurple/protocols/msn/switchboard.c:406
+#: ../libpurple/protocols/msnp9/switchboard.c:408
 msgid "Message could not be sent, not allowed while invisible:"
-msgstr "సందేశాన్ని పంపుట సాధ్యం కాదు, కనిపించనప్పుడు అనుమతించడం సాధ్యం కాదు."
-
-#: ../libpurple/protocols/msn/switchboard.c:412
+msgstr "సందేశాన్ని పంపడం సాధ్యం కాదు, కనిపించినప్పుడు అనుమతించడం సాధ్యం కాదు."
+
+#: ../libpurple/protocols/msn/switchboard.c:410
+#: ../libpurple/protocols/msnp9/switchboard.c:412
 msgid "Message could not be sent because the user is offline:"
-msgstr "సందేశాన్ని పంపడం సాధ్యం కాదు, ఎందుకంటే వినియోగదారుడు ఆఫ్‌లైన్‌లో ఉన్నాడు. "
-
-#: ../libpurple/protocols/msn/switchboard.c:416
+msgstr "వినియోగదారు ఆఫ్‌లైన్‌లో ఉన్నందు వల్ల సందేశాన్ని పంపడం సాధ్యం కాదు:"
+
+#: ../libpurple/protocols/msn/switchboard.c:414
+#: ../libpurple/protocols/msnp9/switchboard.c:416
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "కనెక్షన్‌లో పొరపాటు సంభవించింది. అందుచేత సందేశం పంపడానికి వీలుపడలేదు. "
 
-#: ../libpurple/protocols/msn/switchboard.c:420
-#, fuzzy
+#: ../libpurple/protocols/msn/switchboard.c:418
+#: ../libpurple/protocols/msnp9/switchboard.c:420
 msgid "Message could not be sent because we are sending too quickly:"
-msgstr "సందేశాన్ని పంపడం సాధ్యం కాదు, ఎందుకంటే వినియోగదారుడు ఆఫ్‌లైన్‌లో ఉన్నాడు. "
-
-#: ../libpurple/protocols/msn/switchboard.c:424
-msgid ""
-"Message could not be sent because we were unable to establish a session with "
-"the server. This is likely a server problem, try again in a few minutes:"
-msgstr ""
-
-#: ../libpurple/protocols/msn/switchboard.c:431
-msgid ""
-"Message could not be sent because an error with the switchboard occurred:"
+msgstr "మేము అత్యంత వేగంగా పంపిస్తున్నాం కనుక సందేశాన్ని పంపలేకపోయాం:"
+
+#: ../libpurple/protocols/msn/switchboard.c:422
+#: ../libpurple/protocols/msnp9/switchboard.c:424
+msgid "Message could not be sent because we were unable to establish a session with the server. This is likely a server problem, try again in a few minutes:"
+msgstr ""
+
+#: ../libpurple/protocols/msn/switchboard.c:429
+#: ../libpurple/protocols/msnp9/switchboard.c:431
+msgid "Message could not be sent because an error with the switchboard occurred:"
 msgstr "స్విచ్‌బోర్డ్‌లో పొరపాటు సంభవించినందువల్ల సందేశం పంపడానికి వీలుపడలేదు."
 
-#: ../libpurple/protocols/msn/switchboard.c:439
+#: ../libpurple/protocols/msn/switchboard.c:437
+#: ../libpurple/protocols/msnp9/switchboard.c:439
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "అజ్ఞాత పొరపాటు సంభవించింది, అందుచేత సందేశం వెళ్లియుండకపోవచ్చు. "
 
-#: ../libpurple/protocols/msn/userlist.c:252
-#, fuzzy, c-format
+#: ../libpurple/protocols/msn/userlist.c:243
+#: ../libpurple/protocols/msnp9/userlist.c:252
+#, c-format
 msgid "%s has added you to his or her buddy list."
-msgstr "వినియోగదారుడు/రాలు %s %sను తన మిత్రుల జాబితాలో చేర్చదల్చుకున్నాడు/న్నది."
-
-#: ../libpurple/protocols/msn/userlist.c:321
-#, fuzzy, c-format
+msgstr "%s మిమ్మల్ని తన మిత్రుల జాబితాలో చేర్చారు."
+
+#: ../libpurple/protocols/msn/userlist.c:312
+#: ../libpurple/protocols/msnp9/userlist.c:321
+#, c-format
 msgid "%s has removed you from his or her buddy list."
-msgstr "వినియోగదారుడు/రాలు %s %sను తన మిత్రుల జాబితాలో చేర్చదల్చుకున్నాడు/న్నది."
-
-#: ../libpurple/protocols/msn/userlist.c:643
+msgstr "%s మిమ్మల్ని తన మిత్రుల జాబితా నుంచి తొలగించారు."
+
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#: ../libpurple/protocols/msn/userlist.c:693
+#: ../libpurple/protocols/msnp9/userlist.c:643
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "\"%s\" ఫైల్స్‌ను చేర్చడంలో అసమర్థత."
 
-#: ../libpurple/protocols/msn/userlist.c:645
+#: ../libpurple/protocols/msn/userlist.c:696
+#: ../libpurple/protocols/msnp9/userlist.c:645
 msgid "The screen name specified is invalid."
 msgstr "సూచించిన స్క్రీన్‌పేరుకు విలువలేదు."
 
+#: ../libpurple/protocols/msnp9/msn.c:549
+msgid "Has you"
+msgstr "మీరు "
+
+# *< type
+# *< ui_requirement
+# *< flags
+# *< dependencies
+# *< priority
+# *< id
+# *< name
+# *< version
+# *  summary
+# *  description
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/protocols/msnp9/msn.c:2159
+#: ../libpurple/protocols/msnp9/msn.c:2161
+msgid "MSN Protocol Plugin"
+msgstr "MSN ప్రొటోకాల్ ప్లగ్‌ఇన్ "
+
 #: ../libpurple/protocols/myspace/myspace.c:111
+#, fuzzy
 msgid "Missing Cipher"
-msgstr ""
+msgstr "Cipher"
 
 #: ../libpurple/protocols/myspace/myspace.c:112
 msgid "The RC4 cipher could not be found"
 msgstr ""
 
 #: ../libpurple/protocols/myspace/myspace.c:113
-msgid ""
-"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
-"not be loaded."
+msgid "Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will not be loaded."
 msgstr ""
 
 #: ../libpurple/protocols/myspace/myspace.c:286
 #, c-format
-msgid ""
-"Sorry, passwords over %d characters in length (yours is %d) are not "
-"supported by MySpace."
+msgid "Sorry, passwords over %d characters in length (yours is %d) are not supported by MySpace."
 msgstr ""
 
 #. Notify an error message also, because this is important!
 #: ../libpurple/protocols/myspace/myspace.c:292
-#: ../libpurple/protocols/myspace/myspace.c:1801
+#: ../libpurple/protocols/myspace/myspace.c:1820
 msgid "MySpaceIM Error"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:349
+#: ../libpurple/protocols/myspace/myspace.c:352
 #, fuzzy
 msgid "Reading challenge"
-msgstr "డాటాను చదువుతూ"
-
-#: ../libpurple/protocols/myspace/myspace.c:355
+msgstr "రీడ్ చేయడంలో పొరపాటు"
+
+#: ../libpurple/protocols/myspace/myspace.c:360
 #, fuzzy
 msgid "Unexpected challenge length from server"
-msgstr "సెర్వర్‌నుండి విలువలేని సవాల్. "
-
-#: ../libpurple/protocols/myspace/myspace.c:359
+msgstr "సర్వర్‌నుంచి చెల్లని సవాలు "
+
+#: ../libpurple/protocols/myspace/myspace.c:364
 #, fuzzy
 msgid "Logging in"
 msgstr "లాగింగ్ "
 
-#: ../libpurple/protocols/myspace/myspace.c:1286
+#: ../libpurple/protocols/myspace/myspace.c:1296
 #, c-format
 msgid "Connection to server lost (no data received within %d seconds)"
 msgstr ""
 
 #. Can't write _()'d strings in array initializers. Workaround.
-#: ../libpurple/protocols/myspace/myspace.c:1328
+#: ../libpurple/protocols/myspace/myspace.c:1339
 #, fuzzy
 msgid "New mail messages"
-msgstr "కొత్త సుదూర సందేశం "
-
-#: ../libpurple/protocols/myspace/myspace.c:1329
+msgstr "సందేశాన్ని పంపండి"
+
+#: ../libpurple/protocols/myspace/myspace.c:1340
 msgid "New blog comments"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1330
+#: ../libpurple/protocols/myspace/myspace.c:1341
 msgid "New profile comments"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1331
+#: ../libpurple/protocols/myspace/myspace.c:1342
 msgid "New friend requests!"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1332
+#: ../libpurple/protocols/myspace/myspace.c:1343
 msgid "New picture comments"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:1360
+#: ../libpurple/protocols/myspace/myspace.c:1371
 msgid "MySpace"
 msgstr ""
 
 #. The session is now set up, ready to be connected. This emits the
 #. * signedOn signal, so clients can now do anything with msimprpl, and
 #. * we're ready for it (session key, userid, username all setup).
-#: ../libpurple/protocols/myspace/myspace.c:1543
-#: ../libpurple/protocols/sametime/sametime.c:1544
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:1554
+#: ../libpurple/protocols/sametime/sametime.c:1546
 msgid "Connected"
-msgstr "కనెక్ట్ "
-
-#: ../libpurple/protocols/myspace/myspace.c:1554
-#: ../libpurple/protocols/myspace/myspace.c:1556
+msgstr "కనెక్ట్ అయింది "
+
+#: ../libpurple/protocols/myspace/myspace.c:1565
+#: ../libpurple/protocols/myspace/myspace.c:1568
 #, fuzzy
 msgid "No username set"
-msgstr "స్క్రీన్‌పేరు ఇవ్వలేదు."
-
-#: ../libpurple/protocols/myspace/myspace.c:1555
-msgid ""
-"Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
-"username and choose a username and try to login again."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:1782
+msgstr "పేరు లేదు"
+
+#: ../libpurple/protocols/myspace/myspace.c:1566
+msgid "Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile.username and choose a username and try to login again."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:1794
 #, c-format
 msgid "Protocol error, code %d: %s"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:1972
-#: ../libpurple/protocols/myspace/myspace.c:2006
-#, fuzzy
+msgstr "లోపం కోడ్ %d ను ప్రక్రియ తిప్పి పంపింది "
+
+#: ../libpurple/protocols/myspace/myspace.c:1990
+#: ../libpurple/protocols/myspace/myspace.c:2024
 msgid "Failed to add buddy"
-msgstr "సంభాషణలో మిత్రుని చేర్చడానికి వైఫల్యం. "
-
-#: ../libpurple/protocols/myspace/myspace.c:1972
-#, fuzzy
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:1990
 msgid "'addbuddy' command failed."
-msgstr "సెర్వర్‌నుండి మిత్రుల లిస్టును దిగుమతి చేయండి."
-
-#: ../libpurple/protocols/myspace/myspace.c:2006
-#: ../libpurple/protocols/myspace/myspace.c:2247
-#, fuzzy
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2024
+#: ../libpurple/protocols/myspace/myspace.c:2261
 msgid "persist command failed"
-msgstr "స్విచ్‌బోర్డు వైఫల్యం "
-
-#: ../libpurple/protocols/myspace/myspace.c:2115
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2129
 #, c-format
 msgid "No such user: %s"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2116
+#: ../libpurple/protocols/myspace/myspace.c:2130
 #, fuzzy
 msgid "User lookup"
 msgstr "వినియోగదారుని గదులు "
 
-#: ../libpurple/protocols/myspace/myspace.c:2228
-#: ../libpurple/protocols/myspace/myspace.c:2247
-#: ../libpurple/protocols/myspace/myspace.c:2269
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:2242
+#: ../libpurple/protocols/myspace/myspace.c:2261
+#: ../libpurple/protocols/myspace/myspace.c:2283
 msgid "Failed to remove buddy"
-msgstr "సంభాషణలో మిత్రుని చేర్చడానికి వైఫల్యం. "
-
-#: ../libpurple/protocols/myspace/myspace.c:2228
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2242
 msgid "'delbuddy' command failed"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2269
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:2283
 msgid "blocklist command failed"
-msgstr "స్విచ్‌బోర్డు వైఫల్యం "
-
-#: ../libpurple/protocols/myspace/myspace.c:2315
+msgstr ""
+
+# XXX - Don't call this with ssi
+#: ../libpurple/protocols/myspace/myspace.c:2331
 #, fuzzy
 msgid "Invalid input condition"
-msgstr "కనెక్షన్‌ను ఫైనలైజేషన్ జరుగుతున్నది."
-
-#. TODO: g_realloc like msn, yahoo, irc, jabber?
-#: ../libpurple/protocols/myspace/myspace.c:2333
-#: ../libpurple/protocols/myspace/myspace.c:2364
+msgstr "కనెక్షన్‌ను ఫైనలైజేషన్ జరుగుతున్నది"
+
+#: ../libpurple/protocols/myspace/myspace.c:2351
+#: ../libpurple/protocols/myspace/myspace.c:2388
 #, fuzzy
 msgid "Read buffer full"
 msgstr "పూర్తి క్యూ."
 
-#: ../libpurple/protocols/myspace/myspace.c:2402
+#: ../libpurple/protocols/myspace/myspace.c:2430
 #, fuzzy
 msgid "Unparseable message"
-msgstr "సందేశాన్ని పద విశ్లేషణ చేయడంలో అసమర్థత."
-
-#: ../libpurple/protocols/myspace/myspace.c:2471
-#, fuzzy, c-format
+msgstr "సందేశాన్ని పద విశ్లేషణ చేయడంలో అశక్తత"
+
+#: ../libpurple/protocols/myspace/myspace.c:2499
+#, c-format
 msgid "Couldn't connect to host: %s (%d)"
-msgstr "హోస్ట్‌కు కనెక్ట్ చేయలేదు."
-
-#: ../libpurple/protocols/myspace/myspace.c:2642
+msgstr "హోస్ట్‌కు కనెక్ట్ చేయలేదు"
+
+#: ../libpurple/protocols/myspace/myspace.c:2670
 #, fuzzy
 msgid "IM Friends"
 msgstr "_IM విండోస్ "
 
-#: ../libpurple/protocols/myspace/myspace.c:2741
-#, c-format
-msgid ""
-"%d buddies were added or updated from the server (including buddies already "
-"on the server-side list)"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:2742
+#: ../libpurple/protocols/myspace/myspace.c:2769
+#, c-format
+msgid "%d buddies were added or updated from the server (including buddies already on the server-side list)"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:2770
 #, fuzzy
 msgid "Add contacts from server"
-msgstr "సెర్వర్‌నుండి విలువలేని బాధ్యత."
-
-#: ../libpurple/protocols/myspace/myspace.c:2794
-#: ../libpurple/protocols/myspace/myspace.c:2859
+msgstr "సర్వర్‌నుంచి చెల్లని ప్రతి స్పందన."
+
+#: ../libpurple/protocols/myspace/myspace.c:2822
+#: ../libpurple/protocols/myspace/myspace.c:2887
 msgid "Add friends from MySpace.com"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:2795
+#: ../libpurple/protocols/myspace/myspace.c:2823
 #, fuzzy
 msgid "Importing friends failed"
-msgstr "అబద్ధపు మిత్రుని ఫైల్."
+msgstr " మిత్రుని ఫైలు సరిగాలేదు"
 
 #. TODO: find out how
-#: ../libpurple/protocols/myspace/myspace.c:2851
+#: ../libpurple/protocols/myspace/myspace.c:2879
+#, fuzzy
 msgid "Find people..."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:2854
+msgstr "మిత్రులకోసం వెతకండి..."
+
+#: ../libpurple/protocols/myspace/myspace.c:2882
 #, fuzzy
 msgid "Change IM name..."
 msgstr "పాస్‌వర్డ్‌ను మార్చండి ..."
 
-#: ../libpurple/protocols/myspace/myspace.c:3156
+#: ../libpurple/protocols/myspace/myspace.c:3184
 msgid "myim URL handler"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3157
+#: ../libpurple/protocols/myspace/myspace.c:3185
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3158
+#: ../libpurple/protocols/myspace/myspace.c:3186
 msgid "Enable the proper MySpaceIM account and try again."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3281
+#: ../libpurple/protocols/myspace/myspace.c:3309
 msgid "Show display name in status text"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3284
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:3312
 msgid "Show headline in status text"
-msgstr "టాబ్స్‌లోను/టైటిల్స్‌లోనూ _ఉపనామములను చూపించుము."
-
-#: ../libpurple/protocols/myspace/myspace.c:3289
+msgstr ""
+
+#: ../libpurple/protocols/myspace/myspace.c:3317
 #, fuzzy
 msgid "Send emoticons"
 msgstr "సౌండ్ ఆప్షన్స్ "
 
-#: ../libpurple/protocols/myspace/myspace.c:3294
+#: ../libpurple/protocols/myspace/myspace.c:3322
 msgid "Screen resolution (dots per inch)"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/myspace.c:3297
+#: ../libpurple/protocols/myspace/myspace.c:3325
 #, fuzzy
 msgid "Base font size (points)"
 msgstr "పెద్ద ఫాంట్ సైజ్ "
@@ -7891,180 +8297,198 @@
 #: ../libpurple/protocols/myspace/user.c:95
 #: ../libpurple/protocols/zephyr/zephyr.c:786
 #: ../libpurple/protocols/zephyr/zephyr.c:1204
-#, fuzzy
 msgid "User"
-msgstr "వినియోగదారులు "
-
-#. TODO: link to username, if available
-#: ../libpurple/protocols/myspace/user.c:102
-#: ../libpurple/protocols/oscar/oscar.c:2964
+msgstr "వినియోగదారు"
+
+#: ../libpurple/protocols/myspace/user.c:105
+#: ../libpurple/protocols/oscar/oscar.c:2974
 msgid "Profile"
 msgstr "ప్రొఫైల్ "
 
-#: ../libpurple/protocols/myspace/user.c:124
+#: ../libpurple/protocols/myspace/user.c:128
 #, fuzzy
 msgid "Headline"
-msgstr "క్షీణించు"
-
-#: ../libpurple/protocols/myspace/user.c:129
+msgstr "_హ్యాండిల్:"
+
+#: ../libpurple/protocols/myspace/user.c:133
 #, fuzzy
 msgid "Song"
 msgstr "_సార్టింగ్:"
 
-#: ../libpurple/protocols/myspace/user.c:134
+#: ../libpurple/protocols/myspace/user.c:141
 msgid "Total Friends"
 msgstr ""
 
-#  Conversations
-#: ../libpurple/protocols/myspace/user.c:145
-#: ../libpurple/protocols/myspace/user.c:148
-#: ../libpurple/protocols/myspace/user.c:151
+# Conversations
+#: ../libpurple/protocols/myspace/user.c:159
 #, fuzzy
 msgid "Client Version"
 msgstr "సంభాషణను క్లోజ్ చేయుము "
 
 #. TODO: icons for each zap
-#: ../libpurple/protocols/myspace/zap.c:44
-#: ../libpurple/protocols/myspace/zap.c:177
+#. Lots of comments for translators:
+#. Zap means "to strike suddenly and forcefully as if with a
+#. * projectile or weapon."  This term often has an electrical
+#. * connotation, for example, "he was zapped by electricity when
+#. * he put a fork in the toaster."
+#: ../libpurple/protocols/myspace/zap.c:51
+#: ../libpurple/protocols/myspace/zap.c:214
 msgid "Zap"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:44
+#: ../libpurple/protocols/myspace/zap.c:51
 #, c-format
 msgid "%s has zapped you!"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:44
-#, c-format
-msgid "Zapping %s..."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:45
-#, fuzzy
-msgid "Whack"
-msgstr "వెనుక"
-
-#: ../libpurple/protocols/myspace/zap.c:45
-#, fuzzy, c-format
-msgid "%s has whacked you!"
-msgstr "వినియోగదారుడు మిమ్మల్ని ఆటంకపర్చినాడు."
-
-#: ../libpurple/protocols/myspace/zap.c:45
-#, c-format
-msgid "Whacking %s..."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:46
-#, fuzzy
-msgid "Torch"
-msgstr "విషయం "
-
-#: ../libpurple/protocols/myspace/zap.c:46
-#, fuzzy, c-format
-msgid "%s has torched you!"
-msgstr "వినియోగదారుడు మిమ్మల్ని ఆటంకపర్చినాడు."
-
-#: ../libpurple/protocols/myspace/zap.c:46
-#, c-format
-msgid "Torching %s..."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:47
-msgid "Smooch"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:47
-#, fuzzy, c-format
-msgid "%s has smooched you!"
-msgstr "వినియోగదారుడు మిమ్మల్ని ఆటంకపర్చినాడు."
-
-#: ../libpurple/protocols/myspace/zap.c:47
-#, c-format
-msgid "Smooching %s..."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:48
-msgid "Hug"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:48
-#, fuzzy, c-format
-msgid "%s has hugged you!"
-msgstr "%s దూరం వెళ్లిపోయినారు."
-
-#: ../libpurple/protocols/myspace/zap.c:48
-#, c-format
-msgid "Hugging %s..."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:49
-#, fuzzy
-msgid "Slap"
-msgstr "స్లోవాక్ "
-
-#: ../libpurple/protocols/myspace/zap.c:49
-#, fuzzy, c-format
-msgid "%s has slapped you!"
-msgstr "%s మీకు టైప్ చేయడం ఆపినారు. (%s)"
-
-#: ../libpurple/protocols/myspace/zap.c:49
-#, c-format
-msgid "Slapping %s..."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:50
-#, fuzzy
-msgid "Goose"
-msgstr "వెళ్లిపోయిన "
-
-#: ../libpurple/protocols/myspace/zap.c:50
-#, fuzzy, c-format
-msgid "%s has goosed you!"
-msgstr "%s దూరం వెళ్లిపోయినారు."
-
-#: ../libpurple/protocols/myspace/zap.c:50
-#, fuzzy, c-format
-msgid "Goosing %s..."
-msgstr "%s ను చూస్తున్నది "
-
-#: ../libpurple/protocols/myspace/zap.c:51
-msgid "High-five"
-msgstr ""
-
 #: ../libpurple/protocols/myspace/zap.c:51
-#, fuzzy, c-format
+#, c-format
+msgid "Zapping %s..."
+msgstr ""
+
+#. Whack means "to hit or strike someone with a sharp blow"
+#: ../libpurple/protocols/myspace/zap.c:54
+msgid "Whack"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:54
+#, c-format
+msgid "%s has whacked you!"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:54
+#, c-format
+msgid "Whacking %s..."
+msgstr ""
+
+#. Torch means "to set on fire."  Don't worry, this doesn't
+#. * make a whole lot of sense in English, either.  Feel free
+#. * to translate it literally.
+#: ../libpurple/protocols/myspace/zap.c:59
+msgid "Torch"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:59
+#, c-format
+msgid "%s has torched you!"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:59
+#, c-format
+msgid "Torching %s..."
+msgstr ""
+
+#. Smooch means "to kiss someone, often enthusiastically"
+#: ../libpurple/protocols/myspace/zap.c:62
+msgid "Smooch"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:62
+#, c-format
+msgid "%s has smooched you!"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:62
+#, c-format
+msgid "Smooching %s..."
+msgstr ""
+
+#. A hug is a display of affection; wrapping your arms around someone
+#: ../libpurple/protocols/myspace/zap.c:65
+msgid "Hug"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:65
+#, c-format
+msgid "%s has hugged you!"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:65
+#, c-format
+msgid "Hugging %s..."
+msgstr ""
+
+#. Slap means "to hit someone with an open/flat hand"
+#: ../libpurple/protocols/myspace/zap.c:68
+msgid "Slap"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:68
+#, c-format
+msgid "%s has slapped you!"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:68
+#, c-format
+msgid "Slapping %s..."
+msgstr ""
+
+#. Goose means "to pinch someone on their butt"
+#: ../libpurple/protocols/myspace/zap.c:71
+msgid "Goose"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:71
+#, c-format
+msgid "%s has goosed you!"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:71
+#, c-format
+msgid "Goosing %s..."
+msgstr ""
+
+#. A high-five is when two people's hands slap each other
+#. * in the air above their heads.  It is done to celebrate
+#. * something, often a victory, or to congratulate someone.
+#: ../libpurple/protocols/myspace/zap.c:76
+msgid "High-five"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:76
+#, c-format
 msgid "%s has high-fived you!"
-msgstr "%s ఖాతాను ఓపెన్ చేశారు. (%s) "
-
-#: ../libpurple/protocols/myspace/zap.c:51
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:76
 #, c-format
 msgid "High-fiving %s..."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:52
+#. We're not entirely sure what the MySpace people mean by
+#. * this... but we think it's the equivalent of "prank."  Or, for
+#. * someone to perform a mischievous trick or practical joke.
+#: ../libpurple/protocols/myspace/zap.c:81
 msgid "Punk"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:52
+#: ../libpurple/protocols/myspace/zap.c:81
 #, c-format
 msgid "%s has punk'd you!"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:52
+#: ../libpurple/protocols/myspace/zap.c:81
 #, c-format
 msgid "Punking %s..."
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:53
+#. Raspberry is a slang term for the vibrating sound made
+#. * when you stick your tongue out of your mouth with your
+#. * lips closed and blow.  It is typically done when
+#. * gloating or bragging.  Nowadays it's a pretty silly
+#. * gesture, so it does not carry a harsh negative
+#. * connotation.  It is generally used in a playful tone
+#. * with friends.
+#: ../libpurple/protocols/myspace/zap.c:90
 msgid "Raspberry"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:53
+#: ../libpurple/protocols/myspace/zap.c:90
 #, c-format
 msgid "%s has raspberried you!"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:53
+#: ../libpurple/protocols/myspace/zap.c:90
 #, c-format
 msgid "Raspberrying %s..."
 msgstr ""
@@ -8106,9 +8530,8 @@
 msgstr "పాస్‌వర్డ్ కాలం ముగిసినది."
 
 #: ../libpurple/protocols/novell/nmuser.c:1894
-#, fuzzy
 msgid "Incorrect password"
-msgstr "తప్పు పాస్‌వర్డ్ "
+msgstr "తప్పుడు పాస్‌వర్డ్ "
 
 #: ../libpurple/protocols/novell/nmuser.c:1897
 msgid "User not found"
@@ -8116,7 +8539,7 @@
 
 #: ../libpurple/protocols/novell/nmuser.c:1900
 msgid "Account has been disabled"
-msgstr "ఎకౌంట్ డిజేబుల్ అయినది. "
+msgstr "అకౌంట్ డిజేబుల్ అయినది. "
 
 #: ../libpurple/protocols/novell/nmuser.c:1903
 msgid "The server could not access the directory"
@@ -8143,21 +8566,16 @@
 msgstr "మాస్టర్ ఆర్కైవ్ మిస్‌కన్ఫిగర్ అయినది. "
 
 #: ../libpurple/protocols/novell/nmuser.c:1922
-#, fuzzy
 msgid "Incorrect screen name or password"
-msgstr "ఉపనామం లేక పాస్‌వర్డ్ తప్పు. "
+msgstr "తప్పుడు స్క్రీన్ పేరు లేక పాస్‌వర్డ్ "
 
 #: ../libpurple/protocols/novell/nmuser.c:1925
-#, fuzzy
 msgid "Could not recognize the host of the screen name you entered"
-msgstr "మీరు ఎంటర్‌చేసిన వినియోగదారుని పేరుకు ప్రదాతను (host) గుర్తించలేము."
+msgstr "మీరు ఎంటర్‌చేసిన హోస్ట్ స్క్రీన్ పేరును (host) గుర్తించడం సాధ్యపడలేదు"
 
 #: ../libpurple/protocols/novell/nmuser.c:1928
-#, fuzzy
-msgid ""
-"Your account has been disabled because too many incorrect passwords were "
-"entered"
-msgstr "అనేక పనికిరాని పాస్‌వర్డ్‌లు ఎంటర్‌ చేసినందువల్ల మీ ఖాతా అసమర్థం గావించబడింది. "
+msgid "Your account has been disabled because too many incorrect passwords were entered"
+msgstr "అనేక తప్పుడు పాస్‌వర్డ్‌లను ఎంటర్‌ చేసినందువల్ల మీ అకౌంటు పనికి రాకుండా పోయింది  "
 
 #: ../libpurple/protocols/novell/nmuser.c:1931
 msgid "You cannot add the same person twice to a conversation"
@@ -8168,9 +8586,8 @@
 msgstr "మీకు అనుమతించిన సంబంధాల సంఖ్యకు చేరినారు. "
 
 #: ../libpurple/protocols/novell/nmuser.c:1938
-#, fuzzy
 msgid "You have entered an incorrect screen name"
-msgstr "మీరు పనికిరాని వినియోగదారుని పేరును ఎంటర్ చేసినారు. "
+msgstr "మీరు ఎంటర్ చేసిన స్క్రీన్ పేరు సరైనది కాదు"
 
 #: ../libpurple/protocols/novell/nmuser.c:1941
 msgid "An error occurred while updating the directory"
@@ -8185,9 +8602,7 @@
 msgstr "వినియోగదారుడు మిమ్మల్ని ఆటంకపర్చినాడు."
 
 #: ../libpurple/protocols/novell/nmuser.c:1950
-msgid ""
-"This evaluation version does not allow more than ten users to log in at one "
-"time"
+msgid "This evaluation version does not allow more than ten users to log in at one time"
 msgstr "ఈ ఎవాల్యుయేషన్ వెర్షన్ ఒకేసారి పదిమందికి మించి వినియోగదారులు సంభాషించుటకు అనుమతించదు. "
 
 #: ../libpurple/protocols/novell/nmuser.c:1953
@@ -8197,7 +8612,6 @@
 # #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
 # gnome-session/gsm-client-row.c:43
 # #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
-# gnome-session/gsm-client-row.c:43
 #: ../libpurple/protocols/novell/nmuser.c:1956
 #, c-format
 msgid "Unknown error: 0x%X"
@@ -8208,158 +8622,153 @@
 msgid "Login failed (%s)."
 msgstr "లాగిన్ విఫలమైనది (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:247
+#: ../libpurple/protocols/novell/novell.c:255
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr "సందేశాన్ని పంపడానికి అసమర్థత. వినియోగదారుని వివరాలు లభించలేదు (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:396
+#: ../libpurple/protocols/novell/novell.c:404
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "%s ని మీ మిత్రుల లిస్టుకు చేర్చలేని అసమర్థత (%s)."
 
+# TODO: Improve this! message to who or for what conference?
 #. TODO: Improve this! message to who or for what conference?
-#: ../libpurple/protocols/novell/novell.c:422
+#: ../libpurple/protocols/novell/novell.c:430
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "సందేశాన్ని పంపలేని అసమర్థత (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:493
-#: ../libpurple/protocols/novell/novell.c:985
+#: ../libpurple/protocols/novell/novell.c:501
+#: ../libpurple/protocols/novell/novell.c:993
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "వినియోగదారుని ఆహ్వానించలేని అసమర్థత (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:532
+#: ../libpurple/protocols/novell/novell.c:540
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr "%s కి సందేశం పంపడంలో అసమర్థత. సమావేశం జరపడం సాధ్యం కాలేదు.(%s)।"
 
-#: ../libpurple/protocols/novell/novell.c:537
+#: ../libpurple/protocols/novell/novell.c:545
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "సందేశాన్ని పంపడం సాధ్యం కాదు. సమావేశాన్ని సృష్టించ సాధ్యపడలేదు (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:584
-#, c-format
-msgid ""
-"Unable to move user %s to folder %s in the server side list. Error while "
-"creating folder (%s)."
-msgstr ""
-"%s వినియోగదారుని సెర్వర్ సైడ్ లిస్టులోని %s ఫోల్డర్‌కు చేర్చడం సాధ్యం కావడం లేదు. ఫోల్డర్‌ (%s)ను "
-"సృష్టించడంలో పొరపాటు."
-
-#: ../libpurple/protocols/novell/novell.c:632
-#, c-format
-msgid ""
-"Unable to add %s to your buddy list. Error creating folder in server side "
-"list (%s)."
-msgstr ""
-"మీ మిత్రుల లిస్టుకు  %sను చేర్చడం సాధ్యం కాదు. సెర్వర్ సైడ్ లిస్టు (%s) లో ఫోల్డర్‌ సృష్టించడంలో "
-"పొరపాటు సంభవించింది. "
-
-#: ../libpurple/protocols/novell/novell.c:705
+#: ../libpurple/protocols/novell/novell.c:592
+#, c-format
+msgid "Unable to move user %s to folder %s in the server side list. Error while creating folder (%s)."
+msgstr "%s వినియోగదారుని సెర్వర్ సైడ్ లిస్టులోని %s ఫోల్డర్‌కు చేర్చడం సాధ్యం కావడం లేదు. ఫోల్డర్‌ (%s)ను సృష్టించడంలో పొరపాటు."
+
+#: ../libpurple/protocols/novell/novell.c:640
+#, c-format
+msgid "Unable to add %s to your buddy list. Error creating folder in server side list (%s)."
+msgstr "మీ మిత్రుల లిస్టుకు  %sను చేర్చడం సాధ్యం కాదు. సెర్వర్ సైడ్ లిస్టు (%s) లో ఫోల్డర్‌ సృష్టించడంలో పొరపాటు సంభవించింది. "
+
+#: ../libpurple/protocols/novell/novell.c:713
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "వినియోగదారుని వివరములు దొరకలేదు %s (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:751
-#: ../libpurple/protocols/novell/novell.c:897
+#: ../libpurple/protocols/novell/novell.c:759
+#: ../libpurple/protocols/novell/novell.c:905
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "రహస్య లిస్టు (%s)కు వినియోగదారుని చేర్చడం సాధ్యం కాదు."
 
-#: ../libpurple/protocols/novell/novell.c:798
+#: ../libpurple/protocols/novell/novell.c:806
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "%s ను నిషేధ లిస్టు (%s)లో చేర్చడం సాధ్యం కాదు. "
 
-#: ../libpurple/protocols/novell/novell.c:851
+#: ../libpurple/protocols/novell/novell.c:859
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "%s ను నిషేధ లిస్టు (%s)లో చేర్చడం సాధ్యం కాదు."
 
-#: ../libpurple/protocols/novell/novell.c:919
+#: ../libpurple/protocols/novell/novell.c:927
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "రహస్య లిస్టునుండి (%s) %s ను తొలగించడం సాధ్యంకాదు."
 
-#: ../libpurple/protocols/novell/novell.c:942
-#: ../libpurple/protocols/novell/novell.c:1647
+#: ../libpurple/protocols/novell/novell.c:950
+#: ../libpurple/protocols/novell/novell.c:1656
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "సెర్వర్ సైడ్ రహస్య సెట్టింగులను (%s) మార్చడం సాధ్యంకాదు. "
 
-#: ../libpurple/protocols/novell/novell.c:1012
+#: ../libpurple/protocols/novell/novell.c:1020
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "సమావేశాన్ని (%s) ఏర్పాటుచేయడం సాధ్యంకాదు. "
 
-#: ../libpurple/protocols/novell/novell.c:1121
-#: ../libpurple/protocols/novell/novell.c:1692
+#: ../libpurple/protocols/novell/novell.c:1131
+#: ../libpurple/protocols/novell/novell.c:1702
 msgid "Error communicating with server. Closing connection."
 msgstr "సెర్వర్‌తో సంసర్గంలో పొరపాటు సంభవించింది. కనెక్షన్ క్లోజ్ చేస్తున్నాం."
 
-#: ../libpurple/protocols/novell/novell.c:1476
+#: ../libpurple/protocols/novell/novell.c:1485
 msgid "Telephone Number"
 msgstr "టెలీఫోన్ నెంబర్ "
 
-#: ../libpurple/protocols/novell/novell.c:1482
+#: ../libpurple/protocols/novell/novell.c:1491
 msgid "Personal Title"
 msgstr "వ్యక్తిగత టైటిల్ "
 
-#: ../libpurple/protocols/novell/novell.c:1486
+#: ../libpurple/protocols/novell/novell.c:1495
 msgid "Mailstop"
 msgstr "మెయిల్‌స్టాప్ "
 
-#: ../libpurple/protocols/novell/novell.c:1502
-#: ../libpurple/protocols/sametime/sametime.c:4122
+#: ../libpurple/protocols/novell/novell.c:1511
+#: ../libpurple/protocols/sametime/sametime.c:4168
 msgid "User ID"
 msgstr "వినియోగదారుని ID"
 
+# tag = _("DN");
+# value = nm_user_record_get_dn(user_record);
+# if (value) {
+# g_string_append_printf(info_text, "<b>%s:</b> %s<br>",
+# tag, value);
+# }
 #. tag = _("DN");
 #. value = nm_user_record_get_dn(user_record);
 #. if (value) {
 #. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: ../libpurple/protocols/novell/novell.c:1515
+#: ../libpurple/protocols/novell/novell.c:1524
 msgid "Full name"
 msgstr "పూర్తి పేరు "
 
-#: ../libpurple/protocols/novell/novell.c:1637
+#: ../libpurple/protocols/novell/novell.c:1646
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "గ్రూప్‌వైజ్ సమావేశం %d"
 
-#: ../libpurple/protocols/novell/novell.c:1668
-msgid "Unable to make SSL connection to server."
-msgstr " SSL తో కనెక్షన్ ఏర్పరచుకోవడంలో పొరపాటు సంభవించింది. "
-
-#: ../libpurple/protocols/novell/novell.c:1720
+#: ../libpurple/protocols/novell/novell.c:1729
 msgid "Authenticating..."
 msgstr "ప్రమాణీకరణ జరుగుతోంది ... "
 
-#: ../libpurple/protocols/novell/novell.c:1732
+#: ../libpurple/protocols/novell/novell.c:1743
 msgid "Unable to connect to server."
 msgstr "సెర్వర్‌కు కనెక్ట్‌చేయలేని స్థితి. "
 
-#: ../libpurple/protocols/novell/novell.c:1735
+#: ../libpurple/protocols/novell/novell.c:1746
 msgid "Waiting for response..."
 msgstr "జవాబు కోసం ప్రతీక్ష ... "
 
-#  Remove on type button
-#: ../libpurple/protocols/novell/novell.c:1870
+# Remove on type button
+#: ../libpurple/protocols/novell/novell.c:1881
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s ఈ సంభాషణకు ఆహ్వానించబడినారు."
 
-#  Conversations
-#: ../libpurple/protocols/novell/novell.c:1898
+# Conversations
+#: ../libpurple/protocols/novell/novell.c:1909
 msgid "Invitation to Conversation"
 msgstr "సంభాషణకు ఆహ్వానం. "
 
-#: ../libpurple/protocols/novell/novell.c:1899
+#: ../libpurple/protocols/novell/novell.c:1910
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -8370,41 +8779,44 @@
 "\n"
 "పంపబడింది: %s"
 
-#: ../libpurple/protocols/novell/novell.c:1901
+#: ../libpurple/protocols/novell/novell.c:1912
 msgid "Would you like to join the conversation?"
 msgstr "మీరు సంభాషణలో పాల్గొనదల్చుకున్నారా?"
 
-#. we don't want to reconnect in this case
-#: ../libpurple/protocols/novell/novell.c:2012
+#: ../libpurple/protocols/novell/novell.c:2027
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "మీరు మరో వర్క్‌స్టేషన్‌లో లాగ్ చేసినారు గాన మిమ్మల్ని లగ్‌ ఔట్ చేయడమైనది."
 
-#: ../libpurple/protocols/novell/novell.c:2069
-#, c-format
-msgid ""
-"%s appears to be offline and did not receive the message that you just sent."
+#: ../libpurple/protocols/novell/novell.c:2084
+#, c-format
+msgid "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s ఆఫ్‌లైన్‌లో ఉన్నట్లున్నారు. మీరు పంపిన సందేశం వారు స్వీకరించలేదు. "
 
-#. TODO: Would be nice to prompt if not set!
-#. *  purple_request_fields(gc, _("Server Address"),...);
-#.
-#. ...but for now just error out with a nice message.
-#: ../libpurple/protocols/novell/novell.c:2167
-msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
-msgstr ""
-"సెర్వర్‌కు కనెక్ట్ చేయడం సాధ్యం కాదు. మీరు కనెక్ట్ చేయదల్చుకున్న సెర్వర్ అడ్రసును ఎంటర్ చేయండి. "
-
-#: ../libpurple/protocols/novell/novell.c:2195
+# TODO: Would be nice to prompt if not set!
+# *  gaim_request_fields(gc, _("Server Address"),...);
+# ...but for now just error out with a nice message.
+#: ../libpurple/protocols/novell/novell.c:2184
+msgid "Unable to connect to server. Please enter the address of the server you wish to connect to."
+msgstr "సర్వర్‌కు కనెక్ట్ చేయడం సాధ్యం కాదు. మీరు కనెక్ట్ చేయదల్చుకున్న సెర్వర్ అడ్రసును ఎంటర్ చేయండి. "
+
+#: ../libpurple/protocols/novell/novell.c:2213
 msgid "Error. SSL support is not installed."
 msgstr "పొరపాటు. SSL సపోర్ట్ ఇన్‌స్టాల్ కాలేదు. "
 
-#: ../libpurple/protocols/novell/novell.c:2504
-#, c-format
+#: ../libpurple/protocols/novell/novell.c:2521
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "ఈ సమావేశం ముగిసింది. ఇంకా సందేశాలు పంపడం సాధ్యం కాదు."
 
+# *< type
+# *< ui_requirement
+# *< flags
+# *< dependencies
+# *< priority
+# *< id
+# *< name
+# *< version
+# *  summary
+# *  description
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -8415,48 +8827,65 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3518
-#: ../libpurple/protocols/novell/novell.c:3520
+#: ../libpurple/protocols/novell/novell.c:3535
+#: ../libpurple/protocols/novell/novell.c:3537
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger Protocol Plugin"
 
-#: ../libpurple/protocols/novell/novell.c:3545
+#: ../libpurple/protocols/novell/novell.c:3562
 msgid "Server address"
 msgstr "సెర్వర్ అడ్రసు "
 
-#: ../libpurple/protocols/novell/novell.c:3549
+#: ../libpurple/protocols/novell/novell.c:3566
 msgid "Server port"
 msgstr "సెర్వర్ పోర్ట్ "
 
-#: ../libpurple/protocols/oscar/flap_connection.c:387
-#: ../libpurple/protocols/yahoo/yahoo.c:2469
-#: ../libpurple/protocols/yahoo/yahoo.c:2636
-#: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:581
-#: ../libpurple/proxy.c:1116 ../libpurple/proxy.c:1225
-#: ../libpurple/proxy.c:1325 ../libpurple/proxy.c:1453
-#, fuzzy
+#: ../libpurple/protocols/oscar/flap_connection.c:391
+#: ../libpurple/protocols/yahoo/yahoo.c:2473
+#: ../libpurple/protocols/yahoo/yahoo.c:2641
+#: ../libpurple/protocols/yahoo/ycht.c:482
+#: ../libpurple/proxy.c:584
+#: ../libpurple/proxy.c:1129
+#: ../libpurple/proxy.c:1238
+#: ../libpurple/proxy.c:1338
+#: ../libpurple/proxy.c:1466
 msgid "Server closed the connection."
-msgstr "కనెక్షన్ సృష్టిలో పొరపాటు. "
-
-#: ../libpurple/protocols/oscar/flap_connection.c:389
-#: ../libpurple/protocols/yahoo/yahoo.c:2463
-#: ../libpurple/protocols/yahoo/yahoo.c:2630 ../libpurple/proxy.c:593
-#: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1237
-#: ../libpurple/proxy.c:1337 ../libpurple/proxy.c:1465
-#, fuzzy, c-format
+msgstr "సర్వర్ కనెక్షన్ ను ముగించింది."
+
+#: ../libpurple/protocols/oscar/flap_connection.c:393
+#: ../libpurple/protocols/yahoo/yahoo.c:2466
+#: ../libpurple/protocols/yahoo/yahoo.c:2634
+#: ../libpurple/proxy.c:596
+#: ../libpurple/proxy.c:1141
+#: ../libpurple/proxy.c:1250
+#: ../libpurple/proxy.c:1350
+#: ../libpurple/proxy.c:1478
+#, c-format
 msgid ""
 "Lost connection with server:\n"
 "%s"
-msgstr "మీరు సెర్వర్‌నుండి డిస్‌కనెక్ట్ అయినారు."
-
-#: ../libpurple/protocols/oscar/flap_connection.c:392
-#: ../libpurple/proxy.c:1145 ../libpurple/proxy.c:1250
-#: ../libpurple/proxy.c:1349 ../libpurple/proxy.c:1421
-#: ../libpurple/proxy.c:1478
-#, fuzzy
+msgstr ""
+"సర్వర్ తో కనెక్షన్ పోయింది:\n"
+"%s"
+
+#: ../libpurple/protocols/oscar/flap_connection.c:396
+#: ../libpurple/proxy.c:1158
+#: ../libpurple/proxy.c:1263
+#: ../libpurple/proxy.c:1362
+#: ../libpurple/proxy.c:1434
+#: ../libpurple/proxy.c:1491
 msgid "Received invalid data on connection with server."
-msgstr " SSL తో కనెక్షన్ ఏర్పరచుకోవడంలో పొరపాటు సంభవించింది. "
-
+msgstr "సర్వర్ తో కనెక్షన్ పై చెల్లని డాటా అందింది."
+
+# *< type
+# *< ui_requirement
+# *< flags
+# *< dependencies
+# *< priority
+# *< id
+# *< name
+# *< version
+# *  summary
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -8469,10 +8898,17 @@
 #. *  description
 #: ../libpurple/protocols/oscar/libaim.c:118
 #: ../libpurple/protocols/oscar/libaim.c:120
-#, fuzzy
 msgid "AIM Protocol Plugin"
-msgstr "AIM/ICQ ప్రొటోకాల్ ప్లగ్‌ఇన్ "
-
+msgstr "AIM ప్రోటోకాల్ ప్లగ్ ఇన్"
+
+# *< type
+# *< ui_requirement
+# *< flags
+# *< dependencies
+# *< priority
+# *< id
+# *< name
+# *< version
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -8485,48 +8921,49 @@
 #. *  description
 #: ../libpurple/protocols/oscar/libicq.c:118
 #: ../libpurple/protocols/oscar/libicq.c:120
-#, fuzzy
 msgid "ICQ Protocol Plugin"
-msgstr "IRC ప్రొటోకాల్ ప్లగ్‌ఇన్. "
+msgstr "ICQ ప్రొటోకాల్ ప్లగ్‌ఇన్. "
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4410
+#: ../libpurple/protocols/yahoo/yahoo.c:4421
 #: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "ఎన్‌కోడింగ్ "
 
-#: ../libpurple/protocols/oscar/odc.c:40
-#, fuzzy
+#: ../libpurple/protocols/oscar/odc.c:42
 msgid "The remote user has closed the connection."
-msgstr "రిమోట్ వినియోగదారుడు నెట్‌వర్క్‌లో ఎంతమాత్రం అస్తిత్వంలో లేడు."
-
-#: ../libpurple/protocols/oscar/odc.c:42
-#, fuzzy
-msgid "The remote user has declined your request."
-msgstr "వినియోగదారుడు మిమ్మల్ని ఆటంకపర్చినాడు."
+msgstr "దూరంలోనున్న వినియోగదారు కనెక్షన్ ను ముగించారు."
 
 #: ../libpurple/protocols/oscar/odc.c:44
+msgid "The remote user has declined your request."
+msgstr "దూరంలోనున్న వినియోగదారు మీ అభ్యర్థనను నిరాకరించారు."
+
+#: ../libpurple/protocols/oscar/odc.c:46
 #, c-format
 msgid "Lost connection with the remote user:<br>%s"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/odc.c:47
-msgid "Received invalid data on connection with remote user."
-msgstr ""
+msgstr "దూరంలోనున్న వినియోగదారు: <br>%s తో కనెక్షన్ తెగిపోయింది"
 
 #: ../libpurple/protocols/oscar/odc.c:49
+msgid "Received invalid data on connection with remote user."
+msgstr "దూరంలోనున్న వినియోగదారుతో కనెక్షన్ లో ఉన్నప్పుడు చెల్లని డాటా అందింది."
+
+#: ../libpurple/protocols/oscar/odc.c:51
 msgid "Could not establish a connection with the remote user."
-msgstr ""
-
-#: ../libpurple/protocols/oscar/odc.c:560
-#, fuzzy
+msgstr "దూరంలోనున్న వినియోగదారుతో కనెక్షన్ ఏర్పడలేదు."
+
+#: ../libpurple/protocols/oscar/odc.c:562
 msgid "Direct IM established"
-msgstr "డైరెక్ట్ IM %s సహితంగా స్థాపితం."
+msgstr "ప్రత్యక్ష IM స్థాపించబడింది"
+
+#: ../libpurple/protocols/oscar/odc.c:600
+#, c-format
+msgid "%s tried to send you a %s file, but we only allow files up to %s over Direct IM.  Try using file transfer instead.\n"
+msgstr ""
 
 #: ../libpurple/protocols/oscar/oft.c:656
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
-msgstr ""
+msgstr "%s ఫైలు %s, %s కు మించిన పరిమాణంలో ఉంది."
 
 #: ../libpurple/protocols/oscar/oscar.c:116
 msgid "Invalid error"
@@ -8625,25 +9062,19 @@
 msgstr "AOL ఉన్నప్పుడు కాదు "
 
 #: ../libpurple/protocols/oscar/oscar.c:348
-msgid ""
-"(There was an error receiving this message.  The buddy you are speaking with "
-"is probably using a different encoding than expected.  If you know what "
-"encoding he is using, you can specify it in the advanced account options for "
-"your AIM/ICQ account.)"
-msgstr ""
+msgid "(There was an error receiving this message.  The buddy you are speaking with is probably using a different encoding than expected.  If you know what encoding he is using, you can specify it in the advanced account options for your AIM/ICQ account.)"
+msgstr "(ఈ సందేశాన్ని అందుకోవడంలో లోపం జరిగింది. మీరు మాట్లాడుతున్న మిత్రుని ఎన్ కోడింగ్ బహుశా ఆశించినదానికన్నా భిన్నమైనది  కావచ్చు. తాను ఉపయోగిస్తున్న ఎన్ కోడింగ్ ఏమిటో మీకు తెలిసివుంటే,  మీ AIM/ICQ అకౌంటులోని అడ్వాన్స్డ్ అకౌంట్స్ అవకాశాల్లో దానిని పేర్కొనవచ్చు.)"
 
 #: ../libpurple/protocols/oscar/oscar.c:457
-#, fuzzy, c-format
-msgid ""
-"(There was an error receiving this message.  Either you and %s have "
-"different encodings selected, or %s has a buggy client.)"
-msgstr ""
-"(ఈ సందేశాన్ని స్వీకరించడంలో పొరపాటు సంభవించింది. మీరు మాట్లాడుతున్న మిత్రుడు దాదాపు ఒంటిగుర్రపుబండి "
-"వంటివాడు.)"
-
+#, c-format
+msgid "(There was an error receiving this message.  Either you and %s have different encodings selected, or %s has a buggy client.)"
+msgstr "(ఈ సందేశాన్ని అందుకోవడంలో లోపం జరిగింది.  మీరు మరియు %s భిన్నమైన ఎన్ కోడింగ్ లను ఎంపిక చేసుకొని ఉండవచ్చు, లేదా %s బగ్గీ క్లయింట్ కలిగివుండవచ్చు.)"
+
+# Label
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2387
-#: ../pidgin/gtkutils.c:2417
+#: ../libpurple/protocols/oscar/oscar.c:639
+#: ../pidgin/gtkutils.c:2392
+#: ../pidgin/gtkutils.c:2422
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:332
 msgid "Buddy Icon"
 msgstr "మిత్రుని ఐకన్ "
@@ -8657,19 +9088,19 @@
 msgstr "AIM Direct IM"
 
 #: ../libpurple/protocols/oscar/oscar.c:648
-#: ../libpurple/protocols/silc/silc.c:768
-#: ../libpurple/protocols/silc/util.c:553
+#: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc/util.c:559
 #: ../libpurple/protocols/silc10/silc.c:679
 #: ../libpurple/protocols/silc10/util.c:549
 msgid "Chat"
 msgstr "సంభాషణ "
 
 #: ../libpurple/protocols/oscar/oscar.c:651
-#: ../libpurple/protocols/oscar/oscar.c:6010
+#: ../libpurple/protocols/oscar/oscar.c:6060
 msgid "Get File"
-msgstr "పైలును తీసుకొని రమ్ము. "
-
-#  *  DEFINES, MACROS & DATA TYPES
+msgstr "పైలును తీసుకొని రమ్ము "
+
+# *  DEFINES, MACROS & DATA TYPES
 #: ../libpurple/protocols/oscar/oscar.c:658
 msgid "Games"
 msgstr "క్రీడలు "
@@ -8678,10 +9109,10 @@
 msgid "Add-Ins"
 msgstr "చేరినవి"
 
-#  Buddy List
+# Buddy List
 #: ../libpurple/protocols/oscar/oscar.c:664
 msgid "Send Buddy List"
-msgstr "మిత్రుల లిస్టును పంపుము. "
+msgstr "మిత్రుల లిస్టును పంపుము"
 
 #: ../libpurple/protocols/oscar/oscar.c:667
 msgid "ICQ Direct Connect"
@@ -8701,7 +9132,7 @@
 
 #: ../libpurple/protocols/oscar/oscar.c:679
 msgid "ICQ Server Relay"
-msgstr "ICQ సెర్వర్ రిలే "
+msgstr "ICQ సర్వర్ రిలే "
 
 #: ../libpurple/protocols/oscar/oscar.c:682
 msgid "Old ICQ UTF8"
@@ -8721,7 +9152,7 @@
 
 #: ../libpurple/protocols/oscar/oscar.c:694
 msgid "Security Enabled"
-msgstr "సురక్ష సమర్థత. "
+msgstr "సురక్ష సమర్థత"
 
 #: ../libpurple/protocols/oscar/oscar.c:697
 msgid "Video Chat"
@@ -8740,246 +9171,253 @@
 msgstr "కెమేరా "
 
 #: ../libpurple/protocols/oscar/oscar.c:725
-#: ../libpurple/protocols/oscar/oscar.c:5780
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:5830
 msgid "Free For Chat"
-msgstr "సంభాషించడానికి సమయం ఉంది."
+msgstr "సంభాషించడానికి సమయం ఉంది"
 
 #: ../libpurple/protocols/oscar/oscar.c:729
-#: ../libpurple/protocols/oscar/oscar.c:5815
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:5865
 msgid "Not Available"
-msgstr "లభించదు."
+msgstr "లభించదు"
 
 #: ../libpurple/protocols/oscar/oscar.c:731
-#: ../libpurple/protocols/oscar/oscar.c:5801
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:5851
 msgid "Occupied"
 msgstr "స్వాధీనం చేసుకొన్న"
 
 #: ../libpurple/protocols/oscar/oscar.c:735
-#, c-format
 msgid "Web Aware"
 msgstr "వెబ్ అవగతం "
 
-#: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:183
-#: ../libpurple/protocols/qq/qq.c:288
-#: ../libpurple/protocols/yahoo/yahoo.c:3095 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1060
-#, c-format
+# * Without this selecting Invisible as own status doesn't
+# * work. It's not used and not needed to show status of buddies.
+#: ../libpurple/protocols/oscar/oscar.c:737
+#: ../libpurple/protocols/qq/qq.c:184
+#: ../libpurple/protocols/qq/qq.c:289
+#: ../libpurple/protocols/yahoo/yahoo.c:3106
+#: ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:557
+#: ../pidgin/gtkstatusbox.c:1060
 msgid "Invisible"
 msgstr "అదృశ్య "
 
+# zephyr has several exposures
+# NONE (where you are hidden, and zephyrs to you are in practice silently dropped -- yes this is wrong)
+# OPSTAFF "hidden"
+# REALM-VISIBLE visible to people in local realm
+# REALM-ANNOUNCED REALM-VISIBLE+ plus your logins/logouts are announced to <login,username,*>
+# NET-VISIBLE REALM-ANNOUNCED, plus visible to people in foreign realm
+# NET-ANNOUNCED NET-VISIBLE, plus logins/logouts are announced	 to <login,username,*>
+# Online will set the user to the exposure they have in their options (defaulting to REALM-VISIBLE),
+# Hidden, will set the user's exposure to OPSTAFF
+# Away won't change their exposure but will set an auto away message (for IMs only)
 #: ../libpurple/protocols/oscar/oscar.c:739
-#, c-format
 msgid "Online"
 msgstr "ఆన్‌లైన్ "
 
 #: ../libpurple/protocols/oscar/oscar.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3707
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1126
+#: ../libpurple/protocols/oscar/oscar.c:3717
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721
+#: ../pidgin/gtkprefs.c:1156
 msgid "IP Address"
 msgstr "IP అడ్రస్ "
 
 #: ../libpurple/protocols/oscar/oscar.c:845
-#: ../libpurple/protocols/oscar/oscar.c:2891
+#: ../libpurple/protocols/oscar/oscar.c:2901
 msgid "Warning Level"
-msgstr "వార్నింగ్ లెవల్."
+msgstr "వార్నింగ్ లెవల్"
 
 #: ../libpurple/protocols/oscar/oscar.c:855
 msgid "Buddy Comment"
 msgstr "మిత్రుని వ్యాఖ్య "
 
 #: ../libpurple/protocols/oscar/oscar.c:995
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Could not connect to authentication server:\n"
 "%s"
-msgstr "ట్రాన్స్‌ఫర్ కోసం కనెక్ట్ చేయడం సాధ్యం కాలేదు. "
+msgstr ""
+"ప్రామాణిక సర్వర్ :\n"
+" కు కనెక్ట్ చేయలేకపోయింది %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:1003
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Could not connect to BOS server:\n"
 "%s"
-msgstr "సెర్వర్‌కు కనెక్ట్ చేయడంలో వైఫల్యం. "
+msgstr ""
+"BOS సర్వర్ :\n"
+" కు కనెక్ట్ చేయలేకపోయింది %s"
 
 #: ../libpurple/protocols/oscar/oscar.c:1043
 msgid "Screen name sent"
-msgstr "స్క్రీన్ పేరు పంపబడింది. "
+msgstr "స్క్రీన్ పేరు పంపబడింది"
 
 #: ../libpurple/protocols/oscar/oscar.c:1048
 msgid "Connection established, cookie sent"
-msgstr "కనెక్షన్ చేయడమైంది, కుకీ పంపబడింది."
-
+msgstr "కనెక్షన్ చేయడమైంది, కుకీ పంపబడింది"
+
+# XXX - Don't call this with ssi
 #. TODO: Don't call this with ssi
 #: ../libpurple/protocols/oscar/oscar.c:1077
 msgid "Finalizing connection"
-msgstr "కనెక్షన్‌ను ఫైనలైజేషన్ జరుగుతున్నది."
-
-#: ../libpurple/protocols/oscar/oscar.c:1260
-#, fuzzy, c-format
-msgid ""
-"Unable to login: Could not sign on as %s because the screen name is "
-"invalid.  Screen names must be a valid email address, or start with a letter "
-"and contain only letters, numbers and spaces, or contain only numbers."
-msgstr ""
-"లాగిన్ చేయుట సాధ్యపడదు: మీరు %s సంతకం చేయలేరు. ఎందుకంటే స్క్రీన్‌పేరు పనికిరాదు. స్క్రీన్‌పేరు "
-"అక్షరంతోనే ప్రారంభించాలి. పేరులో అక్షరాలు, అంకెలు, స్పేసులు లేదా కేవలం అంకెలుమాత్రం ఉండవచ్చును. "
-
-#: ../libpurple/protocols/oscar/oscar.c:1345
-#: ../libpurple/protocols/yahoo/yahoo.c:2105
-#, fuzzy
+msgstr "కనెక్షన్‌ను ఫైనలైజేషన్ జరుగుతున్నది"
+
+#: ../libpurple/protocols/oscar/oscar.c:1262
+#, c-format
+msgid "Unable to login: Could not sign on as %s because the screen name is invalid.  Screen names must be a valid email address, or start with a letter and contain only letters, numbers and spaces, or contain only numbers."
+msgstr "లాగిన్ చేయుట సాధ్యపడదు: మీరు %s సంతకం చేయలేరు. ఎందుకంటే స్క్రీన్‌పేరు పనికిరాదు. స్క్రీన్‌పేరు అక్షరంతోనే ప్రారంభించాలి. పేరులో అక్షరాలు, అంకెలు, స్పేసులు లేదా కేవలం అంకెలుమాత్రం ఉండవచ్చును. "
+
+#. Unregistered screen name
+#: ../libpurple/protocols/oscar/oscar.c:1347
+#: ../libpurple/protocols/yahoo/yahoo.c:2108
 msgid "Invalid screen name."
-msgstr "పనికిరాని వినియోగదారుని పేరు. "
-
-#: ../libpurple/protocols/oscar/oscar.c:1352
-#: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1045
-#: ../libpurple/protocols/yahoo/yahoo.c:2126
+msgstr "చెల్లుబాటుకాని స్క్రీన్ పేరు."
+
+#: ../libpurple/protocols/oscar/oscar.c:1353
+#: ../libpurple/protocols/qq/login_logout.c:485
+#: ../libpurple/protocols/simple/simple.c:1112
+#: ../libpurple/protocols/yahoo/yahoo.c:2130
 msgid "Incorrect password."
-msgstr "తప్పు పాస్‌వర్డ్ "
-
+msgstr "తప్పు పాస్‌వర్డ్."
+
+#. Suspended account
 #: ../libpurple/protocols/oscar/oscar.c:1357
 msgid "Your account is currently suspended."
-msgstr "ప్రస్తుతానికి మీ ఎకౌంట్ సస్పెండ్ చేయబడింది. "
-
+msgstr "ప్రస్తుతానికి మీ అకౌంట్ సస్పెండ్ చేయబడింది. "
+
+# service temporarily unavailable
 #. service temporarily unavailable
 #: ../libpurple/protocols/oscar/oscar.c:1361
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL సత్వర మెసెంజర్ సర్వీస్ తాత్కాలికంగా అలభ్యం. "
 
-#: ../libpurple/protocols/oscar/oscar.c:1366
-#: ../libpurple/protocols/oscar/oscar.c:1377
-msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
-msgstr ""
-"మీరు తరచుగా కనెక్ట్ చేస్తున్నారు, డిస్‌కనెక్ట్ చేస్తున్నారు. పది నిమిషాలు ఆగి మరల ప్రయత్నించండి. మీరు "
-"ప్రయత్నాన్ని కొనసాగిస్తే, మీరు ఇంకా ఎక్కువ కాలం ఆగవలసియుంటుంది."
-
-#: ../libpurple/protocols/oscar/oscar.c:1371
+#. screen name connecting too frequently
+#. IP address connecting too frequently
+#: ../libpurple/protocols/oscar/oscar.c:1365
+#: ../libpurple/protocols/oscar/oscar.c:1374
+msgid "You have been connecting and disconnecting too frequently. Wait ten minutes and try again. If you continue to try, you will need to wait even longer."
+msgstr "మీరు తరచుగా కనెక్ట్ చేస్తున్నారు, డిస్‌కనెక్ట్ చేస్తున్నారు. పది నిమిషాలు ఆగి మరల ప్రయత్నించండి. మీరు ప్రయత్నాన్ని కొనసాగిస్తే, మీరు ఇంకా ఎక్కువ కాలం ఆగవలసియుంటుంది."
+
+#. client too old
+#: ../libpurple/protocols/oscar/oscar.c:1369
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "మీకు వాడుతున్న ఖాతాదారుని వెర్షన్ చాలా పాతది. దయచేసి  %s వద్ద అప్‌గ్రేడ్ చేయండి."
 
-#: ../libpurple/protocols/oscar/oscar.c:1410
+#: ../libpurple/protocols/oscar/oscar.c:1407
 msgid "Could Not Connect"
-msgstr "కనెక్ట్ చేయుట సాధ్యం కాదు."
-
-#: ../libpurple/protocols/oscar/oscar.c:1414
+msgstr "కనెక్ట్ చేయుట సాధ్యం కాదు"
+
+#: ../libpurple/protocols/oscar/oscar.c:1411
 msgid "Received authorization"
-msgstr "ప్రమాణీకరణ లభించింది. "
-
-#: ../libpurple/protocols/oscar/oscar.c:1436
+msgstr "ప్రమాణీకరణ లభించింది"
+
+#: ../libpurple/protocols/oscar/oscar.c:1434
 msgid "The SecurID key entered is invalid."
 msgstr "ఎంటర్ చేసిన SecurID పనికిరాదు."
 
-#: ../libpurple/protocols/oscar/oscar.c:1449
+#: ../libpurple/protocols/oscar/oscar.c:1447
 msgid "Enter SecurID"
-msgstr "SecurIDని ఎంటర్ చేయండి. "
-
-#: ../libpurple/protocols/oscar/oscar.c:1450
+msgstr "SecurIDని ఎంటర్ చేయండి"
+
+#: ../libpurple/protocols/oscar/oscar.c:1448
 msgid "Enter the 6 digit number from the digital display."
 msgstr "డిజిటల్ ప్రదర్శననుండి 6 అంకెల నెంబరును ఎంటర్ చేయండి. "
 
-#  *
-#  * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#. *
+#. * @since 2.3.0
+#.
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#. *
+#. * @deprecated Please use purple_request_ok_cancel_with_hint instead.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1452
-#: ../libpurple/protocols/oscar/oscar.c:2232
-#: ../libpurple/protocols/oscar/oscar.c:2281
-#: ../libpurple/protocols/oscar/oscar.c:5885
-#: ../libpurple/protocols/oscar/oscar.c:6166 ../libpurple/request.h:1388
-#, fuzzy
+#: ../libpurple/protocols/oscar/oscar.c:1450
+#: ../libpurple/protocols/oscar/oscar.c:2242
+#: ../libpurple/protocols/oscar/oscar.c:2291
+#: ../libpurple/protocols/oscar/oscar.c:5935
+#: ../libpurple/protocols/oscar/oscar.c:6216
+#: ../libpurple/request.h:1828
+#: ../libpurple/request.h:1841
 msgid "_OK"
-msgstr "అలాగే"
-
-#: ../libpurple/protocols/oscar/oscar.c:1491
-#: ../libpurple/protocols/oscar/oscar.c:1534
-#, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-"త్వరలో మీరు డిస్‌కనెక్ట్ చేయబడవచ్చు. ఇది ఫిక్స్ అయేంతవరకు మీరు TOC ని వాడాలని అనుకోవచ్చు. అప్‌డేట్స్ కోసం "
-"%s చెక్ చేయండి. "
-
-#: ../libpurple/protocols/oscar/oscar.c:1494
-#: ../libpurple/protocols/oscar/oscar.c:1537
-#, fuzzy
+msgstr "_సరే"
+
+#: ../libpurple/protocols/oscar/oscar.c:1489
+#: ../libpurple/protocols/oscar/oscar.c:1532
+#, c-format
+msgid "You may be disconnected shortly.  You may want to use TOC until this is fixed.  Check %s for updates."
+msgstr "త్వరలో మీరు డిస్‌కనెక్ట్ చేయబడవచ్చు. ఇది ఫిక్స్ అయేంతవరకు మీరు TOC ని వాడాలని అనుకోవచ్చు. అప్‌డేట్స్ కోసం %s చెక్ చేయండి. "
+
+#: ../libpurple/protocols/oscar/oscar.c:1492
+#: ../libpurple/protocols/oscar/oscar.c:1535
 msgid "Unable to get a valid AIM login hash."
-msgstr "గెయిమ్‌కు విలువైన AIM లాగిన్ హాష్‌ లభించలేదు."
-
-#: ../libpurple/protocols/oscar/oscar.c:1622
-#, fuzzy, c-format
+msgstr "చెల్లుబాటయ్యే AIM లాగ్ ఇన్  హాష్‌ను పొందడంలో వైఫల్యం. "
+
+#: ../libpurple/protocols/oscar/oscar.c:1620
+#, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr ""
-"త్వరలో మీరు డిస్‌కనెక్ట్ చేయబడవచ్చు. ఇది ఫిక్స్ అయేంతవరకు మీరు TOC ని వాడాలని అనుకోవచ్చు. అప్‌డేట్స్ కోసం "
-"%s చెక్ చేయండి. "
-
-#: ../libpurple/protocols/oscar/oscar.c:1625
-#, fuzzy
+msgstr "మీరు త్వరలో డిస్కనెక్ట్ కాబోతున్నారు.  అప్ డేట్లకోసం %s చూడండి."
+
+#: ../libpurple/protocols/oscar/oscar.c:1623
 msgid "Unable to get a valid login hash."
-msgstr "గెయిమ్‌కు విలువైన లాగిన్ హాష్‌ లభించలేదు."
-
-#: ../libpurple/protocols/oscar/oscar.c:1655
+msgstr "చెల్లుబాటయ్యే లాగ్ ఇన్  హాష్‌ను పొందడంలో వైఫల్యం. "
+
+#: ../libpurple/protocols/oscar/oscar.c:1653
 msgid "Password sent"
-msgstr "పాస్‌వర్డ్ పంపబడింది."
-
-#: ../libpurple/protocols/oscar/oscar.c:1711
-#, fuzzy
+msgstr "పాస్‌వర్డ్ పంపబడింది"
+
+#: ../libpurple/protocols/oscar/oscar.c:1709
 msgid "Unable to initialize connection"
-msgstr "కొత్త కనెక్షన్ సృష్టించడంలో అసమర్థత. "
-
-#: ../libpurple/protocols/oscar/oscar.c:2202
+msgstr "కనెక్షన్ ను ప్రారంభించలేకపోతున్నాం"
+
+#: ../libpurple/protocols/oscar/oscar.c:2200
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "నాకు అధికారమివ్వండి, తద్వారా మీ పేరును నా మిత్రుల లిస్టులో చేర్చుకుంటాను. "
 
-#: ../libpurple/protocols/oscar/oscar.c:2230
+#: ../libpurple/protocols/oscar/oscar.c:2240
 msgid "Authorization Request Message:"
 msgstr "ఆథరైజేషన్ కోసం విజ్ఞప్తి సందేశం: "
 
-#: ../libpurple/protocols/oscar/oscar.c:2231
+#: ../libpurple/protocols/oscar/oscar.c:2241
 msgid "Please authorize me!"
-msgstr "దయచేసి నన్ను ఆథరైజ్ చేయండి. "
-
-#: ../libpurple/protocols/oscar/oscar.c:2272
-#: ../libpurple/protocols/oscar/oscar.c:2280
-#: ../libpurple/protocols/oscar/oscar.c:2407
-#: ../libpurple/protocols/oscar/oscar.c:5263
-#: ../libpurple/protocols/yahoo/yahoo.c:1030
+msgstr "దయచేసి నన్ను ఆథరైజ్ చేయండి!"
+
+#: ../libpurple/protocols/oscar/oscar.c:2282
+#: ../libpurple/protocols/oscar/oscar.c:2290
+#: ../libpurple/protocols/oscar/oscar.c:2417
+#: ../libpurple/protocols/oscar/oscar.c:5311
+#: ../libpurple/protocols/yahoo/yahoo.c:1032
 msgid "No reason given."
 msgstr "కారణం ఇవ్వలేదు. "
 
-#: ../libpurple/protocols/oscar/oscar.c:2279
+#: ../libpurple/protocols/oscar/oscar.c:2289
 msgid "Authorization Denied Message:"
 msgstr "ఆథరైజేషన్ నిరాకరణ సందేశం:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2407
-#, c-format
-msgid ""
-"The user %u has denied your request to add them to your buddy list for the "
-"following reason:\n"
+#: ../libpurple/protocols/oscar/oscar.c:2417
+#, c-format
+msgid ""
+"The user %u has denied your request to add them to your buddy list for the following reason:\n"
 "%s"
 msgstr ""
-"వినియోగదారుడు %u తన పేరును మీ మిత్రుల లిస్టులో చేర్చుటకు ఈ క్రింది కారణములచేత మీ అభ్యర్థనను "
-"నిరాకరించారు.:\n"
+"వినియోగదారుడు %u తన పేరును మీ మిత్రుల లిస్టులో చేర్చుటకు ఈ క్రింది కారణములచేత మీ అభ్యర్థనను నిరాకరించారు.:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2408
+#: ../libpurple/protocols/oscar/oscar.c:2418
 msgid "ICQ authorization denied."
 msgstr "ICQ ఆథరైజేషన్ నిరాకరింపబడింది."
 
+# Someone has granted you authorization
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2415
+#: ../libpurple/protocols/oscar/oscar.c:2425
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "వినియోగదారుడు %u తన పేరును మీ మిత్రుల లిస్టులో చేర్చుటకు మీ అభ్యర్థనను ఆమోదించారు."
 
-#: ../libpurple/protocols/oscar/oscar.c:2423
+#: ../libpurple/protocols/oscar/oscar.c:2433
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8992,7 +9430,7 @@
 "\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2431
+#: ../libpurple/protocols/oscar/oscar.c:2441
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -9005,7 +9443,7 @@
 "From: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2439
+#: ../libpurple/protocols/oscar/oscar.c:2449
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -9018,71 +9456,70 @@
 "సందేశ పాఠం:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2460
+#: ../libpurple/protocols/oscar/oscar.c:2470
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ వినియోగదారుడు %u మీ కొక మిత్రుని పంపినారు: %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2466
+#: ../libpurple/protocols/oscar/oscar.c:2476
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "ఈ మిత్రుని మీ మిత్రుల లిస్టులో చేర్చదల్చుకున్నారా?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2471 ../pidgin/gtkroomlist.c:309
+#: ../libpurple/protocols/oscar/oscar.c:2481
+#: ../pidgin/gtkroomlist.c:318
 #, fuzzy
 msgid "_Add"
 msgstr "చేర్చు "
 
-#: ../libpurple/protocols/oscar/oscar.c:2472
-#, fuzzy
+#: ../libpurple/protocols/oscar/oscar.c:2482
 msgid "_Decline"
-msgstr "క్షీణించు"
-
-#: ../libpurple/protocols/oscar/oscar.c:2596
+msgstr "నిరాకరించు"
+
+#: ../libpurple/protocols/oscar/oscar.c:2606
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "మీరు %hu సందేశాన్ని %s నుండి మిస్ అయినారు. ఎందుకంటే దానికి విలువ లేదు."
 msgstr[1] "మీరు %hu సందేశాన్ని %s నుండి మిస్ అయినారు. ఎందుకంటే దానికి విలువ లేదు."
 
-#: ../libpurple/protocols/oscar/oscar.c:2605
+#: ../libpurple/protocols/oscar/oscar.c:2615
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "మీరు %hu సందేశాన్ని %s నుండి కోల్పోయినారు. ఎందుకంటే అది చాలా పెద్దది కనుక. "
 msgstr[1] "మీరు %hu సందేశాన్ని %s నుండి కోల్పోయినారు. ఎందుకంటే అది చాలా పెద్దది కనుక. "
 
-#: ../libpurple/protocols/oscar/oscar.c:2614
-#, c-format
-msgid ""
-"You missed %hu message from %s because the rate limit has been exceeded."
-msgid_plural ""
-"You missed %hu messages from %s because the rate limit has been exceeded."
+#: ../libpurple/protocols/oscar/oscar.c:2624
+#, c-format
+msgid "You missed %hu message from %s because the rate limit has been exceeded."
+msgid_plural "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "మీరు %hu సందేశాన్ని %s నుండి  కోల్పోయినారు. ఎందుకంటే రేట్ లిమిట్ ఎక్కువైనది."
 msgstr[1] "మీరు %hu సందేశాన్ని %s నుండి  కోల్పోయినారు. ఎందుకంటే రేట్ లిమిట్ ఎక్కువైనది."
 
-#: ../libpurple/protocols/oscar/oscar.c:2623
+#: ../libpurple/protocols/oscar/oscar.c:2633
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "మీరు %hu సందేశాన్ని %s నుండి కోల్పోయినారు. ఎందుకంటే అతడు/ఆమె బహు దుర్మార్గులు."
 msgstr[1] "మీరు %hu సందేశాన్ని %s నుండి కోల్పోయినారు. ఎందుకంటే అతడు/ఆమె బహు దుర్మార్గులు."
 
-#: ../libpurple/protocols/oscar/oscar.c:2632
+#: ../libpurple/protocols/oscar/oscar.c:2642
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "మీరు %hu  సందేశాన్ని  %s నుండి   కోల్పోయారు. ఎందుకంటే మీరు దుర్మార్గులు కనుక."
 msgstr[1] "మీరు %hu  సందేశాన్ని  %s నుండి   కోల్పోయారు. ఎందుకంటే మీరు దుర్మార్గులు కనుక."
 
-#: ../libpurple/protocols/oscar/oscar.c:2641
+#: ../libpurple/protocols/oscar/oscar.c:2651
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "అజ్ఞాత కారణములచేత మీరు %hu సందేశాలను %s నుండి  కోల్పోయినారు. "
 msgstr[1] "आपको अज्ञात कारनों से साइन-ऑफ करा गया है।"
 
+# Data is assumed to be the destination sn
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2796
+#: ../libpurple/protocols/oscar/oscar.c:2806
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "సందేశం పంపడం సాధ్యంకాదు: %s"
@@ -9090,573 +9527,492 @@
 # #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
 # gnome-session/gsm-client-row.c:43
 # #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
-# gnome-session/gsm-client-row.c:43
-#: ../libpurple/protocols/oscar/oscar.c:2796
-#: ../libpurple/protocols/oscar/oscar.c:2801
-#: ../libpurple/protocols/oscar/oscar.c:2865
+#: ../libpurple/protocols/oscar/oscar.c:2806
+#: ../libpurple/protocols/oscar/oscar.c:2811
+#: ../libpurple/protocols/oscar/oscar.c:2875
 msgid "Unknown reason."
 msgstr "కారణం తెలియదు. "
 
-#: ../libpurple/protocols/oscar/oscar.c:2799
-#: ../libpurple/protocols/sametime/sametime.c:2409
+#: ../libpurple/protocols/oscar/oscar.c:2809
+#: ../libpurple/protocols/sametime/sametime.c:2451
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "%s కి సందేశం పంపడం కష్టం."
 
-#: ../libpurple/protocols/oscar/oscar.c:2865
+#: ../libpurple/protocols/oscar/oscar.c:2875
 #, c-format
 msgid "User information not available: %s"
 msgstr "వినియోగదారుని జాడ లభించడంలేదు: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2896
+#: ../libpurple/protocols/oscar/oscar.c:2906
 msgid "Online Since"
 msgstr "నుండి ఆన్‌లైన్. "
 
-#: ../libpurple/protocols/oscar/oscar.c:2901
+#: ../libpurple/protocols/oscar/oscar.c:2911
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr "నుండి సభ్యుడు."
 
-#: ../libpurple/protocols/oscar/oscar.c:2936
-#, fuzzy
+#: ../libpurple/protocols/oscar/oscar.c:2946
 msgid "Available Message"
-msgstr "లభ్యమైన సందేశం:"
-
-#: ../libpurple/protocols/oscar/oscar.c:3044
+msgstr "అందుబాటులో ఉన్న సందేశం"
+
+#: ../libpurple/protocols/oscar/oscar.c:3054
 msgid "Your AIM connection may be lost."
 msgstr "మీరు AIM కనెక్షన్ కోల్పోవచ్చు."
 
+# The conversion failed!
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3232
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
+#: ../libpurple/protocols/oscar/oscar.c:3242
+msgid "[Unable to display a message from this user because it contained invalid characters.]"
 msgstr "[ఈ వినియోగదారుని సందేశంలో విలువలేని అక్షరాలున్నందువల్ల ప్రదర్శించుట  సాధ్యపడదు]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3396
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again."
-msgstr ""
-"మీరు ప్రయత్నించిన చివరి చర్యను నెరవేర్చడం సాధ్యం కాదు ఎందుకంటే మీరు ధరయొక్క హద్దును దాటిపోయారు. పది "
-"సెకండ్లు ఆగి మరల ప్రయత్నించండి. "
-
-#: ../libpurple/protocols/oscar/oscar.c:3479
+#: ../libpurple/protocols/oscar/oscar.c:3406
+msgid "The last action you attempted could not be performed because you are over the rate limit. Please wait 10 seconds and try again."
+msgstr "మీరు ప్రయత్నించిన చివరి చర్యను నెరవేర్చడం సాధ్యం కాదు ఎందుకంటే మీరు ధరయొక్క హద్దును దాటిపోయారు. పది సెకండ్లు ఆగి మరల ప్రయత్నించండి. "
+
+#: ../libpurple/protocols/oscar/oscar.c:3489
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "సంభాషణ గది %s నుండి మీరు డిస్‌కనెక్ట్ చేయబడినారు "
 
-#: ../libpurple/protocols/oscar/oscar.c:3729
-#: ../libpurple/protocols/silc/util.c:585
+#: ../libpurple/protocols/oscar/oscar.c:3739
+#: ../libpurple/protocols/silc/util.c:591
 #: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "మొబైల్ ఫోన్"
 
-#: ../libpurple/protocols/oscar/oscar.c:3759
+#: ../libpurple/protocols/oscar/oscar.c:3769
 msgid "Personal Web Page"
 msgstr "వ్యక్తిగత వెబ్ పేజీ "
 
-#: ../libpurple/protocols/oscar/oscar.c:3783
+#: ../libpurple/protocols/oscar/oscar.c:3793
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "అదనపు సమాచారం "
 
-#: ../libpurple/protocols/oscar/oscar.c:3791
-#: ../libpurple/protocols/oscar/oscar.c:3804
+#: ../libpurple/protocols/oscar/oscar.c:3801
+#: ../libpurple/protocols/oscar/oscar.c:3814
 msgid "Zip Code"
 msgstr "జిప్ కోడ్ "
 
-#: ../libpurple/protocols/oscar/oscar.c:3815
+#: ../libpurple/protocols/oscar/oscar.c:3825
 msgid "Division"
 msgstr "విభాగం "
 
-#: ../libpurple/protocols/oscar/oscar.c:3816
+#: ../libpurple/protocols/oscar/oscar.c:3826
 msgid "Position"
 msgstr "స్థానం "
 
-#: ../libpurple/protocols/oscar/oscar.c:3818
+#: ../libpurple/protocols/oscar/oscar.c:3828
 msgid "Web Page"
 msgstr "వెబ్ పేజీ "
 
-#: ../libpurple/protocols/oscar/oscar.c:3821
+#: ../libpurple/protocols/oscar/oscar.c:3831
 msgid "Work Information"
 msgstr "పని సమాచారం "
 
-#: ../libpurple/protocols/oscar/oscar.c:3877
+#: ../libpurple/protocols/oscar/oscar.c:3887
 msgid "Pop-Up Message"
 msgstr "పాప్-అప్ సందేశం "
 
-#: ../libpurple/protocols/oscar/oscar.c:3917
-#, fuzzy, c-format
+# TODO: Need to use ngettext() here
+#: ../libpurple/protocols/oscar/oscar.c:3927
+#, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "ఈ క్రింది స్క్రీన్‌పేరులు %sతో అనుబంధమై ఉన్నాయి. "
 msgstr[1] "ఈ క్రింది స్క్రీన్‌పేరులు %sతో అనుబంధమై ఉన్నాయి. "
 
-#: ../libpurple/protocols/oscar/oscar.c:3922
+#: ../libpurple/protocols/oscar/oscar.c:3932
 #, fuzzy
 msgid "Screen name"
 msgstr "_స్క్రీన్ పేరు "
 
-#: ../libpurple/protocols/oscar/oscar.c:3948
+#: ../libpurple/protocols/oscar/oscar.c:3958
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "%s ఇ-మెయిల్ అడ్రస్‌కు ఫలితాలు కనిపించలేదు. "
 
-#: ../libpurple/protocols/oscar/oscar.c:3969
+#: ../libpurple/protocols/oscar/oscar.c:3979
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "%s నిర్ధారించమని కోరుతూ మీరు ఒక ఇ-మెయిల్‌ను స్వీకరించాలి. "
 
-#: ../libpurple/protocols/oscar/oscar.c:3971
+#: ../libpurple/protocols/oscar/oscar.c:3981
 msgid "Account Confirmation Requested"
-msgstr "ఖాతా నిర్ధారణకు మనవి. "
-
-#: ../libpurple/protocols/oscar/oscar.c:4002
-#, c-format
+msgstr "అకౌంటు నిర్ధారణకు మనవి. "
+
+#: ../libpurple/protocols/oscar/oscar.c:4012
 msgid "Error Changing Account Info"
-msgstr "ఖాతా సమాచారాన్ని మార్చడంలో పొరపాటు. "
-
-#: ../libpurple/protocols/oscar/oscar.c:4005
-#, c-format
-msgid ""
-"Error 0x%04x: Unable to format screen name because the requested screen name "
-"differs from the original."
-msgstr ""
-"పొరపాటు 0x%04x: స్క్రీన్‌పేరును మార్చుట సాధ్యం కాదు. ఎందుకంటే కోరుకున్న స్క్రీన్‌పేరు అసలైనపేరుకు "
-"భిన్నంగా ఉంది. "
-
-#: ../libpurple/protocols/oscar/oscar.c:4008
-#, fuzzy, c-format
+msgstr "అకౌంటు సమాచారాన్ని మార్చడంలో పొరపాటు. "
+
+#: ../libpurple/protocols/oscar/oscar.c:4015
+#, c-format
+msgid "Error 0x%04x: Unable to format screen name because the requested screen name differs from the original."
+msgstr "పొరపాటు 0x%04x: స్క్రీన్‌పేరును మార్చుట సాధ్యం కాదు. ఎందుకంటే కోరుకున్న స్క్రీన్‌పేరు అసలైనపేరుకు భిన్నంగా ఉంది. "
+
+#: ../libpurple/protocols/oscar/oscar.c:4018
+#, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
+msgstr "0x%04x లోపం: స్క్రీన్ పేరును ఫార్మాట్ చేయలేకపోయింది ఎందుకంటే అది చెల్లదు."
+
+#: ../libpurple/protocols/oscar/oscar.c:4021
+#, c-format
+msgid "Error 0x%04x: Unable to format screen name because the requested screen name is too long."
 msgstr "పొరపాటు 0x%04x: స్క్రీన్‌పేరు  ఫార్మాట్ చేయడం సాధ్యం కాదు, ఎందుకంటే అది చాలా పొడవుగా ఉంది."
 
-#: ../libpurple/protocols/oscar/oscar.c:4011
-#, c-format
-msgid ""
-"Error 0x%04x: Unable to format screen name because the requested screen name "
-"is too long."
-msgstr "పొరపాటు 0x%04x: స్క్రీన్‌పేరు  ఫార్మాట్ చేయడం సాధ్యం కాదు, ఎందుకంటే అది చాలా పొడవుగా ఉంది."
-
-#: ../libpurple/protocols/oscar/oscar.c:4014
-#, c-format
-msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
-"request pending for this screen name."
-msgstr ""
-"పొరపాటు 0x%04x: ఇ-మెయిల్ అడ్రస్‌ను మార్చడం సాధ్యం కాదు, ఎందుకంటే ఇదే స్క్రీన్‌పేరును మరొకరు మీకంటే "
-"ముందే కోరినారు. అది పెండింగ్‌లో ఉంది. "
-
-#: ../libpurple/protocols/oscar/oscar.c:4017
-#, c-format
-msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
-"too many screen names associated with it."
-msgstr ""
-"పొరపాటు 0x%04x: ఇ-మెయిల్ అడ్రస్‌ను మార్చడం సాధ్యం కాదు, ఎందుకంటే ఇచ్చిన అడ్రసుకు చాలా స్క్రీన్‌పేరులు "
-"అనుబంధమై ఉన్నాయి. "
-
-#: ../libpurple/protocols/oscar/oscar.c:4020
-#, c-format
-msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
-"invalid."
+#: ../libpurple/protocols/oscar/oscar.c:4024
+#, c-format
+msgid "Error 0x%04x: Unable to change e-mail address because there is already a request pending for this screen name."
+msgstr "పొరపాటు 0x%04x: ఇ-మెయిల్ అడ్రస్‌ను మార్చడం సాధ్యం కాదు, ఎందుకంటే ఇదే స్క్రీన్‌పేరును మరొకరు మీకంటే ముందే కోరినారు. అది పెండింగ్‌లో ఉంది. "
+
+#: ../libpurple/protocols/oscar/oscar.c:4027
+#, c-format
+msgid "Error 0x%04x: Unable to change e-mail address because the given address has too many screen names associated with it."
+msgstr "పొరపాటు 0x%04x: ఇ-మెయిల్ అడ్రస్‌ను మార్చడం సాధ్యం కాదు, ఎందుకంటే ఇచ్చిన అడ్రసుకు చాలా స్క్రీన్‌పేరులు అనుబంధమై ఉన్నాయి. "
+
+#: ../libpurple/protocols/oscar/oscar.c:4030
+#, c-format
+msgid "Error 0x%04x: Unable to change e-mail address because the given address is invalid."
 msgstr "పొరపాటు 0x%04x:  ఈ-మెయిల్ అడ్రసును మార్చలేము, ఎందుకంటే ఇచ్చిన అడ్రసుకు విలువ లేదు."
 
-#: ../libpurple/protocols/oscar/oscar.c:4023
+#: ../libpurple/protocols/oscar/oscar.c:4033
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "పొరపాటు 0x%04x: అజ్ఞాత పొరపాటు."
 
-#: ../libpurple/protocols/oscar/oscar.c:4033
+#: ../libpurple/protocols/oscar/oscar.c:4043
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "%s ఇ-మెయిల్ అడ్రస్ %s"
 
-#  And now for the buttons
-#: ../libpurple/protocols/oscar/oscar.c:4035
+# And now for the buttons
+#: ../libpurple/protocols/oscar/oscar.c:4045
 msgid "Account Info"
-msgstr "ఖాతా వివరణ"
-
-#: ../libpurple/protocols/oscar/oscar.c:4218
-msgid ""
-"Your IM Image was not sent. You must be Direct Connected to send IM Images."
+msgstr "అకౌంటు వివరణ"
+
+#: ../libpurple/protocols/oscar/oscar.c:4228
+msgid "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "IM సచిత్రాన్ని పంపలేదు. IM సచిత్రాలను పంపడానికి మీకు డైరెక్ట్ కనెక్షన్ అవసరం.  "
 
-#: ../libpurple/protocols/oscar/oscar.c:4489
+#: ../libpurple/protocols/oscar/oscar.c:4499
 msgid "Unable to set AIM profile."
 msgstr "AIM  ప్రొఫైల్‌ను సెట్ చేయడంలో అసమర్థత. "
 
-#: ../libpurple/protocols/oscar/oscar.c:4490
-msgid ""
-"You have probably requested to set your profile before the login procedure "
-"completed.  Your profile remains unset; try setting it again when you are "
-"fully connected."
-msgstr ""
-"లాగిన్ ప్రొసీజర్ పూర్తికాకముందే బహుశా మీరు మీ ప్రొఫైల్‌ను సెట్ చేయవలసిందిగా కోరియుండవచ్చు. మీ ప్రొఫైల్ "
-"సెట్‌చేయకుండా అలాగే ఉంది. మీకు పూర్తి కనెక్షన్ లభించిన తర్వాత మరల సెట్ చేయడానికి ప్రయత్నించండి. "
-
-#: ../libpurple/protocols/oscar/oscar.c:4504
-#, fuzzy, c-format
-msgid ""
-"The maximum profile length of %d byte has been exceeded.  It has been "
-"truncated for you."
-msgid_plural ""
-"The maximum profile length of %d bytes has been exceeded.  It has been "
-"truncated for you."
-msgstr[0] ""
-"మీ ప్రొఫైల్‌కు గరిష్ట పొడవును %d బైట్స్‌ను అధిగమించింది. గెయిమ్ మీకోసం అదనపు పొడవును ఉత్తరించింది. "
+#: ../libpurple/protocols/oscar/oscar.c:4500
+msgid "You have probably requested to set your profile before the login procedure completed.  Your profile remains unset; try setting it again when you are fully connected."
+msgstr "లాగిన్ ప్రొసీజర్ పూర్తికాకముందే బహుశా మీరు మీ ప్రొఫైల్‌ను సెట్ చేయవలసిందిగా కోరియుండవచ్చు. మీ ప్రొఫైల్ సెట్‌చేయకుండా అలాగే ఉంది. మీకు పూర్తి కనెక్షన్ లభించిన తర్వాత మరల సెట్ చేయడానికి ప్రయత్నించండి. "
+
+#: ../libpurple/protocols/oscar/oscar.c:4514
+#, c-format
+msgid "The maximum profile length of %d byte has been exceeded.  It has been truncated for you."
+msgid_plural "The maximum profile length of %d bytes has been exceeded.  It has been truncated for you."
+msgstr[0] "మీ ప్రొఫైల్‌కు గరిష్ట పొడవును %d బైట్స్‌ను అధిగమించింది. గెయిమ్ మీకోసం అదనపు పొడవును ఉత్తరించింది. "
 msgstr[1] "प्रोफाइल की अधिकतम लम्बाई %d बाइट पार हो गयी है।"
 
-#: ../libpurple/protocols/oscar/oscar.c:4509
+#: ../libpurple/protocols/oscar/oscar.c:4519
 msgid "Profile too long."
 msgstr "ప్రొఫైల్ చాలా పొడవుగా ఉంది. "
 
-#: ../libpurple/protocols/oscar/oscar.c:4554
-#, fuzzy, c-format
-msgid ""
-"The maximum away message length of %d byte has been exceeded.  It has been "
-"truncated for you."
-msgid_plural ""
-"The maximum away message length of %d bytes has been exceeded.  It has been "
-"truncated for you."
-msgstr[0] ""
-"దూరంగా ఉన్న సందేశం పొడవు %d ను అధిగమించినది. గెయిమ్ మీకోసం అదనపు పొడవును ఉత్తరించింది. "
-msgstr[1] ""
-"अनुपस्थिति संदेश की अधिकतम लम्बाई %d बाइच पार हो गयी है। गेम ने इसे आपके लिए काट दिया "
-"है।"
-
-#: ../libpurple/protocols/oscar/oscar.c:4559
+#: ../libpurple/protocols/oscar/oscar.c:4564
+#, c-format
+msgid "The maximum away message length of %d byte has been exceeded.  It has been truncated for you."
+msgid_plural "The maximum away message length of %d bytes has been exceeded.  It has been truncated for you."
+msgstr[0] "దూరంగా ఉన్న సందేశం పొడవు %d ను అధిగమించినది. గెయిమ్ మీకోసం అదనపు పొడవును ఉత్తరించింది. "
+msgstr[1] "अनुपस्थिति संदेश की अधिकतम लम्बाई %d बाइच पार हो गयी है। गेम ने इसे आपके लिए काट दिया है।"
+
+#: ../libpurple/protocols/oscar/oscar.c:4569
 msgid "Away message too long."
 msgstr "దూరంగా ఉన్న సందేశం చాలా పొడవు."
 
-#: ../libpurple/protocols/oscar/oscar.c:4628
-#, fuzzy, c-format
-msgid ""
-"Could not add the buddy %s because the screen name is invalid.  Screen names "
-"must be a valid email address, or start with a letter and contain only "
-"letters, numbers and spaces, or contain only numbers."
-msgstr ""
-"మిత్రుడు  %s ను చేర్చడం సాధ్యం కాదు, ఎందుకంటే స్క్రీన్‌పేరుకు విలువ లేదు. స్క్రీన్‌పేరులు విధిగా "
-"అక్షరంతో ప్రారంభమై తర్వాత అక్షరాలు, అంకెలు మరియు స్పేసులు ఉండవచ్చు, లేదా కేవలం అంకెలుమాత్రమే "
-"ఉండవచ్చు."
-
-#: ../libpurple/protocols/oscar/oscar.c:4630
-#: ../libpurple/protocols/oscar/oscar.c:5060
-#: ../libpurple/protocols/oscar/oscar.c:5075
+#: ../libpurple/protocols/oscar/oscar.c:4642
+#, c-format
+msgid "Could not add the buddy %s because the screen name is invalid.  Screen names must be a valid email address, or start with a letter and contain only letters, numbers and spaces, or contain only numbers."
+msgstr "మిత్రుడు  %s ను చేర్చడం సాధ్యం కాదు, ఎందుకంటే స్క్రీన్‌పేరుకు విలువ లేదు. స్క్రీన్‌పేరులు విధిగా అక్షరంతో ప్రారంభమై తర్వాత అక్షరాలు, అంకెలు మరియు స్పేసులు ఉండవచ్చు, లేదా కేవలం అంకెలుమాత్రమే ఉండవచ్చు."
+
+#: ../libpurple/protocols/oscar/oscar.c:4644
+#: ../libpurple/protocols/oscar/oscar.c:5097
+#: ../libpurple/protocols/oscar/oscar.c:5112
 msgid "Unable To Add"
 msgstr "చేర్చుట సాధ్యం కాదు. "
 
-#: ../libpurple/protocols/oscar/oscar.c:4739
+#: ../libpurple/protocols/oscar/oscar.c:4763
 msgid "Unable To Retrieve Buddy List"
 msgstr "మిత్రుల లిస్టును పొందుట సాధ్యంకాదు."
 
-#: ../libpurple/protocols/oscar/oscar.c:4740
-#, fuzzy
-msgid ""
-"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."
-msgstr ""
-"గెయిమ్ - AIM సెర్వర్లనుండి మీ మిత్రుల లిస్టును వెలికి తీసుకురాలేకపోతోంది. మీ మిత్రుల లిస్టు ఎటో పోలేదు. "
-"బహుశా కొన్ని గంటల్లో దొరకవచ్చు."
-
-#: ../libpurple/protocols/oscar/oscar.c:4922
-#: ../libpurple/protocols/oscar/oscar.c:4924
-#: ../libpurple/protocols/oscar/oscar.c:5140
-#: ../libpurple/protocols/oscar/oscar.c:5141
-#: ../libpurple/protocols/oscar/oscar.c:5146
+#: ../libpurple/protocols/oscar/oscar.c:4764
+#, fuzzy
+msgid "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 minutes."
+msgstr "AIM సర్వర్లు తాత్కాలికంగా మీ మిత్రుల జాబితాను పంపలేకపోయాయి. మీ మిత్రుల జాబితా అదృశ్యం కాలేదు, కొన్ని గంటల్లో  మీకు అందుబాటులోకి వస్తుంది."
+
+#: ../libpurple/protocols/oscar/oscar.c:4947
+#: ../libpurple/protocols/oscar/oscar.c:4949
+#: ../libpurple/protocols/oscar/oscar.c:5177
+#: ../libpurple/protocols/oscar/oscar.c:5178
+#: ../libpurple/protocols/oscar/oscar.c:5183
 msgid "Orphans"
 msgstr "అనాథలు "
 
-#: ../libpurple/protocols/oscar/oscar.c:5058
-#, c-format
-msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
-"list.  Please remove one and try again."
-msgstr ""
-"మీ మిత్రుల లిస్టులో ఇప్పటికే చాలామంది ఉన్నందువల్ల ఈ మిత్రుని %s చేర్చడం సాధ్యంకాదు. ఒక పేరును తొలగించి "
-"మరల ప్రయత్నించండి.  "
-
-#: ../libpurple/protocols/oscar/oscar.c:5058
-#: ../libpurple/protocols/oscar/oscar.c:5073
+#: ../libpurple/protocols/oscar/oscar.c:5095
+#, c-format
+msgid "Could not add the buddy %s because you have too many buddies in your buddy list.  Please remove one and try again."
+msgstr "మీ మిత్రుల లిస్టులో ఇప్పటికే చాలామంది ఉన్నందువల్ల ఈ మిత్రుని %s చేర్చడం సాధ్యంకాదు. ఒక పేరును తొలగించి మరల ప్రయత్నించండి.  "
+
+#: ../libpurple/protocols/oscar/oscar.c:5095
+#: ../libpurple/protocols/oscar/oscar.c:5110
 msgid "(no name)"
 msgstr "(పేరు లేదు)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5072
-#, fuzzy, c-format
+#: ../libpurple/protocols/oscar/oscar.c:5109
+#, c-format
 msgid "Could not add the buddy %s for an unknown reason."
 msgstr "అజ్ఞాత కారణంవల్ల మీ కమాండ్ విఫలమైనది."
 
-#: ../libpurple/protocols/oscar/oscar.c:5178
-#, c-format
-msgid ""
-"The user %s has given you permission to add you to their buddy list.  Do you "
-"want to add them?"
-msgstr ""
-"మిమ్ములను తన మిత్రుల లిస్టులో చేర్చుటకు వినియోగాదారుడు %s అనుమతించినాడు. వారిని కలవడం మీకు ఇష్టమేనా?"
-
-#: ../libpurple/protocols/oscar/oscar.c:5186
+#: ../libpurple/protocols/oscar/oscar.c:5226
+#, c-format
+msgid "The user %s has given you permission to add you to their buddy list.  Do you want to add them?"
+msgstr "మిమ్ములను తన మిత్రుల లిస్టులో చేర్చుటకు వినియోగాదారుడు %s అనుమతించినాడు. వారిని కలవడం మీకు ఇష్టమేనా?"
+
+#: ../libpurple/protocols/oscar/oscar.c:5234
 msgid "Authorization Given"
 msgstr "ఆథరైజేషన్ ఇవ్వబడింది. "
 
+# Granted
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5259
+#: ../libpurple/protocols/oscar/oscar.c:5307
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "వారిని మీ మిత్రుల లిస్టులో చేర్చాలనే మీ మనవిని వినియోగదారుడు %s ఆమోదించినారు. "
 
-#: ../libpurple/protocols/oscar/oscar.c:5260
+#: ../libpurple/protocols/oscar/oscar.c:5308
 msgid "Authorization Granted"
 msgstr "ఆథరైజేషన్ గ్రాంట్ అయినది."
 
+# Denied
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5263
-#, c-format
-msgid ""
-"The user %s has denied your request to add them to your buddy list for the "
-"following reason:\n"
+#: ../libpurple/protocols/oscar/oscar.c:5311
+#, c-format
+msgid ""
+"The user %s has denied your request to add them to your buddy list for the following reason:\n"
 "%s"
 msgstr ""
 "వారిని మీ మిత్రుల లిస్టులో చేర్చాలనే మీ మనవిని ఈక్రింది కారణంచేత వినియోగదారుడు %s నిరాకరించినారు\n"
 " %s. "
 
-#: ../libpurple/protocols/oscar/oscar.c:5264
+#: ../libpurple/protocols/oscar/oscar.c:5312
 msgid "Authorization Denied"
 msgstr "ఆథరైజేషన్ నిరాకరింపబడినది."
 
-#: ../libpurple/protocols/oscar/oscar.c:5300
+#: ../libpurple/protocols/oscar/oscar.c:5348
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_ఆదానప్రదానం:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5340
+#: ../libpurple/protocols/oscar/oscar.c:5388
 msgid "Invalid chat name specified."
 msgstr "పనికిరాని సంభాషణ పేరును నిర్దేశించారు. "
 
-#: ../libpurple/protocols/oscar/oscar.c:5409
+#: ../libpurple/protocols/oscar/oscar.c:5457
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "మీ IM సచిత్రాన్ని పంపలేదు. మీరు IM సచిత్రాలను AIM  సంభాషణల్లో పంపలేరు."
 
-#: ../libpurple/protocols/oscar/oscar.c:5569
-#: ../libpurple/protocols/oscar/oscar.c:5574
+#: ../libpurple/protocols/oscar/oscar.c:5619
+#: ../libpurple/protocols/oscar/oscar.c:5624
 msgid "Away Message"
 msgstr "దూరపు సందేశం "
 
-#: ../libpurple/protocols/oscar/oscar.c:5574
-#, fuzzy
+#: ../libpurple/protocols/oscar/oscar.c:5624
 msgid "<i>(retrieving)</i>"
-msgstr " <i>(గుర్తింపబడినది)</i>"
-
-#: ../libpurple/protocols/oscar/oscar.c:5774
+msgstr "<i>(వెలికితీస్తోంది)</i>"
+
+#: ../libpurple/protocols/oscar/oscar.c:5824
 msgid "iTunes Music Store Link"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:5882
+msgstr "ఐట్యూన్స్ మ్యూజిక్ స్టార్ లింకు"
+
+#: ../libpurple/protocols/oscar/oscar.c:5932
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s పై మిత్రుని వ్యాఖ్య. "
 
-#: ../libpurple/protocols/oscar/oscar.c:5883
+#: ../libpurple/protocols/oscar/oscar.c:5933
 msgid "Buddy Comment:"
 msgstr "మిత్రుని కామెంట్:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5930
+#: ../libpurple/protocols/oscar/oscar.c:5980
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "మీరు  %s తో డైరెక్ట్ IMతో కనెక్షన్ ఓపెన్ చేయడానికి సెలక్ట్ చేశారు."
 
-#: ../libpurple/protocols/oscar/oscar.c:5934
-#, fuzzy
-msgid ""
-"Because this reveals your IP address, it may be considered a security risk.  "
-"Do you wish to continue?"
-msgstr ""
-"ఎందుకంటే ఇది మీ IP అడ్రస్‌ను వెల్లడిస్తుంది, అది మీ రహస్యములను కాపాడుటకు ఇబ్బంది కావచ్చును. "
-"కొనసాగించదల్చుకున్నారా?"
-
-#: ../libpurple/protocols/oscar/oscar.c:5940
-#: ../libpurple/protocols/oscar/peer.c:1045
-#, fuzzy
+#: ../libpurple/protocols/oscar/oscar.c:5984
+msgid "Because this reveals your IP address, it may be considered a security risk.  Do you wish to continue?"
+msgstr " ఇది మీ IP అడ్రసు  వెల్లడిస్తోంది కనుక భద్రమైనది కాకపోవచ్చు. కొనసాగించమంటారా? రహస్యములను కాపాడుటకు ఇబ్బంది కావచ్చును. కొనసాగించదల్చుకున్నారా?"
+
+#: ../libpurple/protocols/oscar/oscar.c:5990
+#: ../libpurple/protocols/oscar/peer.c:1047
 msgid "C_onnect"
-msgstr "కనెక్ట్ "
-
-#: ../libpurple/protocols/oscar/oscar.c:5975
-#, fuzzy
+msgstr "C_onnect"
+
+#: ../libpurple/protocols/oscar/oscar.c:6025
 msgid "Get AIM Info"
-msgstr "సమాచారం తీసుకురండి."
-
-#: ../libpurple/protocols/oscar/oscar.c:5981
+msgstr "AIM సమాచారాన్ని పొందండి"
+
+#: ../libpurple/protocols/oscar/oscar.c:6031
 msgid "Edit Buddy Comment"
 msgstr "మిత్రుని వ్యాఖ్యను ఎడిట్ చేయండి. "
 
-#: ../libpurple/protocols/oscar/oscar.c:5989
+#: ../libpurple/protocols/oscar/oscar.c:6039
 msgid "Get Status Msg"
 msgstr "స్టాటస్ సందేశాన్ని తీసుకురండి."
 
-#: ../libpurple/protocols/oscar/oscar.c:6002
+#: ../libpurple/protocols/oscar/oscar.c:6052
 msgid "Direct IM"
 msgstr "డైరెక్ట్ IM"
 
-#: ../libpurple/protocols/oscar/oscar.c:6024
+#: ../libpurple/protocols/oscar/oscar.c:6074
 msgid "Re-request Authorization"
 msgstr "ఆథరైజేషన్‌ కోసం మరోసారి మనవి."
 
-#: ../libpurple/protocols/oscar/oscar.c:6083
-#, fuzzy
+#: ../libpurple/protocols/oscar/oscar.c:6133
 msgid "Require authorization"
-msgstr "ఆథరైజేషన్‌కోసం విజ్ఞప్తి చేయండి."
-
-#: ../libpurple/protocols/oscar/oscar.c:6086
+msgstr "సాధికారిత అవసరం "
+
+#: ../libpurple/protocols/oscar/oscar.c:6136
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:6091
-#, fuzzy
+msgstr "వెబ్ అవేర్ (దీనివల్ల మీకు SPAM వచ్చే అవకాశం ఉంది!)"
+
+#: ../libpurple/protocols/oscar/oscar.c:6141
 msgid "ICQ Privacy Options"
-msgstr "ప్రాక్సీ ఆప్షన్లు "
-
-#: ../libpurple/protocols/oscar/oscar.c:6110
+msgstr "ICQ గోపనీయ అవకాశాలు"
+
+#: ../libpurple/protocols/oscar/oscar.c:6160
 msgid "The new formatting is invalid."
 msgstr "కొత్త ఫార్మాటింగ్‌కు విలువ లేదు."
 
-#: ../libpurple/protocols/oscar/oscar.c:6111
+#: ../libpurple/protocols/oscar/oscar.c:6161
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "స్క్రీన్‌పేరు ఫార్మాటింగ్  పెద్ద అక్షరాలను (ఇంగ్లీష్) మరియు తెల్లస్పేసులను మాత్రమే మారుస్తుంది."
 
-#: ../libpurple/protocols/oscar/oscar.c:6164
+#: ../libpurple/protocols/oscar/oscar.c:6214
 msgid "Change Address To:"
 msgstr "అడ్రసును మార్చండి:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6210
+#: ../libpurple/protocols/oscar/oscar.c:6260
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>మీరు ఆథరైజేషన్‌ కోసం ఎదురుచూడ్డంలేదు</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6213
+#: ../libpurple/protocols/oscar/oscar.c:6263
 msgid "You are awaiting authorization from the following buddies"
 msgstr "ఈ క్రింది మిత్రులనుండి మీరు ఆథరైజేషన్‌కోసం ఎదురు చూస్తున్నారు."
 
-#: ../libpurple/protocols/oscar/oscar.c:6214
-msgid ""
-"You can re-request authorization from these buddies by right-clicking on "
-"them and selecting \"Re-request Authorization.\""
-msgstr ""
-"ఈ క్రింది మిత్రులనుండి ఆథరైజేషన్ కొసం మీరు మరల మనవి చేయవచ్చును. వారిపేరుపై రైట్‌క్లిక్ చేసి \"ఆథరైజేషన్ "
-"కోసం మరోసారి మనవి.\" ని సెలక్ట్ చేయండి. "
-
-#: ../libpurple/protocols/oscar/oscar.c:6231
+#: ../libpurple/protocols/oscar/oscar.c:6264
+msgid "You can re-request authorization from these buddies by right-clicking on them and selecting \"Re-request Authorization.\""
+msgstr "ఈ క్రింది మిత్రులనుండి ఆథరైజేషన్ కొసం మీరు మరల మనవి చేయవచ్చును. వారిపేరుపై రైట్‌క్లిక్ చేసి \"ఆథరైజేషన్ కోసం మరోసారి మనవి.\" ని సెలక్ట్ చేయండి. "
+
+#: ../libpurple/protocols/oscar/oscar.c:6281
 msgid "Find Buddy by E-Mail"
 msgstr "ఇ-మెయిల్ ద్వారా మిత్రుని కనుగొనండి. "
 
-#: ../libpurple/protocols/oscar/oscar.c:6232
+#: ../libpurple/protocols/oscar/oscar.c:6282
 msgid "Search for a buddy by e-mail address"
 msgstr "ఇ-మెయిల్ అడ్రస్‌తో మిత్రుని కనుగొనండి. "
 
-#: ../libpurple/protocols/oscar/oscar.c:6233
+#: ../libpurple/protocols/oscar/oscar.c:6283
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "మీరు అన్వేషిస్తున్న మిత్రుని ఇ-మెయిల్ అడ్రసును టైప్ చేయండి."
 
-#: ../libpurple/protocols/oscar/oscar.c:6236
+# "Search"
+#: ../libpurple/protocols/oscar/oscar.c:6286
 #, fuzzy
 msgid "_Search"
 msgstr "అన్వేషణ "
 
-#: ../libpurple/protocols/oscar/oscar.c:6394
+#: ../libpurple/protocols/oscar/oscar.c:6444
 msgid "Set User Info (URL)..."
 msgstr "వినియోగదారుని సమాచారం (URL) ..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6405
+#: ../libpurple/protocols/oscar/oscar.c:6455
 msgid "Change Password (URL)"
 msgstr "పాస్‌వర్డ్‌ను మార్చండి (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6409
+#: ../libpurple/protocols/oscar/oscar.c:6459
 msgid "Configure IM Forwarding (URL)"
 msgstr "Configure IM Forwarding (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6419
-#, fuzzy
+#: ../libpurple/protocols/oscar/oscar.c:6469
 msgid "Set Privacy Options..."
-msgstr "ఇంకా ఆప్షన్లను చూపుము."
-
-#  And now for the buttons
+msgstr "గోపనీయ అవకాశాలను సెట్ చేయండి..."
+
+# And now for the buttons
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6426
+#: ../libpurple/protocols/oscar/oscar.c:6476
 msgid "Confirm Account"
-msgstr "ఎకౌంట్‌ను నిర్ధారించండి. "
-
-#: ../libpurple/protocols/oscar/oscar.c:6430
-#, fuzzy
+msgstr "అకౌంట్‌ను నిర్ధారించండి. "
+
+#: ../libpurple/protocols/oscar/oscar.c:6480
 msgid "Display Currently Registered E-Mail Address"
-msgstr "ప్రస్తుతం రిజిస్టర్ చేసిన అడ్రసును ప్రదర్శించుము."
-
-#: ../libpurple/protocols/oscar/oscar.c:6434
-#, fuzzy
+msgstr "ప్రస్తుతం నమోదైన ఇ -మెయిల్ అడ్రసును చూపండి"
+
+#: ../libpurple/protocols/oscar/oscar.c:6484
 msgid "Change Currently Registered E-Mail Address..."
-msgstr "ప్రస్తుతం రిజిస్టర్ చేసిన అడ్రసును మార్చుము..."
-
-#: ../libpurple/protocols/oscar/oscar.c:6441
+msgstr "ప్రస్తుతం నమోదైన ఇ - మెయిల్   అడ్రసును మార్చండి..."
+
+#: ../libpurple/protocols/oscar/oscar.c:6491
 msgid "Show Buddies Awaiting Authorization"
 msgstr "ఆథరైజేషన్‌ కోసం ఎదురుచూస్తూ మిత్రులను ప్రదర్శించుము."
 
-#: ../libpurple/protocols/oscar/oscar.c:6447
-#, fuzzy
+#: ../libpurple/protocols/oscar/oscar.c:6497
 msgid "Search for Buddy by E-Mail Address..."
-msgstr "ఇ-మెయిల్ ద్వారా మిత్రాన్వేషణ ..."
-
-#: ../libpurple/protocols/oscar/oscar.c:6452
+msgstr "ఇ-మెయిల్ అడ్రసు ద్వారా మిత్రాన్వేషణ ..."
+
+#: ../libpurple/protocols/oscar/oscar.c:6502
 msgid "Search for Buddy by Information"
 msgstr "సమాచారం ద్వారా మిత్రాన్వేషణ "
 
-#: ../libpurple/protocols/oscar/oscar.c:6520
-#, fuzzy
+#: ../libpurple/protocols/oscar/oscar.c:6570
 msgid "Use recent buddies group"
-msgstr "వినియోగదారుడు గ్రూపులో లేడు.  "
-
-#: ../libpurple/protocols/oscar/oscar.c:6523
-#, fuzzy
+msgstr "ఇటీవలి మిత్రుల గ్రూప్ ను ఉపయోగించండి"
+
+#: ../libpurple/protocols/oscar/oscar.c:6573
 msgid "Show how long you have been idle"
-msgstr "మీరు ఎంతకాలం సోమరిగా ఉన్నారో సంకలనం చేయడానికి మీకు అవకాశం."
-
-#: ../libpurple/protocols/oscar/oscar.c:6678
+msgstr "మీరు ఎంతసేపటినుంచి ఖాళీగా ఉన్నారో చూపించండి"
+
+#: ../libpurple/protocols/oscar/oscar.c:6728
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
 msgstr ""
-
-#: ../libpurple/protocols/oscar/peer.c:697
+"ఫైల్ బదిలీలకోసం \n"
+" ICQ ప్రాక్సీ సర్వర్ నే ఎప్పుడూ ఉపయోగించండి(మెల్లగా పనిచేస్తుంది, కానీ మీ IP అడ్రసును వెల్లడించదు)"
+
+#: ../libpurple/protocols/oscar/peer.c:699
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "%s ను %s వద్ద కనెక్ట్ చేయడానికి అడుగుతున్నది:%hu డైరెక్ట్ IM కోసం. "
 
-#: ../libpurple/protocols/oscar/peer.c:782
-#, fuzzy, c-format
+#: ../libpurple/protocols/oscar/peer.c:784
+#, c-format
 msgid "Attempting to connect to %s:%hu."
-msgstr "%s ను %s వద్ద కనెక్ట్ చేయడానికి ప్రయత్నిస్తోంది: %hu డైరెక్ట్ IM కోసం."
-
-#: ../libpurple/protocols/oscar/peer.c:856
-#, fuzzy, c-format
+msgstr "%s:%hu కు కనెక్ట్ చేసేందుకు ప్రయత్నిస్తోంది."
+
+#: ../libpurple/protocols/oscar/peer.c:858
 msgid "Attempting to connect via proxy server."
-msgstr "%s ను %s వద్ద కనెక్ట్ చేయడానికి ప్రయత్నిస్తోంది: %hu డైరెక్ట్ IM కోసం."
-
-#: ../libpurple/protocols/oscar/peer.c:1033
+msgstr "ప్రాక్సీ సర్వర్ ద్వారా కనెక్ట్ అవడానికి ప్రయత్నిస్తోంది."
+
+#: ../libpurple/protocols/oscar/peer.c:1035
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s కు డైరెక్ట్‌గా కనెక్ట్ చేయడానికి %s ఇప్పుడే అడిగాడు."
 
-#: ../libpurple/protocols/oscar/peer.c:1037
-msgid ""
-"This requires a direct connection between the two computers and is necessary "
-"for IM Images.  Because your IP address will be revealed, this may be "
-"considered a privacy risk."
-msgstr ""
-"దీనికి రెండు కంప్యూటర్లమధ్య డైరెక్ట్ కనెక్షన్ అవసరం మరియు IM సచిత్రాలకు అవసరం. మీ IP అడ్రస్ "
-"బహిర్గతమవుతుంది, కావున ఇది మీ వ్యక్తిగత రహస్యాలకు సంబంధించిన చిక్కు విషయం. "
+#: ../libpurple/protocols/oscar/peer.c:1039
+msgid "This requires a direct connection between the two computers and is necessary for IM Images.  Because your IP address will be revealed, this may be considered a privacy risk."
+msgstr "దీనికి రెండు కంప్యూటర్లమధ్య డైరెక్ట్ కనెక్షన్ అవసరం మరియు IM సచిత్రాలకు అవసరం. మీ IP అడ్రస్ బహిర్గతమవుతుంది, కావున ఇది మీ వ్యక్తిగత రహస్యాలకు సంబంధించిన చిక్కు విషయం. "
 
 #: ../libpurple/protocols/qq/buddy_info.c:39
-#, fuzzy
 msgid "Primary Information"
-msgstr "ప్రొఫైల్ సమాచారం "
+msgstr "ప్రాథమిక సమాచారం"
 
 #: ../libpurple/protocols/qq/buddy_info.c:41
 #, fuzzy
@@ -9665,33 +10021,31 @@
 
 #: ../libpurple/protocols/qq/buddy_info.c:42
 msgid "QQ Number"
-msgstr ""
+msgstr "QQ నంబరు"
 
 #: ../libpurple/protocols/qq/buddy_info.c:47
-#, fuzzy
 msgid "Country/Region"
-msgstr "దేశం "
+msgstr "దేశం/ప్రాంతం"
 
 #: ../libpurple/protocols/qq/buddy_info.c:48
 msgid "Province/State"
-msgstr ""
+msgstr "రాష్ట్రం"
 
 #: ../libpurple/protocols/qq/buddy_info.c:50
 msgid "Horoscope Symbol"
-msgstr ""
+msgstr "జన్మరాశి"
 
 #: ../libpurple/protocols/qq/buddy_info.c:52
 msgid "Zodiac Sign"
-msgstr ""
+msgstr "రాశి చిహ్నాలు"
 
 #: ../libpurple/protocols/qq/buddy_info.c:53
 msgid "Blood Type"
-msgstr ""
+msgstr "రక్తం గ్రూపు"
 
 #: ../libpurple/protocols/qq/buddy_info.c:54
-#, fuzzy
 msgid "College"
-msgstr "_కూలిపోవుట"
+msgstr "కళాశాల"
 
 #: ../libpurple/protocols/qq/buddy_info.c:55
 msgid "Email"
@@ -9703,214 +10057,191 @@
 msgstr "జిప్ కోడ్ "
 
 #: ../libpurple/protocols/qq/buddy_info.c:58
-#, fuzzy
 msgid "Cellphone Number"
-msgstr "టెలీఫోన్ నెంబర్ "
+msgstr "సెల్ ఫోన్ నెంబర్ "
 
 #: ../libpurple/protocols/qq/buddy_info.c:59
-#, fuzzy
 msgid "Phone Number"
-msgstr "టెలీఫోన్ నెంబర్ "
+msgstr "ఫోన్ నంబరు"
 
 #: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Aquarius"
-msgstr ""
+msgstr "కుంభం"
 
 #: ../libpurple/protocols/qq/buddy_info.c:64
-#, fuzzy
 msgid "Pisces"
-msgstr "సచిత్రములు"
+msgstr "మీనం"
 
 #: ../libpurple/protocols/qq/buddy_info.c:64
-#, fuzzy
 msgid "Aries"
-msgstr "అడ్రస్ "
+msgstr "మేషం"
 
 #: ../libpurple/protocols/qq/buddy_info.c:64
-#, fuzzy
 msgid "Taurus"
-msgstr "టర్కిష్ "
+msgstr "వృషభం"
 
 #: ../libpurple/protocols/qq/buddy_info.c:65
-#, fuzzy
 msgid "Gemini"
-msgstr "జర్మన్ "
+msgstr "మిథునం"
 
 # #-#-#-#-#  anjuta.ANJUTA_1_2_0.hi.po (anjuta2 VERSION)  #-#-#-#-#
 # #-#-#-#-#  gnome-session.HEAD.hi.po (gnome-session VERSION)  #-#-#-#-#
 # gnome-session/session-properties.c:179
 #  Cancel button.
 #: ../libpurple/protocols/qq/buddy_info.c:65
-#, fuzzy
 msgid "Cancer"
-msgstr "క్యాన్సెల్ "
+msgstr "కర్కాకటం"
 
 #: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Leo"
-msgstr ""
+msgstr "సింహం"
 
 #: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Virgo"
-msgstr ""
+msgstr "కన్య"
 
 #: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Libra"
-msgstr ""
+msgstr "తుల"
 
 #: ../libpurple/protocols/qq/buddy_info.c:66
-#, fuzzy
 msgid "Scorpio"
-msgstr "చందా "
+msgstr "వృశ్చికం"
 
 #: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Sagittarius"
-msgstr ""
+msgstr "ధనుస్సు"
 
 #: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Capricorn"
-msgstr ""
+msgstr "మకరం"
 
 #: ../libpurple/protocols/qq/buddy_info.c:71
-#, fuzzy
 msgid "Rat"
-msgstr "అసంపూర్ణ "
+msgstr "ఎలుక"
 
 #: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Ox"
-msgstr ""
+msgstr "ఎద్దు"
 
 #: ../libpurple/protocols/qq/buddy_info.c:71
-#, fuzzy
 msgid "Tiger"
-msgstr "సమయం"
+msgstr "పులి"
 
 #: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Rabbit"
-msgstr ""
+msgstr "కుందేలు"
 
 #: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Dragon"
-msgstr ""
+msgstr "డ్రాగన్"
 
 #: ../libpurple/protocols/qq/buddy_info.c:72
-#, fuzzy
 msgid "Snake"
-msgstr "సేవ్ "
+msgstr "పాము"
 
 #: ../libpurple/protocols/qq/buddy_info.c:72
-#, fuzzy
 msgid "Horse"
-msgstr "పోర్ట్స్ "
+msgstr "గుఱ్ఱం"
 
 #: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Goat"
-msgstr ""
+msgstr "మేక"
 
 #: ../libpurple/protocols/qq/buddy_info.c:72
-#, fuzzy
 msgid "Monkey"
-msgstr "ఎవరూ లేరు."
+msgstr "కోతి"
 
 #: ../libpurple/protocols/qq/buddy_info.c:73
-#, fuzzy
 msgid "Rooster"
-msgstr "రిజిస్టర్ "
+msgstr "కోడిపుంజు"
 
 #: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Dog"
-msgstr ""
+msgstr "కుక్క"
 
 #: ../libpurple/protocols/qq/buddy_info.c:73
-#, fuzzy
 msgid "Pig"
-msgstr "పింగ్ "
+msgstr "పంది"
 
 #: ../libpurple/protocols/qq/buddy_info.c:78
-#, fuzzy
 msgid "Other"
-msgstr "ఆపెరా "
-
-#: ../libpurple/protocols/qq/buddy_info.c:481
-#: ../libpurple/protocols/qq/buddy_info.c:482
-#, fuzzy
+msgstr "ఇతరములు"
+
+#: ../libpurple/protocols/qq/buddy_info.c:522
+#: ../libpurple/protocols/qq/buddy_info.c:523
 msgid "Modify my information"
-msgstr "మిత్రుని సమాచారం. "
-
-#: ../libpurple/protocols/qq/buddy_info.c:483
-#, fuzzy
+msgstr "నా సమాచారాన్ని సవరించు"
+
+#: ../libpurple/protocols/qq/buddy_info.c:524
 msgid "Update my information"
-msgstr "వినియోగదారుని సమాచారం. "
-
-#: ../libpurple/protocols/qq/buddy_info.c:507
-#, fuzzy
+msgstr "నా సమాచారాన్ని నవీకరించు"
+
+#: ../libpurple/protocols/qq/buddy_info.c:548
 msgid "Your information has been updated"
-msgstr "మీ పాస్‌వర్డ్ మారినది. "
-
-#: ../libpurple/protocols/qq/buddy_info.c:560
-#, c-format
-msgid ""
-"Setting custom faces is not currently supported. Please choose an image from "
-"%s."
-msgstr ""
-
-#: ../libpurple/protocols/qq/buddy_info.c:577
-#: ../libpurple/protocols/qq/buddy_info.c:590
-#, fuzzy
+msgstr "మీ సమాచారం నవీకరించబడింది"
+
+#: ../libpurple/protocols/qq/buddy_info.c:601
+#, c-format
+msgid "Setting custom faces is not currently supported. Please choose an image from %s."
+msgstr "మీకిష్టమైన ముఖారవిందాలను సెట్ చేయడానికి ఇప్పుడు అవకాశంలేదు. ఇక్కడున్న బొమ్మల్లో  ఒకదాన్ని దయచేసి ఎంపికచేసుకోండి"
+
+#: ../libpurple/protocols/qq/buddy_info.c:618
+#: ../libpurple/protocols/qq/buddy_info.c:631
 msgid "Invalid QQ Face"
-msgstr "విలువలేని గదిపేరు."
+msgstr "చెల్లుబాటుకాని QQ ముఖారవిందం"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:208
 #: ../libpurple/protocols/qq/group_opt.c:136
-#, fuzzy, c-format
+#, c-format
 msgid "You rejected %d's request"
-msgstr "ఆశించని మనవి."
+msgstr "%d's అభ్యర్థనను మీరు నిరాకరించారు"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:209
 msgid "Input your reason:"
-msgstr ""
+msgstr "మీకారణాన్ని తెలియజేయండి:"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:212
-#, fuzzy
 msgid "Reject request"
-msgstr "ఆశించని మనవి."
+msgstr "అభ్యర్థనను నిరాకరించు"
 
 #. title
 #: ../libpurple/protocols/qq/buddy_opt.c:213
 #: ../libpurple/protocols/qq/group_opt.c:141
 msgid "Sorry, you are not my type..."
-msgstr ""
+msgstr "క్షమించండి, మీరు నా తరహా కాదు..."
 
 #: ../libpurple/protocols/qq/buddy_opt.c:277
 #, fuzzy
 msgid "Add buddy with auth request failed"
-msgstr "మిత్రుని పేరును చేర్చడం నిరాకరించబడింది. "
+msgstr "ప్రమాణీకరించిన అభ్యర్థనతో మిత్రుని చేర్చుకోవడంలో వైఫల్యం"
 
 #. TODO: We don't really need to notify the user about this, do we?
 #: ../libpurple/protocols/qq/buddy_opt.c:309
 msgid "You have successfully removed a buddy"
-msgstr ""
+msgstr "మీరు మిత్రుణ్ని విజయవంతంగా తొలగించగలిగారు"
 
 #. TODO: Does the user really need to be notified about this?
 #: ../libpurple/protocols/qq/buddy_opt.c:338
+#, fuzzy
 msgid "You have successfully removed yourself from your friend's buddy list"
-msgstr ""
+msgstr "మిత్రుని వద్ద నుంచి  మీరు విజయవంతంగా తొలగగలిగారు"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:404
-#, fuzzy, c-format
+#, c-format
 msgid "User %d needs authentication"
-msgstr "ప్రమాణీకరణ మొదలగుచున్నది. "
+msgstr "ప్రమాణీకరణకు వినియోగదారుకు %d అవసరం"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:406
 #: ../libpurple/protocols/qq/group_join.c:136
 msgid "Input request here"
-msgstr ""
+msgstr "ఇక్కడ ఇన్ పుట్ కోసం అభ్యర్థించు"
 
 #. TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands
 #: ../libpurple/protocols/qq/buddy_opt.c:407
 #: ../libpurple/protocols/qq/group_join.c:137
-#, fuzzy
 msgid "Would you be my friend?"
-msgstr "ఓవర్ రైట్ చేయదల్చుకున్నారా?"
+msgstr "మీరు నా మిత్రునిగా ఉంటారా?"
 
 #. multiline
 #. masked
@@ -9922,68 +10253,62 @@
 msgstr "పంపుము "
 
 #: ../libpurple/protocols/qq/buddy_opt.c:418
-#, fuzzy, c-format
+#, c-format
 msgid "You have added %d to buddy list"
-msgstr "వినియోగదారుని పేరును మీ మిత్రుల లిస్టులో చేర్చుము"
+msgstr "మీరు మిత్రుల జాబితాలో %d ను చేర్చారు"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:515
-#, fuzzy
 msgid "QQid Error"
-msgstr "చదవడంలో పొరపాటు. "
+msgstr "QQidలో లోపం"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:516
-#, fuzzy
 msgid "Invalid QQid"
-msgstr "Invalid authzid"
+msgstr "చెల్లుబాటు కాని QQid"
 
 #: ../libpurple/protocols/qq/group.c:65
 msgid "ID: "
-msgstr ""
+msgstr "ID: "
 
 #: ../libpurple/protocols/qq/group.c:98
-#, fuzzy
 msgid "Group ID"
-msgstr "గ్రూప్:"
+msgstr "గ్రూపు ID"
 
 #: ../libpurple/protocols/qq/group.c:100
-#, fuzzy
 msgid "Creator"
-msgstr "క్లోజ్ "
+msgstr "సృష్టించిన వ్యక్తి"
 
 #: ../libpurple/protocols/qq/group.c:103
-#, fuzzy
 msgid "Group Description"
-msgstr "వివరణ"
+msgstr "గ్రూపు అభివర్ణన"
 
 #: ../libpurple/protocols/qq/group.c:109
-#, fuzzy
 msgid "Auth"
-msgstr "అనుమతి నిచ్చు "
+msgstr "ప్రమాణీకరణ"
 
 #: ../libpurple/protocols/qq/group.c:119
 msgid "QQ Qun"
-msgstr ""
+msgstr "QQ Qun"
 
 #: ../libpurple/protocols/qq/group.c:120
 #, fuzzy
 msgid "Please enter external group ID"
-msgstr "చేర్చదలచుకున్న గ్రూప్ పేరును ఎంటర్ చేయండి."
+msgstr "దయచేసి బాహ్య గ్రూపు IDని తెలియజేయండి"
 
 #: ../libpurple/protocols/qq/group.c:121
 msgid "You can only search for permanent QQ groups\n"
-msgstr ""
+msgstr "మీరు శాశ్వత QQ గ్రూపుల కోసం మాత్రమే అన్వేషించగలరు\n"
 
 #: ../libpurple/protocols/qq/group_im.c:126
 #, c-format
 msgid "User %d requested to join group %d"
-msgstr ""
+msgstr "గ్రూపు%d లో చేరడానికి వినియోగదారు %d దరఖాస్తు చేశారు"
 
 #: ../libpurple/protocols/qq/group_im.c:127
 #: ../libpurple/protocols/qq/group_im.c:181
 #: ../libpurple/protocols/qq/sys_msg.c:193
-#, fuzzy, c-format
+#, c-format
 msgid "Reason: %s"
-msgstr "%s పై వినియోగదారులు: %s"
+msgstr "కారణం: %s"
 
 #: ../libpurple/protocols/qq/group_im.c:136
 #: ../libpurple/protocols/qq/group_im.c:183
@@ -9995,71 +10320,64 @@
 #: ../libpurple/protocols/qq/group_opt.c:235
 #: ../libpurple/protocols/qq/group_opt.c:305
 #: ../libpurple/protocols/qq/group_opt.c:391
-#, fuzzy
 msgid "QQ Qun Operation"
-msgstr "సౌండ్ ఆప్షన్స్ "
+msgstr "QQ Qun చర్య"
 
 #: ../libpurple/protocols/qq/group_im.c:141
 #: ../libpurple/protocols/qq/group_opt.c:128
 #: ../libpurple/protocols/qq/sys_msg.c:91
 #: ../libpurple/protocols/qq/sys_msg.c:248
 msgid "Approve"
-msgstr ""
+msgstr "ఆమోదించు"
 
 #: ../libpurple/protocols/qq/group_im.c:180
 #, c-format
 msgid "Your request to join group %d has been rejected by admin %d"
-msgstr ""
+msgstr "%dగ్రూపులో చేరడానికి మీరు చేసిన అభ్యర్థనను admin %d తోసిపుచ్చారు"
 
 #: ../libpurple/protocols/qq/group_im.c:221
 #, c-format
 msgid "Your request to join group %d has been approved by admin %d"
-msgstr ""
+msgstr "%dగ్రూపులో చేరడానికి మీరు చేసిన అభ్యర్థనను admin %d ఆమోదించారు"
 
 #: ../libpurple/protocols/qq/group_im.c:257
 #, c-format
 msgid "You [%d] have left group \"%d\""
-msgstr ""
+msgstr "మీరు [%d] ఎగ్జిట్ గ్రూపు \"%d\" కలిగి ఉన్నారు"
 
 #: ../libpurple/protocols/qq/group_im.c:291
 #, c-format
 msgid "You [%d] have been added to group \"%d\""
-msgstr ""
+msgstr "మీరు [%d] గ్రూపు \"%d\"ద్వారా చేర్చబడ్డారు"
 
 #: ../libpurple/protocols/qq/group_im.c:292
-#, fuzzy
 msgid "This group has been added to your buddy list"
-msgstr "ఈ మిత్రుని మీ మిత్రుల లిస్టులో చేర్చదల్చుకున్నారా?"
+msgstr "మీ మిత్రుల జాబితాకు ఈ గ్రూపును చేర్చడం జరిగింది"
 
 #: ../libpurple/protocols/qq/group_internal.c:41
+#, fuzzy
 msgid "I am not a member"
-msgstr ""
+msgstr "నేను సభ్యుణ్నికాను"
 
 #: ../libpurple/protocols/qq/group_internal.c:44
 msgid "I am a member"
-msgstr ""
+msgstr "నేను సభ్యుణ్ని"
 
 #: ../libpurple/protocols/qq/group_internal.c:47
 msgid "I am applying to join"
-msgstr ""
+msgstr "నేను చేరడానికి దరఖాస్తు చేస్తున్నాను"
 
 #: ../libpurple/protocols/qq/group_internal.c:50
 msgid "I am the admin"
-msgstr ""
-
-# #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
-# gnome-session/gsm-client-row.c:43
-# #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
-# gnome-session/gsm-client-row.c:43
+msgstr "నేను admin "
+
 #: ../libpurple/protocols/qq/group_internal.c:53
-#, fuzzy
 msgid "Unknown status"
-msgstr "అజ్ఞాత సందేశం"
+msgstr "స్థాయి తెలియదు"
 
 #: ../libpurple/protocols/qq/group_join.c:82
-#, fuzzy
 msgid "This group does not allow others to join"
-msgstr "ఈ ఎవాల్యుయేషన్ వెర్షన్ ఒకేసారి పదిమందికి మించి వినియోగదారులు సంభాషించుటకు అనుమతించదు. "
+msgstr "ఇతరులు చేరడానికి ఈ గ్రూపు అనుమతించదు"
 
 #: ../libpurple/protocols/qq/group_join.c:233
 msgid "You have successfully left the group"
@@ -10067,48 +10385,49 @@
 
 #: ../libpurple/protocols/qq/group_join.c:257
 msgid "QQ Group Auth"
-msgstr ""
+msgstr "QQ గ్రూపును ప్రమాణీకరించు"
 
 #: ../libpurple/protocols/qq/group_join.c:258
+#, fuzzy
 msgid "Your authorization request has been accepted by the QQ server"
-msgstr ""
+msgstr "మీ ప్రమాణీకరణ చర్యను QQ సర్వర్ అంగీకరించింది"
 
 #: ../libpurple/protocols/qq/group_join.c:329
+#, fuzzy
 msgid "You entered a group ID outside the acceptable range"
-msgstr ""
+msgstr "మీరు ఆమోదయోగ్యమైన శ్రేణికి బయట మీ గ్రూపు id ని ప్రవేశపెట్టారు"
 
 #: ../libpurple/protocols/qq/group_join.c:360
 #, fuzzy
 msgid "Are you sure you want to leave this Qun?"
-msgstr "మీరు %sను తప్పకుండా తొలగించదల్చుకున్నారా?"
+msgstr " %sను కచ్చితంగా తొలగించదల్చుకున్నారా?"
 
 #: ../libpurple/protocols/qq/group_join.c:362
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
-msgstr ""
+msgstr "గమనిక, మీరు దీన్ని సృష్టించిన వ్యక్తి అయితే ఈ చర్య ఈ Qun ని ముందుగానే తొలగిస్తుంది."
 
 #: ../libpurple/protocols/qq/group_network.c:92
 #, c-format
 msgid "Code [0x%02X]: %s"
-msgstr ""
+msgstr "కోడ్ [0x%02X]: %s"
 
 #: ../libpurple/protocols/qq/group_network.c:93
-#, fuzzy
 msgid "Group Operation Error"
-msgstr "ఫైల్ నిర్వహణలో పొరపాటు. "
+msgstr "గ్రూపు చర్యలో లోపం"
 
 #. we want to see window
 #: ../libpurple/protocols/qq/group_opt.c:124
 #: ../libpurple/protocols/qq/sys_msg.c:87
 #, fuzzy
 msgid "Do you want to approve the request?"
-msgstr "బయటకు పంపేసిన సందేశాలను మీరు నిజంగా \"%s\" తీసివేయదల్చుకున్నారా ?"
+msgstr "అభ్యర్థనను మీరు ఆమోదించ దలచుకున్నారా?"
 
 #: ../libpurple/protocols/qq/group_opt.c:137
 #, fuzzy
 msgid "Enter your reason:"
-msgstr "%s వర్తమానంలో లాగ్ ఇన్ చేయలేదు."
+msgstr "మీకారణాన్ని తెలియజేయండి:"
 
 #: ../libpurple/protocols/qq/group_opt.c:235
 msgid "You have successfully modified Qun member"
@@ -10120,150 +10439,148 @@
 
 #: ../libpurple/protocols/qq/group_opt.c:392
 msgid "You have successfully created a Qun"
-msgstr ""
+msgstr "మీరు  విజయవంతంగా Qunను సృష్టించగలిగారు"
 
 #: ../libpurple/protocols/qq/group_opt.c:394
-#, fuzzy
 msgid "Would you like to set up the Qun details now?"
-msgstr "మీరు సంభాషణలో పాల్గొనదల్చుకున్నారా?"
+msgstr "మీరు Qun వివరాలను ఇప్పుడు సెట్ చేయదలచుకున్నారా?"
 
 #: ../libpurple/protocols/qq/group_opt.c:398
-#, fuzzy
 msgid "Setup"
-msgstr "_సెట్ చేయండి"
+msgstr "సెట్ అప్"
 
 #: ../libpurple/protocols/qq/im.c:432
-#, fuzzy
 msgid "System Message"
-msgstr "సందేశాన్ని పంపండి. "
+msgstr "సిస్టం సందేశం"
 
 #: ../libpurple/protocols/qq/im.c:576
-#, fuzzy
 msgid "Failed to send IM."
-msgstr "సంభాషణలో చేరడానికి వైఫల్యం. "
-
-#: ../libpurple/protocols/qq/keep_alive.c:87
+msgstr ""
+
+#: ../libpurple/protocols/qq/keep_alive.c:88
 #, fuzzy
 msgid "Keep alive error"
-msgstr "చదవడంలో పొరపాటు."
+msgstr "రీడ్ చేయడంలో పొరపాటు"
 
 #: ../libpurple/protocols/qq/login_logout.c:408
 #, fuzzy
 msgid "Error requesting login token"
-msgstr "కనెక్షన్ సృష్టిలో పొరపాటు. "
-
-#: ../libpurple/protocols/qq/login_logout.c:486
-#, fuzzy
+msgstr "కనెక్షన్ ఏర్పాటులో పొరపాటు"
+
+#: ../libpurple/protocols/qq/login_logout.c:489
 msgid "Unable to login, check debug log"
-msgstr "AIMకు లాగిన్ చేయుట అసాధ్యం."
-
+msgstr "లాగ్ ఇన్ చేయలేక పోయింది, డీబగ్ లాగ్ ను తనిఖీ చేయండి"
+
+# we didn't successfully connect. tdt->toc_fd is valid here
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
+#: ../libpurple/protocols/qq/qq.c:140
+#: ../libpurple/protocols/toc/toc.c:173
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:109
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:189
-#: ../libpurple/protocols/yahoo/ycht.c:549
+#: ../libpurple/protocols/yahoo/ycht.c:550
 msgid "Unable to connect."
 msgstr "కనెక్ట్ చేయడంలో అసమర్థత. "
 
-# #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
-# gnome-session/gsm-client-row.c:43
-# #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
-# gnome-session/gsm-client-row.c:43
-#: ../libpurple/protocols/qq/qq.c:186
-#, fuzzy, c-format
+#: ../libpurple/protocols/qq/qq.c:187
+#, c-format
 msgid "Unknown-%d"
-msgstr "అజ్ఞాతం"
-
-#: ../libpurple/protocols/qq/qq.c:211
+msgstr "అజ్ఞాత-%d"
+
+#: ../libpurple/protocols/qq/qq.c:212
 #, fuzzy
 msgid "TCP Address"
 msgstr "IP అడ్రస్ "
 
-#: ../libpurple/protocols/qq/qq.c:213
+#: ../libpurple/protocols/qq/qq.c:214
 #, fuzzy
 msgid "UDP Address"
 msgstr "IP అడ్రస్ "
 
-#: ../libpurple/protocols/qq/qq.c:242
-#, fuzzy
+#: ../libpurple/protocols/qq/qq.c:243
 msgid "Level"
-msgstr "ఎప్పుడూ కాదు. "
-
-#: ../libpurple/protocols/qq/qq.c:373
-#, fuzzy
+msgstr "స్థాయి"
+
+#: ../libpurple/protocols/qq/qq.c:374
 msgid "Invalid name"
-msgstr "విలువలేని వినియోగదారుని పేరు. "
-
-#: ../libpurple/protocols/qq/qq.c:439
-#, fuzzy, c-format
-msgid "<b>Current Online</b>: %d<br>\n"
-msgstr "<b>ఉపనామం:</b> %s<br>"
+msgstr "చెల్లుబాటు కాని పేరు. "
 
 #: ../libpurple/protocols/qq/qq.c:440
-#, fuzzy, c-format
+#, c-format
+msgid "<b>Current Online</b>: %d<br>\n"
+msgstr "<b>ప్రస్తుత ఆన్ లైన్</b>: %d<br>\n"
+
+#: ../libpurple/protocols/qq/qq.c:441
+#, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
-msgstr "<b>వినియోగదారుడు:</b> %s<br>"
-
-#: ../libpurple/protocols/qq/qq.c:444
-#, fuzzy, c-format
-msgid "<b>Connection Mode</b>: %s<br>\n"
-msgstr "%s <b> నుండి సోమరి:</b> <br>"
+msgstr "<b>చివరిసారిగా రీ ఫ్రెష్ చేసినప్పుడు</b>: %s<br>\n"
 
 #: ../libpurple/protocols/qq/qq.c:445
-#, fuzzy, c-format
-msgid "<b>Server IP</b>: %s: %d<br>\n"
-msgstr "<b>వినియోగదారుడు:</b> %s<br>"
+#, c-format
+msgid "<b>Connection Mode</b>: %s<br>\n"
+msgstr "<b>కనెక్షన్ విధానం</b>: %s<br>\n"
 
 #: ../libpurple/protocols/qq/qq.c:446
-#, fuzzy, c-format
+#, c-format
+msgid "<b>Server IP</b>: %s: %d<br>\n"
+msgstr "<b>సర్వర్ IP</b>: %s: %d<br>\n"
+
+#: ../libpurple/protocols/qq/qq.c:447
+#, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
-msgstr "<b>ఉపనామం:</b> %s<br>"
-
-#: ../libpurple/protocols/qq/qq.c:451
-#, fuzzy, c-format
-msgid "<b>Login Time</b>: %s<br>\n"
-msgstr "<b>వినియోగదారుడు:</b> %s<br>"
+msgstr "<b>నా బహిరంగ IP</b>: %s<br>\n"
 
 #: ../libpurple/protocols/qq/qq.c:452
-#, fuzzy, c-format
-msgid "<b>Last Login IP</b>: %s<br>\n"
-msgstr "<b>ఉపనామం:</b> %s<br>"
+#, c-format
+msgid "<b>Login Time</b>: %s<br>\n"
+msgstr "<b>లాగ్ ఇన్ సమయం</b>: %s<br>\n"
 
 #: ../libpurple/protocols/qq/qq.c:453
-#, fuzzy, c-format
+#, c-format
+msgid "<b>Last Login IP</b>: %s<br>\n"
+msgstr "<b>చివరిసారి చేసిన లాగ్ ఇన్ IP</b>: %s<br>\n"
+
+#: ../libpurple/protocols/qq/qq.c:454
+#, c-format
 msgid "<b>Last Login Time</b>: %s\n"
-msgstr ""
-"\n"
-"<b>%s:</b> %s"
-
-#: ../libpurple/protocols/qq/qq.c:457
-#, fuzzy
+msgstr "<b>చివరిసారి చేసిన లాగ్ ఇన్ సమయం</b>: %s\n"
+
+#: ../libpurple/protocols/qq/qq.c:458
 msgid "Login Information"
-msgstr "వినియోగదారుని సమాచారం. "
-
-#: ../libpurple/protocols/qq/qq.c:533
+msgstr "లాగ్ ఇన్ సమాచారం "
+
+#: ../libpurple/protocols/qq/qq.c:534
 #, fuzzy
 msgid "Set My Information"
-msgstr "సెర్వర్ సమాచారం. "
-
-#: ../libpurple/protocols/qq/qq.c:536 ../libpurple/protocols/toc/toc.c:1680
+msgstr "సర్వర్ సమాచారం "
+
+# if (js->protocol_options & CHANGE_PASSWORD) {
+#: ../libpurple/protocols/qq/qq.c:537
+#: ../libpurple/protocols/toc/toc.c:1680
 msgid "Change Password"
 msgstr "పాస్‌వర్డ్‌ను మార్చండి."
 
-#: ../libpurple/protocols/qq/qq.c:539
-#, fuzzy
+#: ../libpurple/protocols/qq/qq.c:540
 msgid "Show Login Information"
-msgstr "వినియోగదారుని సమాచారం. "
-
-#: ../libpurple/protocols/qq/qq.c:560
+msgstr "లాగ్ ఇన్ సమాచారాన్ని చూపించు"
+
+#: ../libpurple/protocols/qq/qq.c:561
+#, fuzzy
 msgid "Leave this QQ Qun"
-msgstr ""
-
-#: ../libpurple/protocols/qq/qq.c:584
+msgstr "ఈ QQ Qun ను వదిలిపెట్టు"
+
+#: ../libpurple/protocols/qq/qq.c:585
 #, fuzzy
 msgid "Block this buddy"
-msgstr "వినియోగదారుని ఆపుము "
-
+msgstr "ఈ టాబ్ ను మూసేయండి"
+
+# *< type
+# *< ui_requirement
+# *< flags
+# *< dependencies
+# *< priority
+# *< id
+# *< name
+# *< version
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -10274,407 +10591,337 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/qq/qq.c:725 ../libpurple/protocols/qq/qq.c:727
-#, fuzzy
+#: ../libpurple/protocols/qq/qq.c:726
+#: ../libpurple/protocols/qq/qq.c:728
 msgid "QQ Protocol\tPlugin"
-msgstr "IRC ప్రొటోకాల్ ప్లగ్‌ఇన్. "
-
-#: ../libpurple/protocols/qq/qq.c:752
+msgstr "QQ ప్రొటోకాల్ ప్లగ్‌ఇన్. "
+
+# connect to the server
+#: ../libpurple/protocols/qq/qq.c:753
 #, fuzzy
 msgid "Connect using TCP"
-msgstr "కనెక్ట్ చేస్తున్నది."
-
-# #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
-# gnome-session/gsm-client-row.c:43
-# #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
-# gnome-session/gsm-client-row.c:43
-#: ../libpurple/protocols/qq/recv_core.c:309
-#, fuzzy
+msgstr "కనెక్ట్ చేస్తున్నది"
+
+#: ../libpurple/protocols/qq/recv_core.c:310
 msgid "Socket error"
-msgstr "అజ్ఞాత పొరపాటు. "
-
-#: ../libpurple/protocols/qq/recv_core.c:319
-#, fuzzy
+msgstr "సాకెట్ లో లోపం"
+
+#: ../libpurple/protocols/qq/recv_core.c:321
 msgid "Unable to read from socket"
-msgstr "సాకెట్‌ను చదవడం సాధ్యం కావడం లేదు. "
+msgstr "సాకెట్‌ నుంచి రీడ్ చేయడం   సాధ్యం కావడం లేదు "
 
 #: ../libpurple/protocols/qq/send_file.c:707
-#, fuzzy, c-format
+#, c-format
 msgid "%d has declined the file %s"
-msgstr "%s విషయాన్ని %sకు మార్చాడు "
+msgstr "ఫైలు %s ను %d నిరాకరించింది "
 
 #: ../libpurple/protocols/qq/send_file.c:710
 #: ../libpurple/protocols/qq/send_file.c:739
-#, fuzzy
 msgid "File Send"
-msgstr "ఫైల్ పంపడంలో వైఫల్యం. "
+msgstr "ఫైలును పంపడంజరిగింది"
 
 #: ../libpurple/protocols/qq/send_file.c:736
-#, fuzzy, c-format
+#, c-format
 msgid "%d canceled the transfer of %s"
 msgstr "%sను ట్రాన్స్‌ఫర్ చేయడాన్ని %s రద్దు చేశారు."
 
-#: ../libpurple/protocols/qq/sendqueue.c:123
-#, fuzzy
+#: ../libpurple/protocols/qq/sendqueue.c:124
 msgid "Connection lost"
-msgstr "కనెక్షన్ క్లోజ్ అయినది."
-
-#. cancel login progress
-#: ../libpurple/protocols/qq/sendqueue.c:131
-#, fuzzy
+msgstr "కనెక్షన్ పోయింది"
+
+#: ../libpurple/protocols/qq/sendqueue.c:133
 msgid "Login failed, no reply"
-msgstr "లాగిన్ విఫలమైనది (%s)."
+msgstr "లాగ్ ఇన్ వైఫల్యం, సమాధానం లేదు"
 
 #: ../libpurple/protocols/qq/sys_msg.c:110
 #, fuzzy
 msgid "Do you want to add this buddy?"
-msgstr "ఈ మిత్రుని మీ మిత్రుల లిస్టులో చేర్చదల్చుకున్నారా?"
+msgstr "ఈ మిత్రుణ్ని చేర్చదలచుకున్నారా?"
 
 #. only need to get value
 #: ../libpurple/protocols/qq/sys_msg.c:166
-#, fuzzy, c-format
+#, c-format
 msgid "You have been added by %s"
-msgstr "మిమ్మల్ని %s చంపినాడు (%s)"
+msgstr "%s ద్వారా మీరు చేరారు"
 
 #: ../libpurple/protocols/qq/sys_msg.c:169
 #: ../libpurple/protocols/qq/sys_msg.c:263
-#, fuzzy
 msgid "Would you like to add him?"
-msgstr "ఓవర్ రైట్ చేయదల్చుకున్నారా?"
+msgstr "వీరిని మీరు చేర్చదలచుకున్నారా ?"
 
 #: ../libpurple/protocols/qq/sys_msg.c:176
-#, fuzzy, c-format
+#, c-format
 msgid "%s has added you [%s] to his or her buddy list"
-msgstr "వినియోగదారుడు/రాలు %s %sను తన మిత్రుల జాబితాలో చేర్చదల్చుకున్నాడు/న్నది."
+msgstr "%s మిమ్మల్ని తన మిత్రుల జాబితాలో చేర్చారు."
 
 #: ../libpurple/protocols/qq/sys_msg.c:192
 #, c-format
 msgid "User %s rejected your request"
-msgstr ""
+msgstr "మీ అభ్యర్థనను వినియోగదారు %s నిరాకరించారు "
 
 #: ../libpurple/protocols/qq/sys_msg.c:212
 #, c-format
 msgid "User %s approved your request"
-msgstr ""
+msgstr "మీ అభ్యర్థనను వినియోగదారు %s ఆమోదించారు"
 
 #. TODO: this should go through purple_account_request_authorization()
 #: ../libpurple/protocols/qq/sys_msg.c:238
-#, fuzzy, c-format
+#, c-format
 msgid "%s wants to add you [%s] as a friend"
-msgstr "%s మీకు ఒక ఫైలును పంపించా లనుకుంటున్నాడు."
+msgstr "మీ[%s] ను మిత్రులుగా చేర్చాలని%s కోరుతున్నారు"
 
 #: ../libpurple/protocols/qq/sys_msg.c:239
-#, fuzzy, c-format
+#, c-format
 msgid "Message: %s"
-msgstr "_సందేశం:"
+msgstr "సందేశం: %s"
 
 #: ../libpurple/protocols/qq/sys_msg.c:261
-#, fuzzy, c-format
+#, c-format
 msgid "%s is not in your buddy list"
-msgstr "వినియోగదారుని పేరును మీ మిత్రుల లిస్టులో చేర్చుము"
-
-#: ../libpurple/protocols/sametime/sametime.c:417
-#, fuzzy
+msgstr "%s మీ మిత్రుల జాబితాలో లేరు"
+
+#: ../libpurple/protocols/sametime/sametime.c:419
 msgid "Connection closed (writing)"
-msgstr "కనెక్షన్ క్లోజ్ అయినది."
-
-#: ../libpurple/protocols/sametime/sametime.c:1290
-#, fuzzy, c-format
+msgstr "కనెక్షన్ ముగిసింది (రైటింగ్)"
+
+#: ../libpurple/protocols/sametime/sametime.c:1292
+#, c-format
 msgid "<b>Group Title:</b> %s<br>"
-msgstr "<b>వినియోగదారుడు:</b> %s<br>"
-
-#: ../libpurple/protocols/sametime/sametime.c:1291
-#, fuzzy, c-format
-msgid "<b>Notes Group ID:</b> %s<br>"
-msgstr "<b>వినియోగదారుడు:</b> %s<br>"
+msgstr "<b>గ్రూపు శీర్షిక:</b> %s<br>"
 
 #: ../libpurple/protocols/sametime/sametime.c:1293
-#, fuzzy, c-format
-msgid "Info for Group %s"
-msgstr "%s కు వివరణ."
+#, c-format
+msgid "<b>Notes Group ID:</b> %s<br>"
+msgstr "<b>గ్రూపు ID వివరాలు :</b> %s<br>"
 
 #: ../libpurple/protocols/sametime/sametime.c:1295
-#, fuzzy
+#, c-format
+msgid "Info for Group %s"
+msgstr "గ్రూపు %s కోసం సమాచారం"
+
+#: ../libpurple/protocols/sametime/sametime.c:1297
 msgid "Notes Address Book Information"
-msgstr "పని సమాచారం "
-
-#: ../libpurple/protocols/sametime/sametime.c:1327
-#, fuzzy
+msgstr "అడ్రస్ బుక్ సమాచారాన్ని తెలియజేస్తోంది "
+
+#: ../libpurple/protocols/sametime/sametime.c:1329
 msgid "Invite Group to Conference..."
-msgstr "సమావేశాన్ని ప్రారంభించారు."
-
-#: ../libpurple/protocols/sametime/sametime.c:1337
-#, fuzzy
+msgstr "సంభాషణకు గ్రూపును ఆహ్వానించండి..."
+
+#: ../libpurple/protocols/sametime/sametime.c:1339
 msgid "Get Notes Address Book Info"
-msgstr "అడ్రస్ బుక్‌కు చేర్చండి."
-
-#: ../libpurple/protocols/sametime/sametime.c:1504
-#, fuzzy
+msgstr "అడ్రన్ బుక్ సమాచార వివరాలు పొందు"
+
+#: ../libpurple/protocols/sametime/sametime.c:1506
 msgid "Sending Handshake"
-msgstr "కుకీని పంపుతున్నది. "
-
-#: ../libpurple/protocols/sametime/sametime.c:1509
-#, fuzzy
+msgstr "హ్యాండ్ షేక్ పంపించు"
+
+#: ../libpurple/protocols/sametime/sametime.c:1511
 msgid "Waiting for Handshake Acknowledgement"
-msgstr "ట్రాన్స్‌ఫర్ అగుటకు ప్రతీక్షించుచున్నది."
-
-#: ../libpurple/protocols/sametime/sametime.c:1514
+msgstr "హ్యాండ్ షేక్ జరిగిందన్న సమాచారం కోసం ఎదురు చూస్తున్నారు"
+
+#: ../libpurple/protocols/sametime/sametime.c:1516
 msgid "Handshake Acknowledged, Sending Login"
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:1519
+msgstr "హ్యాండ్ షేక్ జరిగినట్టు సమాచారం అందింది, లాగ్ ఇన్ పంపడం జరుగుతోంది"
+
+#: ../libpurple/protocols/sametime/sametime.c:1521
 msgid "Waiting for Login Acknowledgement"
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:1524
-#, fuzzy
+msgstr "లాగ్ ఇన్ జరిగిందన్న సమాచారం కోసం ఎదురుచూస్తున్నారు"
+
+#: ../libpurple/protocols/sametime/sametime.c:1526
 msgid "Login Redirected"
-msgstr "లాగిన్ సెర్వర్ "
-
-#: ../libpurple/protocols/sametime/sametime.c:1530
-#, fuzzy
+msgstr "లాగ్ ఇన్ ను రీడైరెక్ట్ చేయడం జరిగింది"
+
+#: ../libpurple/protocols/sametime/sametime.c:1532
 msgid "Forcing Login"
-msgstr "లాగిన్ చేయుచున్నాను "
-
-#: ../libpurple/protocols/sametime/sametime.c:1534
+msgstr "బలవంతంగా లాగ్ ఇన్ చేయడం జరుగుతోంది"
+
+#: ../libpurple/protocols/sametime/sametime.c:1536
 msgid "Login Acknowledged"
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:1539
-#, fuzzy
+msgstr "లాగ్ ఇన్ జరిగినట్టు సమాచారం అందింది"
+
+#: ../libpurple/protocols/sametime/sametime.c:1541
 msgid "Starting Services"
-msgstr "ఆన్‌లైన్ సర్వీసులు "
-
-#: ../libpurple/protocols/sametime/sametime.c:1645
-#, c-format
-msgid ""
-"A Sametime administrator has issued the following announcement on server %s"
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:1650
+msgstr "సేవలు మొదలవుతున్నాయి"
+
+#: ../libpurple/protocols/sametime/sametime.c:1678
+#, c-format
+msgid "A Sametime administrator has issued the following announcement on server %s"
+msgstr "అదే సమయపు అడ్మిని స్ట్రేటర్ సర్వర్ %s పై ఈ కింది ప్రకటన జారీచేశారు"
+
+#: ../libpurple/protocols/sametime/sametime.c:1683
 msgid "Sametime Administrator Announcement"
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:1702
-#, fuzzy
+msgstr "అదే సమయపు అడ్మిని స్ట్రేటర్ ప్రకటన "
+
+#: ../libpurple/protocols/sametime/sametime.c:1734
 msgid "Connection reset"
-msgstr "కనెక్షన్ క్లోజ్ అయినది."
-
-#: ../libpurple/protocols/sametime/sametime.c:1709
-#, fuzzy, c-format
+msgstr "కనెక్షన్ రీ సెట్ అయింది"
+
+#: ../libpurple/protocols/sametime/sametime.c:1746
+#, c-format
 msgid "Error reading from socket: %s"
-msgstr "సాకెట్‌నుండి చదువునప్పుడు పొరపాటు."
+msgstr "సాకెట్ : %s నుంచి రీడింగ్ లో లోపం"
 
 #. this is a regular connect, error out
-#: ../libpurple/protocols/sametime/sametime.c:1732
-#: ../libpurple/protocols/sametime/sametime.c:3726
-#, fuzzy
+#: ../libpurple/protocols/sametime/sametime.c:1771
+#: ../libpurple/protocols/sametime/sametime.c:3772
 msgid "Unable to connect to host"
-msgstr "సెర్వర్‌కు కనెక్ట్‌చేయలేని స్థితి. "
-
-#: ../libpurple/protocols/sametime/sametime.c:1770
+msgstr "హోస్ట్ కు కనెక్ట్‌ చేయలేని స్థితి "
+
+#: ../libpurple/protocols/sametime/sametime.c:1812
 #, c-format
 msgid "Announcement from %s"
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:1944
-#, fuzzy
+msgstr "%sనుంచి ప్రకటన"
+
+#: ../libpurple/protocols/sametime/sametime.c:1986
 msgid "Conference Closed"
-msgstr "కనెక్షన్ క్లోజ్ అయినది."
-
-#: ../libpurple/protocols/sametime/sametime.c:2403
-#, fuzzy
+msgstr "సంభాషణ ముగిసింది"
+
+# Data is assumed to be the destination sn
+#: ../libpurple/protocols/sametime/sametime.c:2445
 msgid "Unable to send message: "
-msgstr "సందేశం పంపడం సాధ్యంకాదు: %s"
-
-# #-#-#-#-#  anjuta.ANJUTA_1_2_0.hi.po (anjuta2 VERSION)  #-#-#-#-#
-# #-#-#-#-#  gnome-session.HEAD.hi.po (gnome-session VERSION)  #-#-#-#-#
-# gnome-session/session-properties.c:179
-#  Cancel button.
-#: ../libpurple/protocols/sametime/sametime.c:2959
-#, fuzzy
+msgstr "సందేశం పంపలేని స్థితి:  "
+
+#: ../libpurple/protocols/sametime/sametime.c:3001
 msgid "Place Closed"
-msgstr "కాన్సెల్ అయినది."
-
-#: ../libpurple/protocols/sametime/sametime.c:3229
+msgstr "చోటు లేదు"
+
+#: ../libpurple/protocols/sametime/sametime.c:3271
 msgid "Microphone"
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:3230
+msgstr "మైక్రోఫోన్"
+
+#: ../libpurple/protocols/sametime/sametime.c:3272
 msgid "Speakers"
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:3231
-#, fuzzy
+msgstr "స్పీకర్లు"
+
+#: ../libpurple/protocols/sametime/sametime.c:3273
 msgid "Video Camera"
-msgstr "వీడియో సంభాషణ"
-
-#: ../libpurple/protocols/sametime/sametime.c:3269
-#: ../libpurple/protocols/sametime/sametime.c:4145
-#, fuzzy
+msgstr "వీడియో కెమెరా"
+
+#: ../libpurple/protocols/sametime/sametime.c:3311
+#: ../libpurple/protocols/sametime/sametime.c:4191
 msgid "Supports"
-msgstr "సపోర్ట్ "
-
-#: ../libpurple/protocols/sametime/sametime.c:3274
-#: ../libpurple/protocols/sametime/sametime.c:4119
-#, fuzzy
+msgstr "సపోర్టులు"
+
+#: ../libpurple/protocols/sametime/sametime.c:3316
+#: ../libpurple/protocols/sametime/sametime.c:4165
 msgid "External User"
-msgstr "వినియోగదారునికి హెచ్చరిక. "
-
-#: ../libpurple/protocols/sametime/sametime.c:3380
-#, fuzzy
+msgstr "బాహ్య వినియోగదారు"
+
+#: ../libpurple/protocols/sametime/sametime.c:3422
 msgid "Create conference with user"
-msgstr "ప్రశ్నించడానికి సమావేశ సెర్వర్‌ను సెలక్ట్ చేయండి. "
-
-#: ../libpurple/protocols/sametime/sametime.c:3381
-#, c-format
-msgid ""
-"Please enter a topic for the new conference, and an invitation message to be "
-"sent to %s"
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:3385
-#, fuzzy
+msgstr "వినియోగదారుతో సంభాషణ సృష్టించు"
+
+#: ../libpurple/protocols/sametime/sametime.c:3423
+#, c-format
+msgid "Please enter a topic for the new conference, and an invitation message to be sent to %s"
+msgstr "కొత్త సంభాషణ కోసం దయచేసి విషయాన్ని ఎంటర్ చేయండి, %s ను ఆహ్వానిస్తూ సందేశం పంపండి"
+
+#: ../libpurple/protocols/sametime/sametime.c:3427
 msgid "New Conference"
-msgstr "సమావేశాన్ని ప్రారంభించారు."
-
-#: ../libpurple/protocols/sametime/sametime.c:3387
-#, fuzzy
+msgstr "కొత్త సంభాషణ"
+
+#: ../libpurple/protocols/sametime/sametime.c:3429
 msgid "Create"
-msgstr "తేదీ "
-
-#: ../libpurple/protocols/sametime/sametime.c:3452
-#, fuzzy
+msgstr "సృష్టించు"
+
+#: ../libpurple/protocols/sametime/sametime.c:3494
 msgid "Available Conferences"
-msgstr "సమావేశాన్ని ప్రారంభించారు."
-
-#: ../libpurple/protocols/sametime/sametime.c:3458
-#, fuzzy
+msgstr "సంభాషణ అందుబాటులో ఉంది"
+
+#: ../libpurple/protocols/sametime/sametime.c:3500
 msgid "Create New Conference..."
-msgstr "సమావేశాన్ని ప్రారంభించారు."
-
-#: ../libpurple/protocols/sametime/sametime.c:3465
-#, fuzzy
+msgstr "కొత్త సంభాషణ సృష్టించు"
+
+#: ../libpurple/protocols/sametime/sametime.c:3507
 msgid "Invite user to a conference"
-msgstr "సమావేశాన్ని ప్రారంభించారు."
-
-#: ../libpurple/protocols/sametime/sametime.c:3466
-#, c-format
-msgid ""
-"Select a conference from the list below to send an invite to user %s. Select "
-"\"Create New Conference\" if you'd like to create a new conference to invite "
-"this user to."
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:3471
-#, fuzzy
+msgstr "వినియోగదారును సంభాషణ కోసం ఆహ్వానించు"
+
+#: ../libpurple/protocols/sametime/sametime.c:3508
+#, c-format
+msgid "Select a conference from the list below to send an invite to user %s. Select \"Create New Conference\" if you'd like to create a new conference to invite this user to."
+msgstr "వినియోగదారు %s కు ఆహ్వానం పంపడానికి ఈ కింది జాబితాలో నుంచి ఒక సంభాషణను ఎంపికచేయండి ఎంపిక \"కొత్త సంభాషణను సృష్టించు\" కు ఈ వినియోగదారును ఆహ్వానించడానికి కొత్త సంభాషణను మీరు సృష్టించదలచుకున్నారా "
+
+#: ../libpurple/protocols/sametime/sametime.c:3513
 msgid "Invite to Conference"
-msgstr "సమావేశాన్ని ప్రారంభించారు."
-
-#: ../libpurple/protocols/sametime/sametime.c:3562
-#, fuzzy
+msgstr "కన్ఫరెన్స్ కు స్వాగతం"
+
+#: ../libpurple/protocols/sametime/sametime.c:3604
 msgid "Invite to Conference..."
-msgstr "సమావేశాన్ని ప్రారంభించారు."
-
-#: ../libpurple/protocols/sametime/sametime.c:3567
+msgstr "సంభాషణ కోసం ఆహ్వానించు..."
+
+#: ../libpurple/protocols/sametime/sametime.c:3609
 msgid "Send TEST Announcement"
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4354
+msgstr "TEST ప్రకటన పంపు"
+
+#: ../libpurple/protocols/sametime/sametime.c:3628
+#: ../pidgin/gtkconv.c:4437
 msgid "Topic:"
 msgstr "విషయము:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3614
-#, fuzzy
+#: ../libpurple/protocols/sametime/sametime.c:3656
 msgid "No Sametime Community Server specified"
-msgstr "SILC సెర్వర్‌కు కనెక్ట్ చేయుచున్నది. "
-
-#: ../libpurple/protocols/sametime/sametime.c:3636
-#, c-format
-msgid ""
-"No host or IP address has been configured for the Meanwhile account %s. "
-"Please enter one below to continue logging in."
-msgstr ""
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-#: ../libpurple/protocols/sametime/sametime.c:3641
-#, fuzzy
+msgstr "అదే సమయపు కమ్యూనిటీ సర్వర్ ను నిర్థిష్టంగా పేర్కొన లేదు"
+
+#: ../libpurple/protocols/sametime/sametime.c:3681
+#, c-format
+msgid "No host or IP address has been configured for the Meanwhile account %s. Please enter one below to continue logging in."
+msgstr "తాత్కాలిక అకౌంటు %s కోసం హోస్ట్  లేదా IP అడ్రస్ కన్ఫిగర్ చేయబడలేదు లాగింగ్ ఇన్ ను కొనసాగించడానికి ఈ కిందివాటిలో ఒకదాన్ని ఎంటర్ చేయండి. "
+
+#: ../libpurple/protocols/sametime/sametime.c:3686
 msgid "Meanwhile Connection Setup"
-msgstr "రిమోట్ కనెక్షన్ వైఫల్యం "
-
-#: ../libpurple/protocols/sametime/sametime.c:3642
-#, fuzzy
+msgstr "తాత్కాలిక కనెక్షన్ ఏర్పాటైనది"
+
+#: ../libpurple/protocols/sametime/sametime.c:3687
 msgid "No Sametime Community Server Specified"
-msgstr "SILC సెర్వర్‌కు కనెక్ట్ చేయుచున్నది. "
-
-#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4041
+msgstr "అదేసమయపు సామాజిక సర్వర్ ను నిర్థిష్టంగా పేర్కొనలేదు"
+
+#: ../libpurple/protocols/sametime/sametime.c:3689
 msgid "Connect"
-msgstr "కనెక్ట్ "
-
-#: ../libpurple/protocols/sametime/sametime.c:4135
+msgstr "కనెక్ట్ చేయు"
+
+#: ../libpurple/protocols/sametime/sametime.c:4181
 #, c-format
 msgid "Unknown (0x%04x)<br>"
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:4137
-#, fuzzy
+msgstr "అజ్ఞాత (0x%04x)<br>"
+
+#: ../libpurple/protocols/sametime/sametime.c:4183
 msgid "Last Known Client"
-msgstr "ఖాతాదారునికి రేటు"
-
-#: ../libpurple/protocols/sametime/sametime.c:4301
-#: ../libpurple/protocols/sametime/sametime.c:5506
-#, fuzzy
+msgstr "చివరిసారిగా తెలిసిన క్లయింటు"
+
+#: ../libpurple/protocols/sametime/sametime.c:4347
+#: ../libpurple/protocols/sametime/sametime.c:5552
 msgid "User Name"
-msgstr "వినియోగదారుని పేరు "
-
-#: ../libpurple/protocols/sametime/sametime.c:4304
-#: ../libpurple/protocols/sametime/sametime.c:5509
+msgstr "వినియోగదారు పేరు "
+
+#: ../libpurple/protocols/sametime/sametime.c:4350
+#: ../libpurple/protocols/sametime/sametime.c:5555
 msgid "Sametime ID"
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:4328
+msgstr "అదేసమయపు ID"
+
+#: ../libpurple/protocols/sametime/sametime.c:4374
 msgid "An ambiguous user ID was entered"
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:4329
-#, fuzzy, c-format
-msgid ""
-"The identifier '%s' may possibly refer to any of the following users. Please "
-"select the correct user from the list below to add them to your buddy list."
-msgstr ""
-"ఒకే పేరుతో ఒకరికి మించిన వినియోగదారు లున్నారు. మిత్రుల లిస్టులో చేర్చడానికి లిస్టునుండి అసలైన వినియోగదారుని "
-"పేరును సెలక్ట్ చేయండి. "
-
-#: ../libpurple/protocols/sametime/sametime.c:4334
-#, fuzzy
+msgstr "గందరగోళంగా ఉన్న వినియోగదారు  ID ని ఎంటర్ చేయడం జరిగింది"
+
+#: ../libpurple/protocols/sametime/sametime.c:4375
+#, c-format
+msgid "The identifier '%s' may possibly refer to any of the following users. Please select the correct user from the list below to add them to your buddy list."
+msgstr "'%s' గుర్తింపుదారు ఈ కింది వినియోగదారుల్లో ఎవరినైనా ప్రస్తావిస్తూ ఉండవచ్చు. మీ మిత్రుల జాబితాలో చేర్చడానికి ఈ కింది జాబితా నుంచి సరియైన వినియోగదారును దయచేసి ఎంపిక చేయండి."
+
+#: ../libpurple/protocols/sametime/sametime.c:4380
 msgid "Select User"
-msgstr "టెక్‌స్ట్ కలర్‌ను సెలక్ట్ చేయుము."
-
-#: ../libpurple/protocols/sametime/sametime.c:4418
-#, fuzzy
+msgstr "వినియోగదారును ఎంపిక చేయండి "
+
+#: ../libpurple/protocols/sametime/sametime.c:4464
 msgid "Unable to add user: user not found"
-msgstr "వినియోగదారుని %s (%s) మీద చేర్చడంలో అశక్తత. "
-
-#: ../libpurple/protocols/sametime/sametime.c:4420
-#, c-format
-msgid ""
-"The identifier '%s' did not match any users in your Sametime community. This "
-"entry has been removed from your buddy list."
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:4425
-#, fuzzy
-msgid "Unable to add user"
-msgstr "వినియోగదారుని %s నిషేధించుటకు అసమర్థత."
-
-#: ../libpurple/protocols/sametime/sametime.c:5011
-#, fuzzy, c-format
+msgstr "వినియోగదారును చేర్చలేక పోయింది: వినియోగదారు ఎక్కడో తెలియలేదు"
+
+#: ../libpurple/protocols/sametime/sametime.c:4466
+#, c-format
+msgid "The identifier '%s' did not match any users in your Sametime community. This entry has been removed from your buddy list."
+msgstr "గర్తింపుదారు '%s' మీ అదేసమయపు సమాజంలోని ఏ వినియోగదారుతోను సరిపోలలేదు. మీ మిత్రుల జాబితా నుంచి ఈ ఎంట్రీని తొలగించడం జరిగింది."
+
+#: ../libpurple/protocols/sametime/sametime.c:5057
+#, c-format
 msgid ""
 "Error reading file %s: \n"
 "%s\n"
@@ -10682,180 +10929,152 @@
 "చదవడంలో పొరపాటు %s: \n"
 "%s.\n"
 
-#  Buddy List
-#: ../libpurple/protocols/sametime/sametime.c:5146
-#, fuzzy
+#: ../libpurple/protocols/sametime/sametime.c:5192
 msgid "Remotely Stored Buddy List"
-msgstr "మిత్రుల లిస్టును పంపుము. "
-
-#: ../libpurple/protocols/sametime/sametime.c:5151
-#, fuzzy
+msgstr "సుదూరంగా నిక్షిప్తంచేసిన మిత్రుల జాబితా"
+
+#: ../libpurple/protocols/sametime/sametime.c:5197
 msgid "Buddy List Storage Mode"
-msgstr "మిత్రుల లిస్టు సార్టింగ్ "
-
-#: ../libpurple/protocols/sametime/sametime.c:5154
-#, fuzzy
+msgstr "మిత్రుల జాబితా నిక్షప్త విధానం"
+
+#: ../libpurple/protocols/sametime/sametime.c:5200
 msgid "Local Buddy List Only"
-msgstr "_కనిపించు మిత్రుల లిస్టు"
-
-#: ../libpurple/protocols/sametime/sametime.c:5156
-#, fuzzy
+msgstr "స్థానిక మిత్రుల జాబితా మాత్రమే"
+
+#: ../libpurple/protocols/sametime/sametime.c:5202
 msgid "Merge List from Server"
-msgstr "సెర్వర్‌నుండి మిత్రుల లిస్టును తొలగించండి."
-
-#: ../libpurple/protocols/sametime/sametime.c:5158
-#, fuzzy
+msgstr "సర్వర్ నుంచి జాబితాను విలీనం చేయండి"
+
+#: ../libpurple/protocols/sametime/sametime.c:5204
 msgid "Merge and Save List to Server"
-msgstr "CHL విలువ పొరపాటుగా సెర్వర్‌కు పంపబడింది."
-
-#: ../libpurple/protocols/sametime/sametime.c:5160
+msgstr "జాబితాను విలీనంచేసి సర్వర్ లో సేవ్ చేయండి"
+
+#: ../libpurple/protocols/sametime/sametime.c:5206
 msgid "Synchronize List with Server"
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:5215
+msgstr "సర్వర్ తో జాబితాను అనుసంధానం చేయు"
+
+#: ../libpurple/protocols/sametime/sametime.c:5261
 #, c-format
 msgid "Import Sametime List for Account %s"
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:5255
+msgstr "అకౌంట్ %s కోసం అదేకాలపు జాబితాను ఇంపోర్ట్ చేయు"
+
+#: ../libpurple/protocols/sametime/sametime.c:5301
 #, c-format
 msgid "Export Sametime List for Account %s"
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:5309
-#, fuzzy
+msgstr "అకౌంట్ %s కోసం అదేకాలపు జాబితాను ఎక్స్ పోర్ట్ చేయు"
+
+#: ../libpurple/protocols/sametime/sametime.c:5355
 msgid "Unable to add group: group exists"
-msgstr "%s ను నిషేధ లిస్టు (%s)లో చేర్చడం సాధ్యం కాదు. "
-
-#: ../libpurple/protocols/sametime/sametime.c:5310
+msgstr "గ్రూపును చేర్చలేక పోయింది: గ్రూపు అస్తిత్వంలో ఉంది "
+
+#: ../libpurple/protocols/sametime/sametime.c:5356
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:5313
-#: ../libpurple/protocols/sametime/sametime.c:5443
-#, fuzzy
+msgstr "'%s' గా పేరు పెట్టిన గ్రూపు ఇప్పటికే మీ మిత్రుల జాబితాలో ఉంది."
+
+#: ../libpurple/protocols/sametime/sametime.c:5359
+#: ../libpurple/protocols/sametime/sametime.c:5489
 msgid "Unable to add group"
-msgstr "గ్రూపుకు కొత్తపేరు నివ్వడంలో అసమర్థత."
-
-#: ../libpurple/protocols/sametime/sametime.c:5372
+msgstr "గ్రూపును చేర్చలేని స్థితి "
+
+#: ../libpurple/protocols/sametime/sametime.c:5418
 msgid "Possible Matches"
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:5388
+msgstr "సరిపోలగలిగినవి "
+
+#: ../libpurple/protocols/sametime/sametime.c:5434
 msgid "Notes Address Book group results"
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:5389
-#, c-format
-msgid ""
-"The identifier '%s' may possibly refer to any of the following Notes Address "
-"Book groups. Please select the correct group from the list below to add it "
-"to your buddy list."
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:5394
-#, fuzzy
+msgstr "అడ్రస్ బుక్ గ్రూపు ఫలితాలను తెలుపుతోంది"
+
+#: ../libpurple/protocols/sametime/sametime.c:5435
+#, c-format
+msgid "The identifier '%s' may possibly refer to any of the following Notes Address Book groups. Please select the correct group from the list below to add it to your buddy list."
+msgstr "గుర్తింపుదారు '%s' ఈ కింది అడ్రస్ బుక్ గ్రూపుల గుర్తుల్లో దేనినైనా ప్రస్తావిస్తూ ఉండవచ్చు. మీ మిత్రుల జాబితాలో చేర్చడానికి ఈ కింది జాబితానుంచి సరైన గ్రూపును దయచేసి ఎంపిక చేయండి."
+
+#: ../libpurple/protocols/sametime/sametime.c:5440
 msgid "Select Notes Address Book"
-msgstr "అడ్రస్ బుక్‌కు చేర్చండి."
-
-#: ../libpurple/protocols/sametime/sametime.c:5437
-#, fuzzy
+msgstr "నోట్స్ అడ్రస్ బుక్ ను ఎంపిక చేయండి"
+
+#: ../libpurple/protocols/sametime/sametime.c:5483
 msgid "Unable to add group: group not found"
-msgstr "నెట్‌వర్క్‌నుండి చదవడంలో అసమర్థత."
-
-#: ../libpurple/protocols/sametime/sametime.c:5439
-#, c-format
-msgid ""
-"The identifier '%s' did not match any Notes Address Book groups in your "
-"Sametime community."
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:5480
-#, fuzzy
+msgstr "గ్రూపును చేర్చలేక పోయింది: గ్రూపు ఎక్కడో తెలియలేదు"
+
+#: ../libpurple/protocols/sametime/sametime.c:5485
+#, c-format
+msgid "The identifier '%s' did not match any Notes Address Book groups in your Sametime community."
+msgstr "గుర్తింపు దారు '%s' మీ అదేసమయపు సమాజంలోని ఏ ఒక్క నోట్స్ అడ్రస్ బుక్ గ్రూప్ తోను సరిపోలలేదు. "
+
+#: ../libpurple/protocols/sametime/sametime.c:5526
 msgid "Notes Address Book Group"
-msgstr "అడ్రస్ బుక్‌కు చేర్చండి."
-
-#: ../libpurple/protocols/sametime/sametime.c:5481
-msgid ""
-"Enter the name of a Notes Address Book group in the field below to add the "
-"group and its members to your buddy list."
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:5530
-#, fuzzy, c-format
+msgstr "నోట్స్ అడ్రస్ బుక్ గ్రూపు"
+
+#: ../libpurple/protocols/sametime/sametime.c:5527
+msgid "Enter the name of a Notes Address Book group in the field below to add the group and its members to your buddy list."
+msgstr "గ్రూపును, అందులోని సభ్యులను మీ మిత్రుల జాబితాలో చేర్చడానికి ఈ కింది ఖాళీలో నోట్స్ అడ్రస్ బుక్ గ్రూపు పేరును ఎంటర్ చేయండి."
+
+#: ../libpurple/protocols/sametime/sametime.c:5576
+#, c-format
 msgid "Search results for '%s'"
-msgstr "అన్వేషణ ఫలితాలు "
-
-#: ../libpurple/protocols/sametime/sametime.c:5531
-#, c-format
-msgid ""
-"The identifier '%s' may possibly refer to any of the following users. You "
-"may add these users to your buddy list or send them messages with the action "
-"buttons below."
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:756
+msgstr "'%s' కోసం అన్వేషణ ఫలితాలు"
+
+#: ../libpurple/protocols/sametime/sametime.c:5577
+#, c-format
+msgid "The identifier '%s' may possibly refer to any of the following users. You may add these users to your buddy list or send them messages with the action buttons below."
+msgstr "గుర్తింపుదారు '%s' ఈ కింది వినియోగ దారుల్లో ఎవరిగురించైనా ప్రస్తావిస్తూ ఉండవచ్చు. మీరు ఈ వినియోగదారులను మీ మిత్రుల జాబితాలో చేర్చవచ్చు లేదా ఈ కింది యాక్షన్ బటన్ లతో వారికి సందేశాలు పంపవచ్చు."
+
+#: ../libpurple/protocols/sametime/sametime.c:5584
+#: ../pidgin/gtknotify.c:763
 msgid "Search Results"
 msgstr "అన్వేషణ ఫలితాలు "
 
-#: ../libpurple/protocols/sametime/sametime.c:5563
-#, fuzzy
+#: ../libpurple/protocols/sametime/sametime.c:5609
 msgid "No matches"
-msgstr "మాచ్ లేదు."
-
-#: ../libpurple/protocols/sametime/sametime.c:5564
+msgstr "సరిపోలేవి లేవు"
+
+#: ../libpurple/protocols/sametime/sametime.c:5610
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:5568
-#, fuzzy
+msgstr "గుర్తింపుదారు  '%s' మీ అదేసమయపు సమాజంలోని ఏ వినియోగదారుతోను సరిపోలడంలేదు."
+
+#: ../libpurple/protocols/sametime/sametime.c:5614
 msgid "No Matches"
-msgstr "మాచ్ లేదు."
-
-#: ../libpurple/protocols/sametime/sametime.c:5605
-#, fuzzy
+msgstr "సరిపోలేవేవీ లేవు"
+
+#: ../libpurple/protocols/sametime/sametime.c:5651
 msgid "Search for a user"
-msgstr "_అన్వేషించుము :"
-
-#: ../libpurple/protocols/sametime/sametime.c:5606
-msgid ""
-"Enter a name or partial ID in the field below to search for matching users "
-"in your Sametime community."
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:5609
-#, fuzzy
+msgstr "వినియోగదారు కోసం అన్వేషించు"
+
+#: ../libpurple/protocols/sametime/sametime.c:5652
+msgid "Enter a name or partial ID in the field below to search for matching users in your Sametime community."
+msgstr "మీ అదేసమయపు సమాజంలోని సరిపోలే వినియోగదారుల అన్వేషణ కోసం ఈ కింది ఖాళీలో ఒక పేరును కానీ, పాక్షిక ID ని కాని ఎంటర్ చేయండి."
+
+#: ../libpurple/protocols/sametime/sametime.c:5655
 msgid "User Search"
-msgstr "అన్వేషణ "
-
-#: ../libpurple/protocols/sametime/sametime.c:5622
+msgstr "వినియోగదారు అన్వేషణ"
+
+#: ../libpurple/protocols/sametime/sametime.c:5668
 msgid "Import Sametime List..."
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:5626
+msgstr "అదేసమయపు జాబితాను ఇంపోర్ట్ చేయండి..."
+
+#: ../libpurple/protocols/sametime/sametime.c:5672
 msgid "Export Sametime List..."
-msgstr ""
-
-#: ../libpurple/protocols/sametime/sametime.c:5630
-#, fuzzy
+msgstr "అదేసమయపు జాబితాను ఎక్స్ పోర్ట్ చేయండి..."
+
+#: ../libpurple/protocols/sametime/sametime.c:5676
 msgid "Add Notes Address Book Group..."
-msgstr "అడ్రస్ బుక్‌కు చేర్చండి."
-
-#: ../libpurple/protocols/sametime/sametime.c:5634
-#, fuzzy
+msgstr "నోట్స్ అడ్రస్ బుక్ గ్రూపును చేర్చు..."
+
+#: ../libpurple/protocols/sametime/sametime.c:5680
 msgid "User Search..."
-msgstr "అన్వేషణ "
-
-#: ../libpurple/protocols/sametime/sametime.c:5740
+msgstr "వినియోగదారు అన్వేషణ..."
+
+#: ../libpurple/protocols/sametime/sametime.c:5786
 msgid "Force login (ignore server redirects)"
-msgstr ""
+msgstr "బలవంతపు లాగ్ ఇన్ (సర్వర్ రీడైరెక్ట్ లను పట్టించుకోకండి)"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5750
+#: ../libpurple/protocols/sametime/sametime.c:5796
 msgid "Hide client identity"
-msgstr ""
+msgstr "క్లైంట్ గుర్తింపును దాచిపెట్టండి"
 
 #: ../libpurple/protocols/silc/buddy.c:52
 #: ../libpurple/protocols/silc/buddy.c:410
@@ -10938,9 +11157,7 @@
 #: ../libpurple/protocols/silc/buddy.c:298
 #: ../libpurple/protocols/silc10/buddy.c:295
 #, c-format
-msgid ""
-"Key agreement request received from %s. Would you like to perform the key "
-"agreement?"
+msgid "Key agreement request received from %s. Would you like to perform the key agreement?"
 msgstr "కీ ఎగ్రిమెంట్ మనవి %s నుండి అందినది. మీరు కీ ఎగ్రిమెంటును నెరవేర్చదల్చుకున్నారా?"
 
 #: ../libpurple/protocols/silc/buddy.c:302
@@ -10982,8 +11199,8 @@
 #: ../libpurple/protocols/silc/buddy.c:496
 #: ../libpurple/protocols/silc/buddy.c:507
 #: ../libpurple/protocols/silc/buddy.c:540
-#: ../libpurple/protocols/silc/ops.c:1499
-#: ../libpurple/protocols/silc/ops.c:1510
+#: ../libpurple/protocols/silc/ops.c:1503
+#: ../libpurple/protocols/silc/ops.c:1514
 #: ../libpurple/protocols/silc10/buddy.c:513
 #: ../libpurple/protocols/silc10/buddy.c:548
 #: ../libpurple/protocols/silc10/ops.c:1494
@@ -10992,8 +11209,8 @@
 msgstr "సార్వజనిక (పబ్లిక్) కీని తీసుకురండి."
 
 #: ../libpurple/protocols/silc/buddy.c:541
-#: ../libpurple/protocols/silc/ops.c:1500
-#: ../libpurple/protocols/silc/ops.c:1511
+#: ../libpurple/protocols/silc/ops.c:1504
+#: ../libpurple/protocols/silc/ops.c:1515
 #: ../libpurple/protocols/silc10/buddy.c:549
 #: ../libpurple/protocols/silc10/ops.c:1495
 #: ../libpurple/protocols/silc10/ops.c:1506
@@ -11001,17 +11218,17 @@
 msgstr "సార్వజనిక కీ (పబ్లిక్ కీ)ని  తీసుకవచ్చుట సాధ్యపడలేదు. "
 
 #: ../libpurple/protocols/silc/buddy.c:622
-#: ../libpurple/protocols/silc/buddy.c:1655
+#: ../libpurple/protocols/silc/buddy.c:1658
 #: ../libpurple/protocols/silc10/buddy.c:635
-#: ../libpurple/protocols/silc10/buddy.c:1654
+#: ../libpurple/protocols/silc10/buddy.c:1657
 msgid "Show Public Key"
 msgstr "పబ్లిక్ కీని చూపించుము."
 
 #: ../libpurple/protocols/silc/buddy.c:623
-#: ../libpurple/protocols/silc/buddy.c:1027
-#: ../libpurple/protocols/silc/chat.c:237
+#: ../libpurple/protocols/silc/buddy.c:1030
+#: ../libpurple/protocols/silc/chat.c:239
 #: ../libpurple/protocols/silc10/buddy.c:636
-#: ../libpurple/protocols/silc10/buddy.c:1033
+#: ../libpurple/protocols/silc10/buddy.c:1036
 #: ../libpurple/protocols/silc10/chat.c:237
 msgid "Could not load public key"
 msgstr "పబ్లిక్ కీని లోడ్ చేయుట సాధ్యమగుటలేదు. "
@@ -11019,9 +11236,9 @@
 #: ../libpurple/protocols/silc/buddy.c:701
 #: ../libpurple/protocols/silc/ops.c:1053
 #: ../libpurple/protocols/silc/ops.c:1168
-#: ../libpurple/protocols/silc/ops.c:1288
-#: ../libpurple/protocols/silc/ops.c:1289
-#: ../libpurple/protocols/silc/ops.c:1307
+#: ../libpurple/protocols/silc/ops.c:1290
+#: ../libpurple/protocols/silc/ops.c:1291
+#: ../libpurple/protocols/silc/ops.c:1309
 #: ../libpurple/protocols/silc10/buddy.c:713
 #: ../libpurple/protocols/silc10/ops.c:1087
 #: ../libpurple/protocols/silc10/ops.c:1159
@@ -11033,7 +11250,7 @@
 
 #: ../libpurple/protocols/silc/buddy.c:702
 #: ../libpurple/protocols/silc/ops.c:1169
-#: ../libpurple/protocols/silc/ops.c:1308
+#: ../libpurple/protocols/silc/ops.c:1310
 #: ../libpurple/protocols/silc10/buddy.c:714
 #: ../libpurple/protocols/silc10/ops.c:1160
 #: ../libpurple/protocols/silc10/ops.c:1314
@@ -11048,277 +11265,261 @@
 
 #: ../libpurple/protocols/silc/buddy.c:726
 #: ../libpurple/protocols/silc10/buddy.c:738
-msgid ""
-"You cannot receive buddy notifications until you import his/her public key.  "
-"You can use the Get Public Key command to get the public key."
-msgstr ""
-"ఆమె/అతని కీ మీరు ఇంపోర్ట్ చేసుకోనంతవరకు మీరు మిత్రుని నోటిఫికేషన్లను అందుకోలేరు. పబ్లిక్ కీని "
-"సంపాదించుటకు మీరు Get Public Key కమాండ్‌ను వాడవచ్చును. "
-
+msgid "You cannot receive buddy notifications until you import his/her public key.  You can use the Get Public Key command to get the public key."
+msgstr "ఆమె/అతని కీ మీరు ఇంపోర్ట్ చేసుకోనంతవరకు మీరు మిత్రుని నోటిఫికేషన్లను అందుకోలేరు. పబ్లిక్ కీని సంపాదించుటకు మీరు Get Public Key కమాండ్‌ను వాడవచ్చును. "
+
+# Open file selector to select the public key.
 #. Open file selector to select the public key.
-#: ../libpurple/protocols/silc/buddy.c:1059
-#: ../libpurple/protocols/silc10/buddy.c:1067
+#: ../libpurple/protocols/silc/buddy.c:1062
+#: ../libpurple/protocols/silc10/buddy.c:1070
 msgid "Open..."
 msgstr "ఓపెన్..."
 
-#: ../libpurple/protocols/silc/buddy.c:1070
-#: ../libpurple/protocols/silc10/buddy.c:1078
-#, c-format
-msgid "The %s buddy is not present in the network"
-msgstr "నెట్‌వర్క్‌లో %s మిత్రుడు అస్తిత్వంలో లేడు. "
-
 #: ../libpurple/protocols/silc/buddy.c:1073
 #: ../libpurple/protocols/silc10/buddy.c:1081
-msgid ""
-"To add the buddy you must import his/her public key. Press Import to import "
-"a public key."
-msgstr ""
-"మిత్రుని చేర్చాలంటే అతడు/లేక ఆమె పబ్లిక్ కీని మీరు తప్పక ఇంపోర్ట్ చేసుకోవాలి. పబ్లిక్ కీని ఇంపోర్ట్ చేసుకోడానికి "
-"Import ను నొక్కండి. "
-
-#: ../libpurple/protocols/silc/buddy.c:1077
-#: ../libpurple/protocols/silc10/buddy.c:1085
-#, fuzzy
+#, c-format
+msgid "The %s buddy is not present in the network"
+msgstr "నెట్‌వర్క్‌లో %s మిత్రుడు అస్తిత్వంలో లేడు. "
+
+#: ../libpurple/protocols/silc/buddy.c:1076
+#: ../libpurple/protocols/silc10/buddy.c:1084
+msgid "To add the buddy you must import his/her public key. Press Import to import a public key."
+msgstr "మిత్రుని చేర్చాలంటే అతడు/లేక ఆమె పబ్లిక్ కీని మీరు తప్పక ఇంపోర్ట్ చేసుకోవాలి. పబ్లిక్ కీని ఇంపోర్ట్ చేసుకోడానికి Import ను నొక్కండి. "
+
+#: ../libpurple/protocols/silc/buddy.c:1080
+#: ../libpurple/protocols/silc10/buddy.c:1088
 msgid "_Import..."
-msgstr "ఇంపోర్ట్..."
-
-#: ../libpurple/protocols/silc/buddy.c:1183
-#: ../libpurple/protocols/silc10/buddy.c:1181
+msgstr "_Import..."
+
+#: ../libpurple/protocols/silc/buddy.c:1186
+#: ../libpurple/protocols/silc10/buddy.c:1184
 msgid "Select correct user"
 msgstr "అసలైన వినియోగదారుని సెలక్ట్ చేయండి."
 
-#: ../libpurple/protocols/silc/buddy.c:1185
-#: ../libpurple/protocols/silc10/buddy.c:1183
-msgid ""
-"More than one user was found with the same public key. Select the correct "
-"user from the list to add to the buddy list."
-msgstr ""
-"ఒకే పబ్లిక్ కీతో ఒకరిని మించిన వినియోగదారులు కనిపించారు. మిత్రుల లిస్టులో చేర్చడానికి సరియైన మిత్రుని పేరును "
-"చేర్చండి. "
-
-#: ../libpurple/protocols/silc/buddy.c:1187
-#: ../libpurple/protocols/silc10/buddy.c:1185
-msgid ""
-"More than one user was found with the same name. Select the correct user "
-"from the list to add to the buddy list."
-msgstr ""
-"ఒకే పేరుతో ఒకరికి మించిన వినియోగదారు లున్నారు. మిత్రుల లిస్టులో చేర్చడానికి లిస్టునుండి అసలైన వినియోగదారుని "
-"పేరును సెలక్ట్ చేయండి. "
-
-#: ../libpurple/protocols/silc/buddy.c:1474
-#: ../libpurple/protocols/silc10/buddy.c:1474
+#: ../libpurple/protocols/silc/buddy.c:1188
+#: ../libpurple/protocols/silc10/buddy.c:1186
+msgid "More than one user was found with the same public key. Select the correct user from the list to add to the buddy list."
+msgstr "ఒకే పబ్లిక్ కీతో ఒకరిని మించిన వినియోగదారులు కనిపించారు. మిత్రుల లిస్టులో చేర్చడానికి సరియైన మిత్రుని పేరును చేర్చండి. "
+
+#: ../libpurple/protocols/silc/buddy.c:1190
+#: ../libpurple/protocols/silc10/buddy.c:1188
+msgid "More than one user was found with the same name. Select the correct user from the list to add to the buddy list."
+msgstr "ఒకే పేరుతో ఒకరికి మించిన వినియోగదారు లున్నారు. మిత్రుల లిస్టులో చేర్చడానికి లిస్టునుండి అసలైన వినియోగదారుని పేరును సెలక్ట్ చేయండి. "
+
+#: ../libpurple/protocols/silc/buddy.c:1477
+#: ../libpurple/protocols/silc10/buddy.c:1477
 msgid "Detached"
 msgstr "విడదీయబడిన "
 
-#: ../libpurple/protocols/silc/buddy.c:1478
+#: ../libpurple/protocols/silc/buddy.c:1481
 #: ../libpurple/protocols/silc/silc.c:58
-#: ../libpurple/protocols/silc10/buddy.c:1478
+#: ../libpurple/protocols/silc10/buddy.c:1481
 #: ../libpurple/protocols/silc10/silc.c:49
 msgid "Indisposed"
 msgstr "అనిష్టము "
 
-#: ../libpurple/protocols/silc/buddy.c:1482
+#: ../libpurple/protocols/silc/buddy.c:1485
 #: ../libpurple/protocols/silc/silc.c:60
-#: ../libpurple/protocols/silc10/buddy.c:1482
+#: ../libpurple/protocols/silc10/buddy.c:1485
 #: ../libpurple/protocols/silc10/silc.c:51
 msgid "Wake Me Up"
 msgstr "నన్ను మేల్కొలుపుము "
 
-#: ../libpurple/protocols/silc/buddy.c:1484
+#: ../libpurple/protocols/silc/buddy.c:1487
 #: ../libpurple/protocols/silc/silc.c:52
-#: ../libpurple/protocols/silc10/buddy.c:1484
+#: ../libpurple/protocols/silc10/buddy.c:1487
 #: ../libpurple/protocols/silc10/silc.c:43
 msgid "Hyper Active"
 msgstr "అత్యంత ఆతృత "
 
-#: ../libpurple/protocols/silc/buddy.c:1486
-#: ../libpurple/protocols/silc10/buddy.c:1486
+#: ../libpurple/protocols/silc/buddy.c:1489
+#: ../libpurple/protocols/silc10/buddy.c:1489
 msgid "Robot"
 msgstr "రోబోట్ "
 
-#: ../libpurple/protocols/silc/buddy.c:1493
-#: ../libpurple/protocols/silc/silc.c:743
-#: ../libpurple/protocols/silc/util.c:516
-#: ../libpurple/protocols/silc10/buddy.c:1493
+#: ../libpurple/protocols/silc/buddy.c:1496
+#: ../libpurple/protocols/silc/silc.c:886
+#: ../libpurple/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc10/buddy.c:1496
 #: ../libpurple/protocols/silc10/silc.c:654
 #: ../libpurple/protocols/silc10/util.c:512
 msgid "Happy"
 msgstr "సంతోషం "
 
-#: ../libpurple/protocols/silc/buddy.c:1495
-#: ../libpurple/protocols/silc/silc.c:745
-#: ../libpurple/protocols/silc/util.c:518
-#: ../libpurple/protocols/silc10/buddy.c:1495
+#: ../libpurple/protocols/silc/buddy.c:1498
+#: ../libpurple/protocols/silc/silc.c:888
+#: ../libpurple/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc10/buddy.c:1498
 #: ../libpurple/protocols/silc10/silc.c:656
 #: ../libpurple/protocols/silc10/util.c:514
 msgid "Sad"
 msgstr "దుఃఖము "
 
-#: ../libpurple/protocols/silc/buddy.c:1497
-#: ../libpurple/protocols/silc/silc.c:747
-#: ../libpurple/protocols/silc/util.c:520
-#: ../libpurple/protocols/silc10/buddy.c:1497
+#: ../libpurple/protocols/silc/buddy.c:1500
+#: ../libpurple/protocols/silc/silc.c:890
+#: ../libpurple/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc10/buddy.c:1500
 #: ../libpurple/protocols/silc10/silc.c:658
 #: ../libpurple/protocols/silc10/util.c:516
 msgid "Angry"
 msgstr "కోపము "
 
-#: ../libpurple/protocols/silc/buddy.c:1499
-#: ../libpurple/protocols/silc/silc.c:749
-#: ../libpurple/protocols/silc/util.c:522
-#: ../libpurple/protocols/silc10/buddy.c:1499
+#: ../libpurple/protocols/silc/buddy.c:1502
+#: ../libpurple/protocols/silc/silc.c:892
+#: ../libpurple/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc10/buddy.c:1502
 #: ../libpurple/protocols/silc10/silc.c:660
 #: ../libpurple/protocols/silc10/util.c:518
 msgid "Jealous"
 msgstr "ఈర్ష్య"
 
-#: ../libpurple/protocols/silc/buddy.c:1501
-#: ../libpurple/protocols/silc/silc.c:751
-#: ../libpurple/protocols/silc/util.c:524
-#: ../libpurple/protocols/silc10/buddy.c:1501
+#: ../libpurple/protocols/silc/buddy.c:1504
+#: ../libpurple/protocols/silc/silc.c:894
+#: ../libpurple/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc10/buddy.c:1504
 #: ../libpurple/protocols/silc10/silc.c:662
 #: ../libpurple/protocols/silc10/util.c:520
 msgid "Ashamed"
 msgstr "సిగ్గుపడిన"
 
-#: ../libpurple/protocols/silc/buddy.c:1503
-#: ../libpurple/protocols/silc/silc.c:753
-#: ../libpurple/protocols/silc/util.c:526
-#: ../libpurple/protocols/silc10/buddy.c:1503
+#: ../libpurple/protocols/silc/buddy.c:1506
+#: ../libpurple/protocols/silc/silc.c:896
+#: ../libpurple/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc10/buddy.c:1506
 #: ../libpurple/protocols/silc10/silc.c:664
 #: ../libpurple/protocols/silc10/util.c:522
 msgid "Invincible"
 msgstr "అజేయమైన "
 
-#: ../libpurple/protocols/silc/buddy.c:1505
-#: ../libpurple/protocols/silc/util.c:528
-#: ../libpurple/protocols/silc10/buddy.c:1505
+#: ../libpurple/protocols/silc/buddy.c:1508
+#: ../libpurple/protocols/silc/util.c:534
+#: ../libpurple/protocols/silc10/buddy.c:1508
 #: ../libpurple/protocols/silc10/util.c:524
 msgid "In Love"
 msgstr "ప్రేమతో "
 
-#: ../libpurple/protocols/silc/buddy.c:1507
-#: ../libpurple/protocols/silc/silc.c:757
-#: ../libpurple/protocols/silc/util.c:530
-#: ../libpurple/protocols/silc10/buddy.c:1507
+#: ../libpurple/protocols/silc/buddy.c:1510
+#: ../libpurple/protocols/silc/silc.c:900
+#: ../libpurple/protocols/silc/util.c:536
+#: ../libpurple/protocols/silc10/buddy.c:1510
 #: ../libpurple/protocols/silc10/silc.c:668
 #: ../libpurple/protocols/silc10/util.c:526
 msgid "Sleepy"
 msgstr "నిద్రతో"
 
-#: ../libpurple/protocols/silc/buddy.c:1509
-#: ../libpurple/protocols/silc/silc.c:759
-#: ../libpurple/protocols/silc/util.c:532
-#: ../libpurple/protocols/silc10/buddy.c:1509
+#: ../libpurple/protocols/silc/buddy.c:1512
+#: ../libpurple/protocols/silc/silc.c:902
+#: ../libpurple/protocols/silc/util.c:538
+#: ../libpurple/protocols/silc10/buddy.c:1512
 #: ../libpurple/protocols/silc10/silc.c:670
 #: ../libpurple/protocols/silc10/util.c:528
 msgid "Bored"
 msgstr "విసుగుచెందిన "
 
-#: ../libpurple/protocols/silc/buddy.c:1511
-#: ../libpurple/protocols/silc/silc.c:761
-#: ../libpurple/protocols/silc/util.c:534
-#: ../libpurple/protocols/silc10/buddy.c:1511
+#: ../libpurple/protocols/silc/buddy.c:1514
+#: ../libpurple/protocols/silc/silc.c:904
+#: ../libpurple/protocols/silc/util.c:540
+#: ../libpurple/protocols/silc10/buddy.c:1514
 #: ../libpurple/protocols/silc10/silc.c:672
 #: ../libpurple/protocols/silc10/util.c:530
 msgid "Excited"
 msgstr "ఉత్సాహముతో "
 
-#: ../libpurple/protocols/silc/buddy.c:1513
-#: ../libpurple/protocols/silc/silc.c:763
-#: ../libpurple/protocols/silc/util.c:536
-#: ../libpurple/protocols/silc10/buddy.c:1513
+#: ../libpurple/protocols/silc/buddy.c:1516
+#: ../libpurple/protocols/silc/silc.c:906
+#: ../libpurple/protocols/silc/util.c:542
+#: ../libpurple/protocols/silc10/buddy.c:1516
 #: ../libpurple/protocols/silc10/silc.c:674
 #: ../libpurple/protocols/silc10/util.c:532
 msgid "Anxious"
 msgstr "గాబరాతో "
 
-#: ../libpurple/protocols/silc/buddy.c:1545
+#: ../libpurple/protocols/silc/buddy.c:1548
 #: ../libpurple/protocols/silc/ops.c:1207
-#: ../libpurple/protocols/silc10/buddy.c:1545
+#: ../libpurple/protocols/silc10/buddy.c:1548
 #: ../libpurple/protocols/silc10/ops.c:1202
 msgid "User Modes"
 msgstr "వినియోగదారుని మోడ్స్ "
 
-#  *< api_version
+# *< api_version
 #  *< type
 #  *< ui_requirement
 #  *< flags
 #  *< dependencies
 #  *< priority
 #  *< id
-#: ../libpurple/protocols/silc/buddy.c:1562
+#: ../libpurple/protocols/silc/buddy.c:1565
 #: ../libpurple/protocols/silc/ops.c:1224
-#: ../libpurple/protocols/silc10/buddy.c:1562
+#: ../libpurple/protocols/silc10/buddy.c:1565
 #: ../libpurple/protocols/silc10/ops.c:1219
 msgid "Preferred Contact"
 msgstr "మనోభీష్ట సంబంధం "
 
-#: ../libpurple/protocols/silc/buddy.c:1567
+#: ../libpurple/protocols/silc/buddy.c:1570
 #: ../libpurple/protocols/silc/ops.c:1229
-#: ../libpurple/protocols/silc10/buddy.c:1567
+#: ../libpurple/protocols/silc10/buddy.c:1570
 #: ../libpurple/protocols/silc10/ops.c:1224
 msgid "Preferred Language"
 msgstr "ఇష్టపడిన భాష "
 
-#: ../libpurple/protocols/silc/buddy.c:1572
+#: ../libpurple/protocols/silc/buddy.c:1575
 #: ../libpurple/protocols/silc/ops.c:1234
-#: ../libpurple/protocols/silc10/buddy.c:1572
+#: ../libpurple/protocols/silc10/buddy.c:1575
 #: ../libpurple/protocols/silc10/ops.c:1229
 msgid "Device"
 msgstr "సాధనం "
 
-#: ../libpurple/protocols/silc/buddy.c:1577
+#: ../libpurple/protocols/silc/buddy.c:1580
 #: ../libpurple/protocols/silc/ops.c:1239
-#: ../libpurple/protocols/silc10/buddy.c:1577
+#: ../libpurple/protocols/silc10/buddy.c:1580
 #: ../libpurple/protocols/silc10/ops.c:1234
 #: ../libpurple/protocols/silc10/silc.c:722
 #: ../libpurple/protocols/silc10/silc.c:724
 msgid "Timezone"
 msgstr "సమయ క్షేత్రం "
 
-#  ---------- "Notification Methods" ----------
-#: ../libpurple/protocols/silc/buddy.c:1582
+# ---------- "Notification Methods" ----------
+#: ../libpurple/protocols/silc/buddy.c:1585
 #: ../libpurple/protocols/silc/ops.c:1244
-#: ../libpurple/protocols/silc10/buddy.c:1582
+#: ../libpurple/protocols/silc10/buddy.c:1585
 #: ../libpurple/protocols/silc10/ops.c:1239
 msgid "Geolocation"
 msgstr "భూమిపై స్థానం "
 
-#: ../libpurple/protocols/silc/buddy.c:1638
-#: ../libpurple/protocols/silc10/buddy.c:1636
+#: ../libpurple/protocols/silc/buddy.c:1641
+#: ../libpurple/protocols/silc10/buddy.c:1639
 msgid "Reset IM Key"
 msgstr "IM కీని రీసెట్ చేయుము "
 
-#: ../libpurple/protocols/silc/buddy.c:1643
-#: ../libpurple/protocols/silc10/buddy.c:1642
+#: ../libpurple/protocols/silc/buddy.c:1646
+#: ../libpurple/protocols/silc10/buddy.c:1645
 msgid "IM with Key Exchange"
 msgstr "కీ ఎక్స్‌చెంజ్‌తో IM "
 
-#: ../libpurple/protocols/silc/buddy.c:1648
-#: ../libpurple/protocols/silc10/buddy.c:1647
+#: ../libpurple/protocols/silc/buddy.c:1651
+#: ../libpurple/protocols/silc10/buddy.c:1650
 msgid "IM with Password"
 msgstr "IMతో పాస్‌వర్డ్ "
 
-#: ../libpurple/protocols/silc/buddy.c:1661
-#: ../libpurple/protocols/silc10/buddy.c:1660
+#: ../libpurple/protocols/silc/buddy.c:1664
+#: ../libpurple/protocols/silc10/buddy.c:1663
 msgid "Get Public Key..."
 msgstr "పబ్లిక్ కీని తీసుకురండి ..."
 
-#  *  DEFINES, MACROS & DATA TYPES
-#: ../libpurple/protocols/silc/buddy.c:1668
-#: ../libpurple/protocols/silc/ops.c:1608
-#: ../libpurple/protocols/silc10/buddy.c:1667
+# *  DEFINES, MACROS & DATA TYPES
+#: ../libpurple/protocols/silc/buddy.c:1671
+#: ../libpurple/protocols/silc/ops.c:1612
+#: ../libpurple/protocols/silc10/buddy.c:1670
 #: ../libpurple/protocols/silc10/ops.c:1624
 msgid "Kill User"
 msgstr "వినియోగదారుని చంపుము."
 
-#: ../libpurple/protocols/silc/buddy.c:1678
-#: ../libpurple/protocols/silc/chat.c:993
-#: ../libpurple/protocols/silc10/buddy.c:1677
+#: ../libpurple/protocols/silc/buddy.c:1681
+#: ../libpurple/protocols/silc/chat.c:997
+#: ../libpurple/protocols/silc10/buddy.c:1680
 #: ../libpurple/protocols/silc10/chat.c:977
 msgid "Draw On Whiteboard"
-msgstr ""
+msgstr "తెల్లబోర్డుపై గీయండి"
 
 #: ../libpurple/protocols/silc/chat.c:39
 #: ../libpurple/protocols/silc10/chat.c:39
@@ -11332,7 +11533,7 @@
 msgstr "%s చానల్ నెట్‌వర్క్‌లో లేదు. "
 
 #: ../libpurple/protocols/silc/chat.c:81
-#: ../libpurple/protocols/silc/chat.c:175
+#: ../libpurple/protocols/silc/chat.c:177
 #: ../libpurple/protocols/silc10/chat.c:81
 #: ../libpurple/protocols/silc10/chat.c:174
 msgid "Channel Information"
@@ -11382,62 +11583,53 @@
 
 #: ../libpurple/protocols/silc/chat.c:153
 #: ../libpurple/protocols/silc10/chat.c:152
-#, c-format
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>చానల్ మోడ్స్:</b> "
 
-#: ../libpurple/protocols/silc/chat.c:166
+#: ../libpurple/protocols/silc/chat.c:167
 #: ../libpurple/protocols/silc10/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b> సంస్థాపకుని తాళపు వ్రేలిముద్ర:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:167
+#: ../libpurple/protocols/silc/chat.c:168
 #: ../libpurple/protocols/silc10/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>సంస్థాపకుని కీ బాబిల్‌ప్రింట్:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:236
+#: ../libpurple/protocols/silc/chat.c:238
 #: ../libpurple/protocols/silc10/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "చానల్ పబ్లిక్ కీని చేర్చుము."
 
+# Add new public key
 #. Add new public key
-#: ../libpurple/protocols/silc/chat.c:304
+#: ../libpurple/protocols/silc/chat.c:306
 #: ../libpurple/protocols/silc10/chat.c:291
 msgid "Open Public Key..."
 msgstr "పబ్లిక్ కీని చేర్చుము... "
 
-#: ../libpurple/protocols/silc/chat.c:423
+#: ../libpurple/protocols/silc/chat.c:425
 #: ../libpurple/protocols/silc10/chat.c:401
 msgid "Channel Passphrase"
 msgstr "చానల్ పాస్‌వర్డ్ వాక్యాంశం "
 
-#: ../libpurple/protocols/silc/chat.c:430
+#: ../libpurple/protocols/silc/chat.c:432
 #: ../libpurple/protocols/silc10/chat.c:408
 msgid "Channel Public Keys List"
 msgstr "చానల్ పబ్లిక్ కీల లిస్టు"
 
-#: ../libpurple/protocols/silc/chat.c:435
+#: ../libpurple/protocols/silc/chat.c:437
 #: ../libpurple/protocols/silc10/chat.c:413
-#, c-format
-msgid ""
-"Channel authentication is used to secure the channel from unauthorized "
-"access. The authentication may be based on passphrase and digital "
-"signatures. If passphrase is set, it is required to be able to join. If "
-"channel public keys are set then only users whose public keys are listed are "
-"able to join."
-msgstr ""
-"అధికారం పొందనివారు వాడకుండా ఉండేందుకు రక్షణగా చానల్ వాస్తవికత వాడాలి. ఈ వాస్తవికత పాస్‌వర్డ్ వాక్యాంశంమీద "
-"మరియు డిజిటల్ సంతకాలమీద ఆధారపడి ఉంటుంది. పాస్‌వర్డ్ వాక్యాంశాన్ని సెట్ చేస్తే, దాన్ని చేర్చాలి. చానల్ పబ్లిక్ "
-"కీలను సెట్ చేస్తే అప్పుడు మాత్రమే వినియోగదారులు చేరవచ్చు. అయితే వారి కీలు లిస్టులో నమోదుచేసి ఉండాలి. "
-
-#: ../libpurple/protocols/silc/chat.c:444
-#: ../libpurple/protocols/silc/chat.c:445
-#: ../libpurple/protocols/silc/chat.c:479
-#: ../libpurple/protocols/silc/chat.c:480
-#: ../libpurple/protocols/silc/chat.c:927
+msgid "Channel authentication is used to secure the channel from unauthorized access. The authentication may be based on passphrase and digital signatures. If passphrase is set, it is required to be able to join. If channel public keys are set then only users whose public keys are listed are able to join."
+msgstr "అధికారం పొందనివారు వాడకుండా ఉండేందుకు రక్షణగా చానల్ వాస్తవికత వాడాలి. ఈ వాస్తవికత పాస్‌వర్డ్ వాక్యాంశంమీద మరియు డిజిటల్ సంతకాలమీద ఆధారపడి ఉంటుంది. పాస్‌వర్డ్ వాక్యాంశాన్ని సెట్ చేస్తే, దాన్ని చేర్చాలి. చానల్ పబ్లిక్ కీలను సెట్ చేస్తే అప్పుడు మాత్రమే వినియోగదారులు చేరవచ్చు. అయితే వారి కీలు లిస్టులో నమోదుచేసి ఉండాలి. "
+
+#: ../libpurple/protocols/silc/chat.c:446
+#: ../libpurple/protocols/silc/chat.c:447
+#: ../libpurple/protocols/silc/chat.c:483
+#: ../libpurple/protocols/silc/chat.c:484
+#: ../libpurple/protocols/silc/chat.c:931
 #: ../libpurple/protocols/silc10/chat.c:422
 #: ../libpurple/protocols/silc10/chat.c:423
 #: ../libpurple/protocols/silc10/chat.c:461
@@ -11446,166 +11638,170 @@
 msgid "Channel Authentication"
 msgstr "చానల్ ప్రమాణీకరణ (వాస్తవికత)"
 
-#: ../libpurple/protocols/silc/chat.c:446
-#: ../libpurple/protocols/silc/chat.c:481
+#: ../libpurple/protocols/silc/chat.c:448
+#: ../libpurple/protocols/silc/chat.c:485
 #: ../libpurple/protocols/silc10/chat.c:424
 #: ../libpurple/protocols/silc10/chat.c:463
 msgid "Add / Remove"
 msgstr "చేర్చుము/తొలగించుము. "
 
-#: ../libpurple/protocols/silc/chat.c:597
+#: ../libpurple/protocols/silc/chat.c:601
 #: ../libpurple/protocols/silc10/chat.c:581
 msgid "Group Name"
 msgstr "గ్రూపు పేరు "
 
-#: ../libpurple/protocols/silc/chat.c:601
-#: ../libpurple/protocols/silc/ops.c:1813
-#: ../libpurple/protocols/silc/silc.c:1020
+#: ../libpurple/protocols/silc/chat.c:605
+#: ../libpurple/protocols/silc/ops.c:1817
+#: ../libpurple/protocols/silc/silc.c:1163
 #: ../libpurple/protocols/silc10/chat.c:585
 #: ../libpurple/protocols/silc10/ops.c:1901
 #: ../libpurple/protocols/silc10/silc.c:931
 msgid "Passphrase"
 msgstr "పాస్‌వర్డ్ వాక్యాంశం. "
 
-#: ../libpurple/protocols/silc/chat.c:612
+#: ../libpurple/protocols/silc/chat.c:616
 #: ../libpurple/protocols/silc10/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "%s చానల్ అసలైన గ్రూపు పేరును మరియు పాస్‌వర్డ్ వాక్యాంశాన్ని ఎంటర్ చేయండి. "
 
-#: ../libpurple/protocols/silc/chat.c:614
+#: ../libpurple/protocols/silc/chat.c:618
 #: ../libpurple/protocols/silc10/chat.c:598
 msgid "Add Channel Private Group"
 msgstr "చానల్ అసలైన గ్రూప్ పేరును చేర్చండి. "
 
-#: ../libpurple/protocols/silc/chat.c:742
+#: ../libpurple/protocols/silc/chat.c:746
 #: ../libpurple/protocols/silc10/chat.c:726
 msgid "User Limit"
 msgstr "వినియోగదారుని హద్దు "
 
-#: ../libpurple/protocols/silc/chat.c:743
+#: ../libpurple/protocols/silc/chat.c:747
 #: ../libpurple/protocols/silc10/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr "చానల్‌పై వినియోగదారుని హద్దును సెట్ చేయుము. వినియోగదారుని రీసెట్ చేయాలంటే జీరోకు సెట్ చేయండి. "
 
-#: ../libpurple/protocols/silc/chat.c:907
+#: ../libpurple/protocols/silc/chat.c:911
 #: ../libpurple/protocols/silc10/chat.c:891
 msgid "Invite List"
 msgstr "లిస్టును ఆహ్వానించండి. "
 
-#  Buddy List
-#: ../libpurple/protocols/silc/chat.c:912
+# Buddy List
+#: ../libpurple/protocols/silc/chat.c:916
 #: ../libpurple/protocols/silc10/chat.c:896
 msgid "Ban List"
 msgstr "నిషేధ లిస్టు"
 
-#: ../libpurple/protocols/silc/chat.c:920
+#: ../libpurple/protocols/silc/chat.c:924
 #: ../libpurple/protocols/silc10/chat.c:904
 msgid "Add Private Group"
 msgstr "ప్రైవేట్ గ్రూపును చేర్చండి. "
 
-#: ../libpurple/protocols/silc/chat.c:933
+#: ../libpurple/protocols/silc/chat.c:937
 #: ../libpurple/protocols/silc10/chat.c:917
 msgid "Reset Permanent"
 msgstr "పర్మనెంటుగా రీసెట్ చేయుము."
 
-#: ../libpurple/protocols/silc/chat.c:938
+#: ../libpurple/protocols/silc/chat.c:942
 #: ../libpurple/protocols/silc10/chat.c:922
 msgid "Set Permanent"
 msgstr "పర్మనెంట్‌గా సెట్ చేయుము. "
 
-#: ../libpurple/protocols/silc/chat.c:946
+#: ../libpurple/protocols/silc/chat.c:950
 #: ../libpurple/protocols/silc10/chat.c:930
 msgid "Set User Limit"
 msgstr "వినియోగదారుని హద్దును సెట్ చేయుము. "
 
-#: ../libpurple/protocols/silc/chat.c:952
+#: ../libpurple/protocols/silc/chat.c:956
 #: ../libpurple/protocols/silc10/chat.c:936
 msgid "Reset Topic Restriction"
 msgstr "విషయానికి గల హద్దును రీసెట్ చేయుము. "
 
-#: ../libpurple/protocols/silc/chat.c:957
+#: ../libpurple/protocols/silc/chat.c:961
 #: ../libpurple/protocols/silc10/chat.c:941
 msgid "Set Topic Restriction"
 msgstr "విషయానికి గల హద్దును సెట్ చేయుము. "
 
-#: ../libpurple/protocols/silc/chat.c:964
+#: ../libpurple/protocols/silc/chat.c:968
 #: ../libpurple/protocols/silc10/chat.c:948
 msgid "Reset Private Channel"
 msgstr "ప్రైవేట్ చానల్‌ను రీసెట్ చేయుము."
 
-#: ../libpurple/protocols/silc/chat.c:969
+#: ../libpurple/protocols/silc/chat.c:973
 #: ../libpurple/protocols/silc10/chat.c:953
 msgid "Set Private Channel"
 msgstr "ప్రైవేట్ చానల్‌ను సెట్ చేయుము. "
 
-#: ../libpurple/protocols/silc/chat.c:976
+#: ../libpurple/protocols/silc/chat.c:980
 #: ../libpurple/protocols/silc10/chat.c:960
 msgid "Reset Secret Channel"
 msgstr "రహస్య చానల్‌ను రీసెట్ చేయుము. "
 
-#: ../libpurple/protocols/silc/chat.c:981
+#: ../libpurple/protocols/silc/chat.c:985
 #: ../libpurple/protocols/silc10/chat.c:965
 msgid "Set Secret Channel"
 msgstr "రహస్య చానల్‌ను సెట్ చేయుము. "
 
-#: ../libpurple/protocols/silc/chat.c:1045
+#: ../libpurple/protocols/silc/chat.c:1046
 #: ../libpurple/protocols/silc10/chat.c:1102
 #, c-format
-msgid ""
-"You have to join the %s channel before you are able to join the private group"
+msgid "You have to join the %s channel before you are able to join the private group"
 msgstr "మీరు ప్రైవేట్ గ్రూపులో చేరాలంటే దానికిముందు %s చానల్‌లో చేరాలి."
 
-#  *< api_version
+# *< api_version
 #  *< type
 #  *< ui_requirement
 #  *< flags
 #  *< dependencies
 #  *< priority
 #  *< id
-#: ../libpurple/protocols/silc/chat.c:1047
+#: ../libpurple/protocols/silc/chat.c:1048
 #: ../libpurple/protocols/silc10/chat.c:1104
 msgid "Join Private Group"
 msgstr "ప్రైవేట్ గ్రూపులో చేరండి. "
 
-#: ../libpurple/protocols/silc/chat.c:1048
+#: ../libpurple/protocols/silc/chat.c:1049
 #: ../libpurple/protocols/silc10/chat.c:1105
 msgid "Cannot join private group"
 msgstr "ప్రైవేట్ గ్రూపులో చేరలేను. "
 
-#: ../libpurple/protocols/silc/chat.c:1260
-#: ../libpurple/protocols/silc/silc.c:1217
+#: ../libpurple/protocols/silc/chat.c:1245
+#: ../libpurple/protocols/silc/silc.c:1360
 #: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1137
-#, fuzzy
+#: ../libpurple/protocols/silc10/silc.c:1140
 msgid "Call Command"
-msgstr "కమాండ్ "
-
-#: ../libpurple/protocols/silc/chat.c:1260
-#: ../libpurple/protocols/silc/silc.c:1218
+msgstr "కమాండ్ ను కాల్ చేయండి"
+
+#: ../libpurple/protocols/silc/chat.c:1245
+#: ../libpurple/protocols/silc/silc.c:1361
 #: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1137
+#: ../libpurple/protocols/silc10/silc.c:1140
 msgid "Cannot call command"
 msgstr "కమాండ్‌ను పిలువలేను. "
 
 # #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
 # gnome-session/gsm-client-row.c:43
 # #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
-# gnome-session/gsm-client-row.c:43
-#: ../libpurple/protocols/silc/chat.c:1261
-#: ../libpurple/protocols/silc/silc.c:1219
+#: ../libpurple/protocols/silc/chat.c:1246
+#: ../libpurple/protocols/silc/silc.c:1362
 #: ../libpurple/protocols/silc10/chat.c:1300
-#: ../libpurple/protocols/silc10/silc.c:1138
+#: ../libpurple/protocols/silc10/silc.c:1141
 msgid "Unknown command"
 msgstr "అజ్ఞాత కమాండ్. "
 
-#: ../libpurple/protocols/silc/ft.c:85 ../libpurple/protocols/silc/ft.c:101
-#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:108
-#: ../libpurple/protocols/silc/ft.c:112 ../libpurple/protocols/silc/ft.c:116
-#: ../libpurple/protocols/silc/ft.c:120 ../libpurple/protocols/silc/ft.c:272
-#: ../libpurple/protocols/silc/ft.c:277 ../libpurple/protocols/silc/ft.c:282
-#: ../libpurple/protocols/silc/ft.c:288 ../libpurple/protocols/silc/ft.c:425
-#: ../libpurple/protocols/silc10/ft.c:89 ../libpurple/protocols/silc10/ft.c:92
+#: ../libpurple/protocols/silc/ft.c:85
+#: ../libpurple/protocols/silc/ft.c:101
+#: ../libpurple/protocols/silc/ft.c:104
+#: ../libpurple/protocols/silc/ft.c:108
+#: ../libpurple/protocols/silc/ft.c:112
+#: ../libpurple/protocols/silc/ft.c:116
+#: ../libpurple/protocols/silc/ft.c:120
+#: ../libpurple/protocols/silc/ft.c:272
+#: ../libpurple/protocols/silc/ft.c:277
+#: ../libpurple/protocols/silc/ft.c:282
+#: ../libpurple/protocols/silc/ft.c:288
+#: ../libpurple/protocols/silc/ft.c:425
+#: ../libpurple/protocols/silc10/ft.c:89
+#: ../libpurple/protocols/silc10/ft.c:92
 #: ../libpurple/protocols/silc10/ft.c:96
 #: ../libpurple/protocols/silc10/ft.c:100
 #: ../libpurple/protocols/silc10/ft.c:104
@@ -11617,11 +11813,16 @@
 msgid "Secure File Transfer"
 msgstr "సురక్షిత ఫైల్ ట్రాన్స్‌ఫర్ "
 
-#: ../libpurple/protocols/silc/ft.c:86 ../libpurple/protocols/silc/ft.c:102
-#: ../libpurple/protocols/silc/ft.c:105 ../libpurple/protocols/silc/ft.c:109
-#: ../libpurple/protocols/silc/ft.c:113 ../libpurple/protocols/silc/ft.c:117
-#: ../libpurple/protocols/silc/ft.c:121 ../libpurple/protocols/silc10/ft.c:90
-#: ../libpurple/protocols/silc10/ft.c:93 ../libpurple/protocols/silc10/ft.c:97
+#: ../libpurple/protocols/silc/ft.c:86
+#: ../libpurple/protocols/silc/ft.c:102
+#: ../libpurple/protocols/silc/ft.c:105
+#: ../libpurple/protocols/silc/ft.c:109
+#: ../libpurple/protocols/silc/ft.c:113
+#: ../libpurple/protocols/silc/ft.c:117
+#: ../libpurple/protocols/silc/ft.c:121
+#: ../libpurple/protocols/silc10/ft.c:90
+#: ../libpurple/protocols/silc10/ft.c:93
+#: ../libpurple/protocols/silc10/ft.c:97
 #: ../libpurple/protocols/silc10/ft.c:101
 #: ../libpurple/protocols/silc10/ft.c:105
 msgid "Error during file transfer"
@@ -11630,48 +11831,55 @@
 #: ../libpurple/protocols/silc/ft.c:87
 #, fuzzy
 msgid "Remote disconnected"
-msgstr "డిస్‌కనెక్ట్ అయింది."
-
-#: ../libpurple/protocols/silc/ft.c:106 ../libpurple/protocols/silc10/ft.c:94
+msgstr "%s డిస్కనెక్ట్అయింది"
+
+#: ../libpurple/protocols/silc/ft.c:106
+#: ../libpurple/protocols/silc10/ft.c:94
 msgid "Permission denied"
 msgstr "అనుమతికి నిరాకరణ. "
 
-#: ../libpurple/protocols/silc/ft.c:110 ../libpurple/protocols/silc10/ft.c:98
+#: ../libpurple/protocols/silc/ft.c:110
+#: ../libpurple/protocols/silc10/ft.c:98
 msgid "Key agreement failed"
 msgstr "కీ ఎగ్రిమెంట్ విఫలమైనది. "
 
 #: ../libpurple/protocols/silc/ft.c:114
 #, fuzzy
 msgid "Connection timed out"
-msgstr "కనెక్షన్ సమయం ముగిసింది. "
+msgstr "కనెక్షన్ సమయం ముగిసింది"
 
 #: ../libpurple/protocols/silc/ft.c:118
 #, fuzzy
 msgid "Creating connection failed"
 msgstr "కనెక్షన్ వైఫల్యం "
 
-#: ../libpurple/protocols/silc/ft.c:122 ../libpurple/protocols/silc10/ft.c:102
-#, fuzzy
+#: ../libpurple/protocols/silc/ft.c:122
+#: ../libpurple/protocols/silc10/ft.c:102
 msgid "File transfer session does not exist"
-msgstr "ఫైల్స్ ట్రాన్స్‌ఫర్ చేసే సమయం లేదు."
-
-#: ../libpurple/protocols/silc/ft.c:273 ../libpurple/protocols/silc10/ft.c:206
+msgstr "ఫైలు బదిలీ సెషన్ అస్తత్వంలో లేదు"
+
+#: ../libpurple/protocols/silc/ft.c:273
+#: ../libpurple/protocols/silc10/ft.c:206
 msgid "No file transfer session active"
 msgstr "ఫైల్ ట్రాన్స్‌ఫర్ సెషన్ సమయం మించిపోయింది."
 
-#: ../libpurple/protocols/silc/ft.c:278 ../libpurple/protocols/silc10/ft.c:211
+#: ../libpurple/protocols/silc/ft.c:278
+#: ../libpurple/protocols/silc10/ft.c:211
 msgid "File transfer already started"
 msgstr "ఫైల్ ట్రాన్స్‌ఫర్ ప్రారంభమైంది."
 
-#: ../libpurple/protocols/silc/ft.c:283 ../libpurple/protocols/silc10/ft.c:216
+#: ../libpurple/protocols/silc/ft.c:283
+#: ../libpurple/protocols/silc10/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr "ఫైల్ ట్రాన్స్‌ఫర్ కోసం కీ ఎగ్రిమెంటును నెరవేర్చలేదు. "
 
-#: ../libpurple/protocols/silc/ft.c:289 ../libpurple/protocols/silc10/ft.c:222
+#: ../libpurple/protocols/silc/ft.c:289
+#: ../libpurple/protocols/silc10/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "ఫైల్ ట్రాన్స్‌ఫర్‌ను ప్రారంభించుటకు సాధ్యం కాదు. "
 
-#: ../libpurple/protocols/silc/ft.c:426 ../libpurple/protocols/silc10/ft.c:341
+#: ../libpurple/protocols/silc/ft.c:426
+#: ../libpurple/protocols/silc10/ft.c:341
 msgid "Cannot send file"
 msgstr "ఫైలును పంపుట సాధ్యం కాదు. "
 
@@ -11679,7 +11887,8 @@
 msgid "Error occurred"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:533 ../libpurple/protocols/silc/ops.c:542
+#: ../libpurple/protocols/silc/ops.c:533
+#: ../libpurple/protocols/silc/ops.c:542
 #: ../libpurple/protocols/silc/ops.c:551
 #: ../libpurple/protocols/silc10/ops.c:554
 #: ../libpurple/protocols/silc10/ops.c:563
@@ -11718,7 +11927,8 @@
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "మీరు <I>%s</I> (%s)చే త్రోసివేయబడ్డారు <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:718 ../libpurple/protocols/silc/ops.c:723
+#: ../libpurple/protocols/silc/ops.c:718
+#: ../libpurple/protocols/silc/ops.c:723
 #: ../libpurple/protocols/silc/ops.c:728
 #: ../libpurple/protocols/silc10/ops.c:742
 #: ../libpurple/protocols/silc10/ops.c:747
@@ -11727,7 +11937,8 @@
 msgid "You have been killed by %s (%s)"
 msgstr "మిమ్మల్ని %s చంపినాడు (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:749 ../libpurple/protocols/silc/ops.c:754
+#: ../libpurple/protocols/silc/ops.c:749
+#: ../libpurple/protocols/silc/ops.c:754
 #: ../libpurple/protocols/silc/ops.c:759
 #: ../libpurple/protocols/silc10/ops.c:773
 #: ../libpurple/protocols/silc10/ops.c:778
@@ -11757,7 +11968,7 @@
 msgstr "కార్య భాగం "
 
 #: ../libpurple/protocols/silc/ops.c:1018
-#: ../libpurple/protocols/silc/silc.c:1013
+#: ../libpurple/protocols/silc/silc.c:1156
 #: ../libpurple/protocols/silc10/ops.c:1052
 #: ../libpurple/protocols/silc10/silc.c:924
 msgid "Organization"
@@ -11791,106 +12002,104 @@
 msgstr "Channel founder on <I>%s</I> is <I>%s</I>"
 
 #: ../libpurple/protocols/silc/ops.c:1190
-#: ../libpurple/protocols/silc/ops.c:1326
+#: ../libpurple/protocols/silc/ops.c:1328
 #: ../libpurple/protocols/silc10/ops.c:1183
 #: ../libpurple/protocols/silc10/ops.c:1332
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1071
-#, fuzzy
 msgid "Real Name"
-msgstr "నిజమైన పేరు "
-
-#  Autostart
+msgstr "అసలు పేరు "
+
+# Autostart
 #: ../libpurple/protocols/silc/ops.c:1218
 #: ../libpurple/protocols/silc10/ops.c:1213
 msgid "Status Text"
 msgstr "టెక్‌స్ట్ స్టాటస్ "
 
-#: ../libpurple/protocols/silc/ops.c:1279
-#: ../libpurple/protocols/silc/ops.c:1351
+#: ../libpurple/protocols/silc/ops.c:1280
+#: ../libpurple/protocols/silc/ops.c:1354
 #: ../libpurple/protocols/silc10/ops.c:1285
 #: ../libpurple/protocols/silc10/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr "పబ్లిక్ కీ వ్రేలిముద్ర "
 
-#: ../libpurple/protocols/silc/ops.c:1280
-#: ../libpurple/protocols/silc/ops.c:1352
+#: ../libpurple/protocols/silc/ops.c:1281
+#: ../libpurple/protocols/silc/ops.c:1355
 #: ../libpurple/protocols/silc10/ops.c:1286
 #: ../libpurple/protocols/silc10/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr "పబ్లిక్ కీ బాబిల్ ప్రింట్ "
 
-#: ../libpurple/protocols/silc/ops.c:1292
+#: ../libpurple/protocols/silc/ops.c:1294
 #: ../libpurple/protocols/silc10/ops.c:1298
-#, fuzzy
 msgid "_More..."
-msgstr "ఇంకా ... "
-
-#: ../libpurple/protocols/silc/ops.c:1369
-#: ../libpurple/protocols/silc/silc.c:1077
+msgstr "_ఇంకా ... "
+
+#: ../libpurple/protocols/silc/ops.c:1373
+#: ../libpurple/protocols/silc/silc.c:1220
 #: ../libpurple/protocols/silc10/ops.c:1371
-#: ../libpurple/protocols/silc10/silc.c:988
+#: ../libpurple/protocols/silc10/silc.c:991
 msgid "Detach From Server"
 msgstr "సెర్వర్‌నుండి వేరు చేయండి. "
 
-#: ../libpurple/protocols/silc/ops.c:1369
+#: ../libpurple/protocols/silc/ops.c:1373
 #: ../libpurple/protocols/silc10/ops.c:1371
 msgid "Cannot detach"
 msgstr "వేరుచేయుట సాధ్యం కాదు. "
 
-#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/silc/ops.c:1393
 #: ../libpurple/protocols/silc10/ops.c:1382
 msgid "Cannot set topic"
 msgstr "టాపిక్‌ను సెట్ చేయుట సాధ్యం కాదు. "
 
-#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/silc/ops.c:1422
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Failed to change nickname"
 msgstr "ఉపనామాన్ని మార్చుటలో వైఫల్యం. "
 
-#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc/ops.c:1471
 #: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Roomlist"
 msgstr "గది లిస్టు "
 
-#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc/ops.c:1471
 #: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Cannot get room list"
 msgstr "గదిలిస్టు తీసుకువచ్చుట సాధ్యంకాదు."
 
-#: ../libpurple/protocols/silc/ops.c:1468
+#: ../libpurple/protocols/silc/ops.c:1472
 #, fuzzy
 msgid "Network is empty"
 msgstr "నెట్‌వర్క్ స్టాటిస్టిక్స్ "
 
-#: ../libpurple/protocols/silc/ops.c:1512
+#: ../libpurple/protocols/silc/ops.c:1516
 #: ../libpurple/protocols/silc10/ops.c:1507
 msgid "No public key was received"
 msgstr "పబ్లిక్ కీ ఏదీ స్వీకరించలేదు."
 
-#: ../libpurple/protocols/silc/ops.c:1524
-#: ../libpurple/protocols/silc/ops.c:1537
+#: ../libpurple/protocols/silc/ops.c:1528
+#: ../libpurple/protocols/silc/ops.c:1541
 #: ../libpurple/protocols/silc10/ops.c:1519
 #: ../libpurple/protocols/silc10/ops.c:1532
 msgid "Server Information"
-msgstr "సెర్వర్ సమాచారం. "
-
-#: ../libpurple/protocols/silc/ops.c:1525
+msgstr "సర్వర్ సమాచారం "
+
+#: ../libpurple/protocols/silc/ops.c:1529
 #: ../libpurple/protocols/silc10/ops.c:1520
 msgid "Cannot get server information"
-msgstr "సెర్వర్ సమాచారం తీసుకురావడం సాధ్యం కాదు. "
-
-#: ../libpurple/protocols/silc/ops.c:1548
+msgstr "సర్వర్ సమాచారం తీసుకురావడం సాధ్యం కాదు "
+
+#: ../libpurple/protocols/silc/ops.c:1552
 #: ../libpurple/protocols/silc10/ops.c:1549
 #: ../libpurple/protocols/silc10/ops.c:1558
 msgid "Server Statistics"
 msgstr "సెర్వర్ స్టాటిస్టిక్స్ "
 
-#: ../libpurple/protocols/silc/ops.c:1549
+#: ../libpurple/protocols/silc/ops.c:1553
 #: ../libpurple/protocols/silc10/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr "సెర్వర్ స్టాటిస్టిక్స్‌ను తీసుకువచ్చుట సాధ్యం కాదు."
 
-#: ../libpurple/protocols/silc/ops.c:1556
+#: ../libpurple/protocols/silc/ops.c:1560
 #: ../libpurple/protocols/silc10/ops.c:1581
 #, c-format
 msgid ""
@@ -11926,72 +12135,72 @@
 "టోటల్ సెర్వర్ ఆపరేటర్లు: %d\n"
 "టోటల్ రూటర్ ఆపరేటర్లు: %d\n"
 
-#: ../libpurple/protocols/silc/ops.c:1588
+#: ../libpurple/protocols/silc/ops.c:1592
 #: ../libpurple/protocols/silc10/ops.c:1604
 msgid "Network Statistics"
 msgstr "నెట్‌వర్క్ స్టాటిస్టిక్స్ "
 
-#: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc/ops.c:1600
 #: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "పింగ్ వైఫల్యం "
 
-#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc/ops.c:1605
 #: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping reply received from server"
 msgstr "సెర్వర్‌నుండి పింగ్ సమాధానం అందినది. "
 
-#: ../libpurple/protocols/silc/ops.c:1609
+#: ../libpurple/protocols/silc/ops.c:1613
 #: ../libpurple/protocols/silc10/ops.c:1625
 msgid "Could not kill user"
 msgstr "వినియోగదారుని చంపుట సాధ్యం కాదు."
 
-#: ../libpurple/protocols/silc/ops.c:1648
+#: ../libpurple/protocols/silc/ops.c:1652
 msgid "WATCH"
 msgstr ""
 
-#: ../libpurple/protocols/silc/ops.c:1648
-#, fuzzy
+#: ../libpurple/protocols/silc/ops.c:1652
 msgid "Cannot watch user"
-msgstr "మిమ్మల్ని మీరు చేర్చుకోలేరు. "
-
-#: ../libpurple/protocols/silc/ops.c:1724
-#: ../libpurple/protocols/silc/ops.c:1775
-#: ../libpurple/protocols/silc/silc.c:277
+msgstr ""
+
+#: ../libpurple/protocols/silc/ops.c:1728
+#: ../libpurple/protocols/silc/ops.c:1779
+#: ../libpurple/protocols/silc/silc.c:385
 #: ../libpurple/protocols/silc10/ops.c:1811
 #: ../libpurple/protocols/silc10/ops.c:1858
 #: ../libpurple/protocols/silc10/silc.c:190
 msgid "Resuming session"
 msgstr "సెషన్‌ను మరల ప్రారంభించుతున్నది."
 
-#: ../libpurple/protocols/silc/ops.c:1726
+#: ../libpurple/protocols/silc/ops.c:1730
 #: ../libpurple/protocols/silc10/ops.c:1813
 msgid "Authenticating connection"
 msgstr "కనెక్షన్‌ను ప్రామాణీకరణ మొనర్చుతున్నది. "
 
-#: ../libpurple/protocols/silc/ops.c:1777
+#: ../libpurple/protocols/silc/ops.c:1781
 #: ../libpurple/protocols/silc10/ops.c:1860
 msgid "Verifying server public key"
 msgstr "సెర్వర్ పబ్లిక్ కీని వెరిఫై చేస్తున్నది. "
 
-#: ../libpurple/protocols/silc/ops.c:1814
+#: ../libpurple/protocols/silc/ops.c:1818
 #: ../libpurple/protocols/silc10/ops.c:1902
 msgid "Passphrase required"
 msgstr "పాస్‌వర్డ్ వాక్యాంశం కావాలి. "
 
-#: ../libpurple/protocols/silc/pk.c:98 ../libpurple/protocols/silc10/pk.c:104
-#, c-format
-msgid ""
-"Received %s's public key. Your local copy does not match this key. Would you "
-"still like to accept this public key?"
+#: ../libpurple/protocols/silc/pk.c:98
+#: ../libpurple/protocols/silc10/pk.c:104
+#, c-format
+msgid "Received %s's public key. Your local copy does not match this key. Would you still like to accept this public key?"
 msgstr "%s పబ్లిక్ కీ అందినది. "
 
-#: ../libpurple/protocols/silc/pk.c:103 ../libpurple/protocols/silc10/pk.c:109
+#: ../libpurple/protocols/silc/pk.c:103
+#: ../libpurple/protocols/silc10/pk.c:109
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr "%s పబ్లిక్ కీ దొరికినది. ఈ పబ్లిక్ కీని మీరు సమ్మతిస్తారా?"
 
-#: ../libpurple/protocols/silc/pk.c:107 ../libpurple/protocols/silc10/pk.c:113
+#: ../libpurple/protocols/silc/pk.c:107
+#: ../libpurple/protocols/silc10/pk.c:113
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -12004,105 +12213,104 @@
 "%s\n"
 "%s\n"
 
-#: ../libpurple/protocols/silc/pk.c:110 ../libpurple/protocols/silc/pk.c:139
+#: ../libpurple/protocols/silc/pk.c:110
+#: ../libpurple/protocols/silc/pk.c:139
 #: ../libpurple/protocols/silc10/pk.c:116
 #: ../libpurple/protocols/silc10/pk.c:142
 msgid "Verify Public Key"
 msgstr "పబ్లిక్‌ కీని వెరిఫై చేయండి. "
 
-#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc10/pk.c:121
-#, fuzzy
+#: ../libpurple/protocols/silc/pk.c:115
+#: ../libpurple/protocols/silc10/pk.c:121
 msgid "_View..."
-msgstr "దృశ్యం "
-
-#: ../libpurple/protocols/silc/pk.c:140 ../libpurple/protocols/silc10/pk.c:143
+msgstr "_చూపించు "
+
+#: ../libpurple/protocols/silc/pk.c:140
+#: ../libpurple/protocols/silc10/pk.c:143
 msgid "Unsupported public key type"
 msgstr "సపోర్టు పొందని పబ్లిక్ కీ టైప్ "
 
-#: ../libpurple/protocols/silc/silc.c:217
+#: ../libpurple/protocols/silc/silc.c:319
 #: ../libpurple/protocols/silc10/ops.c:1749
 msgid "Disconnected by server"
 msgstr "సెర్వర్‌నుండి వేరైనది."
 
-#: ../libpurple/protocols/silc/silc.c:224
+#: ../libpurple/protocols/silc/silc.c:327
 #: ../libpurple/protocols/silc10/ops.c:1700
 msgid "Error during connecting to SILC Server"
 msgstr "SILC సెర్వర్‌కు కనెక్ట్ చేస్తుండగా పొరపాటు. "
 
-#: ../libpurple/protocols/silc/silc.c:229
+#: ../libpurple/protocols/silc/silc.c:333
 #: ../libpurple/protocols/silc10/ops.c:1705
 msgid "Key Exchange failed"
 msgstr "కీ ఆదానప్రదానం మార్పు"
 
-#: ../libpurple/protocols/silc/silc.c:238
+#: ../libpurple/protocols/silc/silc.c:343
 #: ../libpurple/protocols/silc10/ops.c:1714
-msgid ""
-"Resuming detached session failed. Press Reconnect to create new connection."
-msgstr ""
-"వేరుపడిన సెషన్‌ను పునఃప్రారంభించడంలో వైఫల్యం. కొత్త కనెక్షన్‌ను సృష్టించడానికి Reconnectను నొక్కండి."
-
-#: ../libpurple/protocols/silc/silc.c:265
-#: ../libpurple/protocols/silc/silc.c:311
+msgid "Resuming detached session failed. Press Reconnect to create new connection."
+msgstr "వేరుపడిన సెషన్‌ను పునఃప్రారంభించడంలో వైఫల్యం. కొత్త కనెక్షన్‌ను సృష్టించడానికి Reconnectను నొక్కండి."
+
+#: ../libpurple/protocols/silc/silc.c:373
+#: ../libpurple/protocols/silc/silc.c:420
 #: ../libpurple/protocols/silc10/silc.c:161
 msgid "Connection failed"
 msgstr "కనెక్షన్ వైఫల్యం "
 
-#: ../libpurple/protocols/silc/silc.c:280
+#: ../libpurple/protocols/silc/silc.c:388
 #: ../libpurple/protocols/silc10/silc.c:193
 msgid "Performing key exchange"
 msgstr "కీ ఎక్స్‌చేంజీని నెరవేర్చుతున్నది."
 
+# Progress
 #. Progress
-#: ../libpurple/protocols/silc/silc.c:343
+#: ../libpurple/protocols/silc/silc.c:445
 #: ../libpurple/protocols/silc10/silc.c:325
 msgid "Connecting to SILC Server"
 msgstr "SILC సెర్వర్‌కు కనెక్ట్ చేయుచున్నది. "
 
-#: ../libpurple/protocols/silc/silc.c:352
-#, fuzzy, c-format
+#: ../libpurple/protocols/silc/silc.c:455
+#, fuzzy
 msgid "Could not load SILC key pair"
-msgstr "పబ్లిక్ కీని లోడ్ చేయుట సాధ్యమగుటలేదు. "
-
-#: ../libpurple/protocols/silc/silc.c:366
+msgstr " SILC కీ పెయిర్: %s ను లోడ్ చేయలేదు"
+
+#: ../libpurple/protocols/silc/silc.c:469
 #: ../libpurple/protocols/silc10/silc.c:355
-#, fuzzy
 msgid "Unable to create connection"
-msgstr "కొత్త కనెక్షన్ సృష్టించడంలో అసమర్థత. "
-
-#: ../libpurple/protocols/silc/silc.c:395
+msgstr " కనెక్షన్ ఏర్పరచలేని స్థితి "
+
+#: ../libpurple/protocols/silc/silc.c:499
 #: ../libpurple/protocols/silc10/silc.c:267
 msgid "Out of memory"
 msgstr "మెమొరీ లేదు. "
 
-#: ../libpurple/protocols/silc/silc.c:438
+#: ../libpurple/protocols/silc/silc.c:550
 #: ../libpurple/protocols/silc10/silc.c:313
-#, fuzzy
 msgid "Cannot initialize SILC protocol"
-msgstr "SILC ఖాతాదారుల కనెక్షన్ ప్రారంభించడం సాధ్యం కాదు."
-
-#: ../libpurple/protocols/silc/silc.c:445
+msgstr "SILC ప్రోటోకాల్ ను ప్రారంభించజాలదు"
+
+#: ../libpurple/protocols/silc/silc.c:559
 #, fuzzy
 msgid "Error loading SILC key pair"
 msgstr "SILC కీ జంటను సృష్టించండి ..."
 
-#: ../libpurple/protocols/silc/silc.c:739
+#: ../libpurple/protocols/silc/silc.c:882
 #: ../libpurple/protocols/silc10/silc.c:650
 msgid "Your Current Mood"
 msgstr "మీ వర్తమాన స్వభావం "
 
-#: ../libpurple/protocols/silc/silc.c:741
-#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1641
-#, c-format
+#: ../libpurple/protocols/silc/silc.c:884
+#: ../libpurple/protocols/silc10/silc.c:652
+#: ../pidgin/gtkprefs.c:1741
 msgid "Normal"
 msgstr "నార్మల్ "
 
-#: ../libpurple/protocols/silc/silc.c:755
+#: ../libpurple/protocols/silc/silc.c:898
 #: ../libpurple/protocols/silc10/silc.c:666
 #, fuzzy
 msgid "In love"
 msgstr "ప్రేమతో "
 
-#: ../libpurple/protocols/silc/silc.c:766
+#: ../libpurple/protocols/silc/silc.c:909
 #: ../libpurple/protocols/silc10/silc.c:677
 msgid ""
 "\n"
@@ -12111,366 +12319,659 @@
 "\n"
 "మీరు అభిలషించే సంబంధాల పద్ధతులు "
 
-#: ../libpurple/protocols/silc/silc.c:774
-#: ../libpurple/protocols/silc/util.c:561
+#: ../libpurple/protocols/silc/silc.c:917
+#: ../libpurple/protocols/silc/util.c:567
 #: ../libpurple/protocols/silc10/silc.c:685
 #: ../libpurple/protocols/silc10/util.c:557
 msgid "SMS"
 msgstr "SMS"
 
-#: ../libpurple/protocols/silc/silc.c:776
-#: ../libpurple/protocols/silc/util.c:563
+#: ../libpurple/protocols/silc/silc.c:919
+#: ../libpurple/protocols/silc/util.c:569
 #: ../libpurple/protocols/silc10/silc.c:687
 #: ../libpurple/protocols/silc10/util.c:559
 msgid "MMS"
 msgstr "MMS"
 
-#: ../libpurple/protocols/silc/silc.c:778
+#: ../libpurple/protocols/silc/silc.c:921
 #: ../libpurple/protocols/silc10/silc.c:689
 #, fuzzy
 msgid "Video conferencing"
 msgstr "వీడియో సమావేశం"
 
-#: ../libpurple/protocols/silc/silc.c:783
+#: ../libpurple/protocols/silc/silc.c:926
 #: ../libpurple/protocols/silc10/silc.c:694
 msgid "Your Current Status"
 msgstr "మీ వర్తమాన స్టాటస్ "
 
-#: ../libpurple/protocols/silc/silc.c:790
+#: ../libpurple/protocols/silc/silc.c:933
 #: ../libpurple/protocols/silc10/silc.c:701
 msgid "Online Services"
 msgstr "ఆన్‌లైన్ సర్వీసులు "
 
-#: ../libpurple/protocols/silc/silc.c:793
+#: ../libpurple/protocols/silc/silc.c:936
 #: ../libpurple/protocols/silc10/silc.c:704
 msgid "Let others see what services you are using"
 msgstr "మీరు ఏ సర్వీసులను ఉపయోగిస్తున్నారో ఇతరులను చూడనివ్వండి. "
 
-#: ../libpurple/protocols/silc/silc.c:799
+#: ../libpurple/protocols/silc/silc.c:942
 #: ../libpurple/protocols/silc10/silc.c:710
 msgid "Let others see what computer you are using"
 msgstr "మీరు ఏ కంప్యూటర్ నుపయోగిస్తున్నారో ఇతరులను చూడనివ్వండి. "
 
-#: ../libpurple/protocols/silc/silc.c:806
+#: ../libpurple/protocols/silc/silc.c:949
 #: ../libpurple/protocols/silc10/silc.c:717
 msgid "Your VCard File"
 msgstr "మీ VCard File"
 
-#: ../libpurple/protocols/silc/silc.c:812
+#: ../libpurple/protocols/silc/silc.c:955
 #, fuzzy
 msgid "Timezone (UTC)"
 msgstr "సమయ క్షేత్రం "
 
-#: ../libpurple/protocols/silc/silc.c:816
-#: ../libpurple/protocols/silc/silc.c:817
+#: ../libpurple/protocols/silc/silc.c:959
+#: ../libpurple/protocols/silc/silc.c:960
 #: ../libpurple/protocols/silc10/silc.c:729
 #: ../libpurple/protocols/silc10/silc.c:730
 msgid "User Online Status Attributes"
 msgstr "వినియోగదారుని ఆన్‌లైన్ స్టాటస్ ఎట్రిబ్యూట్స్."
 
-#: ../libpurple/protocols/silc/silc.c:818
+#: ../libpurple/protocols/silc/silc.c:961
 #: ../libpurple/protocols/silc10/silc.c:731
-msgid ""
-"You can let other users see your online status information and your personal "
-"information. Please fill the information you would like other users to see "
-"about yourself."
-msgstr ""
-"మీ ఆన్‌లైన్ స్టాటస్ సమాచారాన్ని మరియు మీ వ్యక్తిగత సమాచారాన్ని చూచుటకు ఇతరులను అనుమతించవచ్చును. ఎవరు "
-"మీ సమాచారాన్ని చూడాలని మీరు కోరుకుంటారో వారి సమాచారాన్ని పూరించండి."
-
-#: ../libpurple/protocols/silc/silc.c:859
-#: ../libpurple/protocols/silc/silc.c:865
-#: ../libpurple/protocols/silc/silc.c:1486
+msgid "You can let other users see your online status information and your personal information. Please fill the information you would like other users to see about yourself."
+msgstr "మీ ఆన్‌లైన్ స్టాటస్ సమాచారాన్ని మరియు మీ వ్యక్తిగత సమాచారాన్ని చూచుటకు ఇతరులను అనుమతించవచ్చును. ఎవరు మీ సమాచారాన్ని చూడాలని మీరు కోరుకుంటారో వారి సమాచారాన్ని పూరించండి."
+
+#: ../libpurple/protocols/silc/silc.c:1002
+#: ../libpurple/protocols/silc/silc.c:1008
+#: ../libpurple/protocols/silc/silc.c:1629
 #: ../libpurple/protocols/silc10/silc.c:772
 #: ../libpurple/protocols/silc10/silc.c:778
-#: ../libpurple/protocols/silc10/silc.c:1415
+#: ../libpurple/protocols/silc10/silc.c:1418
 msgid "Message of the Day"
 msgstr "నేటి సందేశం "
 
-#: ../libpurple/protocols/silc/silc.c:859
+#: ../libpurple/protocols/silc/silc.c:1002
 #: ../libpurple/protocols/silc10/silc.c:772
 msgid "No Message of the Day available"
 msgstr "నేటి సందేశం లభించలేదు. "
 
-#: ../libpurple/protocols/silc/silc.c:860
-#: ../libpurple/protocols/silc/silc.c:1481
+#: ../libpurple/protocols/silc/silc.c:1003
+#: ../libpurple/protocols/silc/silc.c:1624
 #: ../libpurple/protocols/silc10/silc.c:773
-#: ../libpurple/protocols/silc10/silc.c:1410
+#: ../libpurple/protocols/silc10/silc.c:1413
 msgid "There is no Message of the Day associated with this connection"
 msgstr "దీనికి సంబంధించి ఈరోజు సందేశం లేదు. "
 
-#: ../libpurple/protocols/silc/silc.c:911
-#: ../libpurple/protocols/silc/silc.c:957
-#: ../libpurple/protocols/silc/silc.c:1028
-#: ../libpurple/protocols/silc/silc.c:1029
+#: ../libpurple/protocols/silc/silc.c:1054
+#: ../libpurple/protocols/silc/silc.c:1100
+#: ../libpurple/protocols/silc/silc.c:1171
+#: ../libpurple/protocols/silc/silc.c:1172
 #: ../libpurple/protocols/silc10/silc.c:824
 #: ../libpurple/protocols/silc10/silc.c:868
 #: ../libpurple/protocols/silc10/silc.c:939
 #: ../libpurple/protocols/silc10/silc.c:940
-#, fuzzy
 msgid "Create New SILC Key Pair"
-msgstr "SILC కీ జంటను సృష్టించండి ..."
-
-#: ../libpurple/protocols/silc/silc.c:911
+msgstr "కొత్త SILC కీ పెయిర్ ను సృష్టించు"
+
+#: ../libpurple/protocols/silc/silc.c:1054
 #: ../libpurple/protocols/silc10/silc.c:824
-#, fuzzy
 msgid "Passphrases do not match"
-msgstr "కొత్త పాస్‌వర్డ్స్ మాచ్ కావు."
-
-#: ../libpurple/protocols/silc/silc.c:957
+msgstr "పాస్ ఫ్రేజ్ లు సరిపోలడంలేదు"
+
+#: ../libpurple/protocols/silc/silc.c:1100
 #: ../libpurple/protocols/silc10/silc.c:868
-#, fuzzy
 msgid "Key Pair Generation failed"
-msgstr "కీ ఎగ్రిమెంట్ విఫలమైనది. "
-
-#: ../libpurple/protocols/silc/silc.c:996
+msgstr "కీ పెయిర్ సృష్టిలో వైఫల్యం"
+
+#: ../libpurple/protocols/silc/silc.c:1139
 #: ../libpurple/protocols/silc10/silc.c:907
-#, fuzzy
 msgid "Key length"
-msgstr "తాళం పొడవు: \t%d बिट\n"
-
-#: ../libpurple/protocols/silc/silc.c:998
+msgstr "కీ పొడవు"
+
+#: ../libpurple/protocols/silc/silc.c:1141
 #: ../libpurple/protocols/silc10/silc.c:909
 #, fuzzy
 msgid "Public key file"
 msgstr "పబ్లిక్ కీ ఫైల్"
 
-#: ../libpurple/protocols/silc/silc.c:1000
+#: ../libpurple/protocols/silc/silc.c:1143
 #: ../libpurple/protocols/silc10/silc.c:911
 #, fuzzy
 msgid "Private key file"
 msgstr "ప్రైవేట్ కీ ఫైల్ "
 
-#: ../libpurple/protocols/silc/silc.c:1023
+#: ../libpurple/protocols/silc/silc.c:1166
 #: ../libpurple/protocols/silc10/silc.c:934
-#, fuzzy
 msgid "Passphrase (retype)"
-msgstr "పాస్‌వర్డ్ పంపబడింది."
-
-#: ../libpurple/protocols/silc/silc.c:1030
+msgstr "పాస్ ఫ్రేస్ (రీ టైపు)"
+
+#: ../libpurple/protocols/silc/silc.c:1173
 #: ../libpurple/protocols/silc10/silc.c:941
-#, fuzzy
 msgid "Generate Key Pair"
-msgstr "ప్రైవేట్ కీ ఫైల్ "
-
-#  Autostart
-#: ../libpurple/protocols/silc/silc.c:1073
-#: ../libpurple/protocols/silc10/silc.c:984
+msgstr "కీ పెయిర్ ను జనరేట్ చేయండి"
+
+# Autostart
+#: ../libpurple/protocols/silc/silc.c:1216
+#: ../libpurple/protocols/silc10/silc.c:987
 msgid "Online Status"
 msgstr "ఆన్‌లైన్ స్టాటస్ "
 
-#: ../libpurple/protocols/silc/silc.c:1081
-#: ../libpurple/protocols/silc10/silc.c:992
+#: ../libpurple/protocols/silc/silc.c:1224
+#: ../libpurple/protocols/silc10/silc.c:995
 msgid "View Message of the Day"
 msgstr "నేటి సందేశ దృశ్యం. "
 
-#: ../libpurple/protocols/silc/silc.c:1085
-#: ../libpurple/protocols/silc10/silc.c:996
-#, fuzzy
+#: ../libpurple/protocols/silc/silc.c:1228
+#: ../libpurple/protocols/silc10/silc.c:999
 msgid "Create SILC Key Pair..."
-msgstr "SILC కీ జంటను సృష్టించండి ..."
-
-#: ../libpurple/protocols/silc/silc.c:1177
-#: ../libpurple/protocols/silc10/silc.c:1095
+msgstr "SILC కీ పెర్ ని సృష్టించండి ..."
+
+#: ../libpurple/protocols/silc/silc.c:1320
+#: ../libpurple/protocols/silc10/silc.c:1098
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "వినియోగదారుడు <I>%s</I> నెట్‌వర్క్‌కు హాజరు కాలేదు."
 
-#: ../libpurple/protocols/silc/silc.c:1357
-#: ../libpurple/protocols/silc10/silc.c:1286
+#: ../libpurple/protocols/silc/silc.c:1500
+#: ../libpurple/protocols/silc10/silc.c:1289
 msgid "Topic too long"
 msgstr "విషయం చాలా పెద్దది."
 
-#: ../libpurple/protocols/silc/silc.c:1438
-#: ../libpurple/protocols/silc10/silc.c:1367
+#: ../libpurple/protocols/silc/silc.c:1581
+#: ../libpurple/protocols/silc10/silc.c:1370
 msgid "You must specify a nick"
 msgstr "మీరు విధిగా ఉపనామాన్ని స్పష్టం చేయాలి. "
 
-#: ../libpurple/protocols/silc/silc.c:1540
-#: ../libpurple/protocols/silc10/silc.c:1469
+#: ../libpurple/protocols/silc/silc.c:1683
+#: ../libpurple/protocols/silc10/silc.c:1472
 #, c-format
 msgid "channel %s not found"
 msgstr "%s చానల్ కనిపించలేదు. "
 
-#: ../libpurple/protocols/silc/silc.c:1545
-#: ../libpurple/protocols/silc10/silc.c:1474
+#: ../libpurple/protocols/silc/silc.c:1688
+#: ../libpurple/protocols/silc10/silc.c:1477
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "%s: %s కోసం చానల్ మోడ్స్. "
 
-#: ../libpurple/protocols/silc/silc.c:1547
-#: ../libpurple/protocols/silc10/silc.c:1476
+#: ../libpurple/protocols/silc/silc.c:1690
+#: ../libpurple/protocols/silc10/silc.c:1479
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "%s చానల్ మోడ్స్ సెట్ చేసి లేవు. "
 
-#: ../libpurple/protocols/silc/silc.c:1560
-#: ../libpurple/protocols/silc10/silc.c:1489
+#: ../libpurple/protocols/silc/silc.c:1703
+#: ../libpurple/protocols/silc10/silc.c:1492
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "%s కోసం  cmodes సెట్ చేయడంలో వైఫల్యం."
 
-#: ../libpurple/protocols/silc/silc.c:1590
-#: ../libpurple/protocols/silc10/silc.c:1519
-#, fuzzy, c-format
+#: ../libpurple/protocols/silc/silc.c:1733
+#: ../libpurple/protocols/silc10/silc.c:1522
+#, c-format
 msgid "Unknown command: %s, (may be a client bug)"
 msgstr "అజ్ఞాత కమాండ్: %s, (బహుశా గెయిమ్ బగ్ కావచ్చును)."
 
-#: ../libpurple/protocols/silc/silc.c:1653
-#: ../libpurple/protocols/silc10/silc.c:1582
+#: ../libpurple/protocols/silc/silc.c:1796
+#: ../libpurple/protocols/silc10/silc.c:1585
 msgid "part [channel]:  Leave the chat"
 msgstr "భాగం [చానల్]: సంభాషణను వదిలివేయుము."
 
-#: ../libpurple/protocols/silc/silc.c:1657
-#: ../libpurple/protocols/silc10/silc.c:1586
+#: ../libpurple/protocols/silc/silc.c:1800
+#: ../libpurple/protocols/silc10/silc.c:1589
 msgid "leave [channel]:  Leave the chat"
 msgstr "వదలివేయు [చానల్]: సంభాషణను వదలివేయుము."
 
-#: ../libpurple/protocols/silc/silc.c:1661
-#: ../libpurple/protocols/silc10/silc.c:1590
+#: ../libpurple/protocols/silc/silc.c:1804
+#: ../libpurple/protocols/silc10/silc.c:1593
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "విషయం [&lt;కొత్త విషయం&gt;]: దర్శించండి లేదా ప్రస్తావన మార్చండి."
 
-#: ../libpurple/protocols/silc/silc.c:1666
-#: ../libpurple/protocols/silc10/silc.c:1595
+#: ../libpurple/protocols/silc/silc.c:1809
+#: ../libpurple/protocols/silc10/silc.c:1598
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "చేరండి &lt;చానల్&gt; [&lt;పాస్‌వర్డ్&gt;]: ఈ నెట్‌వర్క్‌ సంభాషణలో చేరండి. "
 
-#: ../libpurple/protocols/silc/silc.c:1670
-#: ../libpurple/protocols/silc10/silc.c:1599
+#: ../libpurple/protocols/silc/silc.c:1813
+#: ../libpurple/protocols/silc10/silc.c:1602
 msgid "list:  List channels on this network"
 msgstr "లిస్ట్: ఈ నెట్‌వర్క్‌లో చానల్స్‌ను లిస్టు చేయండి. "
 
-#: ../libpurple/protocols/silc/silc.c:1674
-#: ../libpurple/protocols/silc10/silc.c:1603
+#: ../libpurple/protocols/silc/silc.c:1817
+#: ../libpurple/protocols/silc10/silc.c:1606
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;ఉపనామం&gt;:  ఉపనామం గురించిన సమాచారం చూడండి."
 
-#: ../libpurple/protocols/silc/silc.c:1678
-#: ../libpurple/protocols/silc10/silc.c:1607
+#: ../libpurple/protocols/silc/silc.c:1821
+#: ../libpurple/protocols/silc10/silc.c:1610
 #: ../libpurple/protocols/zephyr/zephyr.c:2685
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;ఉపనామం&gt; &lt;సందేశం&gt;:  ఎవరైనా వినియోగదారునికి ప్రైవేట్ సందేశం పంపండి. "
 
-#: ../libpurple/protocols/silc/silc.c:1682
-#: ../libpurple/protocols/silc10/silc.c:1611
+#: ../libpurple/protocols/silc/silc.c:1825
+#: ../libpurple/protocols/silc10/silc.c:1614
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr "ప్రశ్న &lt;ఉపనామం&gt; [&lt;సందేశం&gt;]: వినియోగదారునికి ప్రైవేట్ సందేశం పంపుము. "
 
-#: ../libpurple/protocols/silc/silc.c:1686
-#: ../libpurple/protocols/silc10/silc.c:1615
+#: ../libpurple/protocols/silc/silc.c:1829
+#: ../libpurple/protocols/silc10/silc.c:1618
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd: సెర్వర్ నుండి వచ్చే నేటి సందేశం చూడండి. "
 
-#: ../libpurple/protocols/silc/silc.c:1690
-#: ../libpurple/protocols/silc10/silc.c:1619
+#: ../libpurple/protocols/silc/silc.c:1833
+#: ../libpurple/protocols/silc10/silc.c:1622
 msgid "detach:  Detach this session"
 msgstr "వేరుపరచు: కాలాన్ని వేరుచేయండి. "
 
-#: ../libpurple/protocols/silc/silc.c:1694
-#: ../libpurple/protocols/silc10/silc.c:1623
+#: ../libpurple/protocols/silc/silc.c:1837
+#: ../libpurple/protocols/silc10/silc.c:1626
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [సందేశం]: ఆప్షనల్ సందేశంతో సెర్వర్‌నుండి డిస్‌-కనెక్ట్ చేయండి. "
 
-#: ../libpurple/protocols/silc/silc.c:1698
-#: ../libpurple/protocols/silc10/silc.c:1627
+#: ../libpurple/protocols/silc/silc.c:1841
+#: ../libpurple/protocols/silc10/silc.c:1630
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;కమాండ్&gt;: ఏదన్నా silc ఖాతాదారుని కమాండ్‌ను పిలవండి. "
 
-#: ../libpurple/protocols/silc/silc.c:1704
-#: ../libpurple/protocols/silc10/silc.c:1633
+#: ../libpurple/protocols/silc/silc.c:1847
+#: ../libpurple/protocols/silc10/silc.c:1636
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;ఉపనామం&gt; [-pubkey|&lt;కారణం&gt;]: ఉపనామమును అంతం చేయండి. "
 
-#: ../libpurple/protocols/silc/silc.c:1708
-#: ../libpurple/protocols/silc10/silc.c:1637
+#: ../libpurple/protocols/silc/silc.c:1851
+#: ../libpurple/protocols/silc10/silc.c:1640
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;కొత్త ఉపనామం&gt;: మీ ఉపనామమును మార్చండి."
 
-#: ../libpurple/protocols/silc/silc.c:1712
-#: ../libpurple/protocols/silc10/silc.c:1641
+#: ../libpurple/protocols/silc/silc.c:1855
+#: ../libpurple/protocols/silc10/silc.c:1644
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;ఉపనామం&gt;: ఉపనామ సమాచారాన్ని దర్శిద్దాం."
 
-#: ../libpurple/protocols/silc/silc.c:1716
-#: ../libpurple/protocols/silc10/silc.c:1645
-msgid ""
-"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
-"channel modes"
-msgstr ""
-"cmode &lt;చానల్&gt; [+|-&lt;modes&gt;] [arguments]:  చానల్ మోడ్స్‌ను మార్చుము లేదా "
-"ప్రదర్శించుము."
-
-#: ../libpurple/protocols/silc/silc.c:1720
-#: ../libpurple/protocols/silc10/silc.c:1649
-msgid ""
-"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
-"on channel"
-msgstr ""
-"cumode &lt;చానల్&gt; +|-&lt;modes&gt; &lt;ఉపనామం&gt;: చానల్‌లో ఉపనామం మోడ్‌ను మార్చుము."
-
-#: ../libpurple/protocols/silc/silc.c:1724
-#: ../libpurple/protocols/silc10/silc.c:1653
+#: ../libpurple/protocols/silc/silc.c:1859
+#: ../libpurple/protocols/silc10/silc.c:1648
+msgid "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display channel modes"
+msgstr "cmode &lt;చానల్&gt; [+|-&lt;modes&gt;] [arguments]:  చానల్ మోడ్స్‌ను మార్చుము లేదా ప్రదర్శించుము."
+
+#: ../libpurple/protocols/silc/silc.c:1863
+#: ../libpurple/protocols/silc10/silc.c:1652
+msgid "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes on channel"
+msgstr "cumode &lt;చానల్&gt; +|-&lt;modes&gt; &lt;ఉపనామం&gt;: చానల్‌లో ఉపనామం మోడ్‌ను మార్చుము."
+
+#: ../libpurple/protocols/silc/silc.c:1867
+#: ../libpurple/protocols/silc10/silc.c:1656
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;వినియోగదారుని modes&gt;: నెట్‌వర్క్‌లో మీ modesను సెట్ చేయండి. "
 
-#: ../libpurple/protocols/silc/silc.c:1728
-#: ../libpurple/protocols/silc10/silc.c:1657
+#: ../libpurple/protocols/silc/silc.c:1871
+#: ../libpurple/protocols/silc10/silc.c:1660
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;ఉపనామం&gt; [-pubkey]:  సెర్వర్ సంచాలకుని అధికారాలను తీసికొమ్ము. "
 
-#: ../libpurple/protocols/silc/silc.c:1732
-#: ../libpurple/protocols/silc10/silc.c:1661
-msgid ""
-"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
-"channel invite list"
-msgstr ""
-"invite &lt;;చానల్&gt; [-|+]&lt;ఉపనామం&gt;:  ఉపనామాన్ని ఆహ్వానించండి లేదా చానల్ ఆహ్వానితుల "
-"లిస్టుకు చేర్చండి/తొలగించండి. "
-
-#: ../libpurple/protocols/silc/silc.c:1736
-#: ../libpurple/protocols/silc10/silc.c:1665
+#: ../libpurple/protocols/silc/silc.c:1875
+#: ../libpurple/protocols/silc10/silc.c:1664
+msgid "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from channel invite list"
+msgstr "invite &lt;;చానల్&gt; [-|+]&lt;ఉపనామం&gt;:  ఉపనామాన్ని ఆహ్వానించండి లేదా చానల్ ఆహ్వానితుల లిస్టుకు చేర్చండి/తొలగించండి. "
+
+#: ../libpurple/protocols/silc/silc.c:1879
+#: ../libpurple/protocols/silc10/silc.c:1668
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr "kick &lt;చానల్&gt; &lt;ఉపనామం&gt; [टिपन्नी]: చానల్‌నుండి ఖాతాదారుని క్లిక్ చేయండి. "
 
-#: ../libpurple/protocols/silc/silc.c:1740
-#: ../libpurple/protocols/silc10/silc.c:1669
+#: ../libpurple/protocols/silc/silc.c:1883
+#: ../libpurple/protocols/silc10/silc.c:1672
 msgid "info [server]:  View server administrative details"
 msgstr "info [server]:  సెర్వర్ పరిపాలక వివరాలను దర్శించండి. "
 
-#: ../libpurple/protocols/silc/silc.c:1744
-#: ../libpurple/protocols/silc10/silc.c:1673
+#: ../libpurple/protocols/silc/silc.c:1887
+#: ../libpurple/protocols/silc10/silc.c:1676
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;చానల్&gt; +|-&lt;ఉపనామం&gt;]: చానల్‌నుండి ఖాతాదారుని నిషేధించండి. "
 
-#: ../libpurple/protocols/silc/silc.c:1748
-#: ../libpurple/protocols/silc10/silc.c:1677
+#: ../libpurple/protocols/silc/silc.c:1891
+#: ../libpurple/protocols/silc10/silc.c:1680
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr "getkey &lt;ఉపనామం|సర్వర్&gt;: ఖాతాదారుని లేదా సెర్వర్ పబ్లిక్ కీని వెలువరించుము (రిట్రీవ్). "
 
-#: ../libpurple/protocols/silc/silc.c:1752
-#: ../libpurple/protocols/silc10/silc.c:1681
+#: ../libpurple/protocols/silc/silc.c:1895
+#: ../libpurple/protocols/silc10/silc.c:1684
 msgid "stats:  View server and network statistics"
 msgstr "stats:  సెర్వర్ మరియు నెట్‌వర్క్ స్టాటిస్టిక్స్‌ను దర్శించుము. "
 
-#: ../libpurple/protocols/silc/silc.c:1756
-#: ../libpurple/protocols/silc10/silc.c:1685
+#: ../libpurple/protocols/silc/silc.c:1899
+#: ../libpurple/protocols/silc10/silc.c:1688
 msgid "ping:  Send PING to the connected server"
 msgstr "ping: కనెక్టర్ సెర్వర్‌కు పింగ్‌ను పంపించండి. "
 
-#: ../libpurple/protocols/silc/silc.c:1761
-#: ../libpurple/protocols/silc10/silc.c:1690
+#: ../libpurple/protocols/silc/silc.c:1904
+#: ../libpurple/protocols/silc10/silc.c:1693
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;చానల్&gt;: చానల్ వినియోగదారుల లిస్టును చూపించుము. "
 
-#: ../libpurple/protocols/silc/silc.c:1765
-#: ../libpurple/protocols/silc10/silc.c:1694
-msgid ""
-"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
-"specific users in channel(s)"
-msgstr ""
-"names [-count|-ops|-halfops|-voices|-normal] &lt;చానల్(s)&gt;: చానల్స్‌లోని నిర్దిష్ట "
-"వినియోగదారుల లిస్టును చూపించుము. "
+#: ../libpurple/protocols/silc/silc.c:1908
+#: ../libpurple/protocols/silc10/silc.c:1697
+msgid "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List specific users in channel(s)"
+msgstr "names [-count|-ops|-halfops|-voices|-normal] &lt;చానల్(s)&gt;: చానల్స్‌లోని నిర్దిష్ట వినియోగదారుల లిస్టును చూపించుము. "
+
+# *< type
+# *< ui_requirement
+# *< flags
+# *< dependencies
+# *< priority
+# *< id
+# *< name
+# *< version
+# *  summary
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#: ../libpurple/protocols/silc/silc.c:2019
+#: ../libpurple/protocols/silc10/silc.c:1822
+msgid "SILC Protocol Plugin"
+msgstr "SILC Protocol Plugin"
+
+# *  description
+#. *  description
+#: ../libpurple/protocols/silc/silc.c:2021
+#: ../libpurple/protocols/silc10/silc.c:1824
+msgid "Secure Internet Live Conferencing (SILC) Protocol"
+msgstr "Secure Internet Live Conferencing (SILC) Protocol"
+
+#: ../libpurple/protocols/silc/silc.c:2053
+#: ../libpurple/protocols/silc10/silc.c:1856
+#: ../pidgin/gtkprefs.c:2138
+msgid "Network"
+msgstr "నెట్‌వర్క్"
+
+#: ../libpurple/protocols/silc/silc.c:2064
+#: ../libpurple/protocols/silc10/silc.c:1867
+msgid "Public Key file"
+msgstr "పబ్లిక్ కీ ఫైల్"
+
+#: ../libpurple/protocols/silc/silc.c:2068
+#: ../libpurple/protocols/silc10/silc.c:1871
+msgid "Private Key file"
+msgstr "ప్రైవేట్ కీ ఫైల్ "
+
+#: ../libpurple/protocols/silc/silc.c:2078
+#: ../libpurple/protocols/silc10/silc.c:1881
+msgid "Cipher"
+msgstr "Cipher"
+
+#: ../libpurple/protocols/silc/silc.c:2088
+#: ../libpurple/protocols/silc10/silc.c:1891
+msgid "HMAC"
+msgstr "HMAC"
+
+#: ../libpurple/protocols/silc/silc.c:2091
+msgid "Use Perfect Forward Secrecy"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:2095
+#: ../libpurple/protocols/silc10/silc.c:1894
+msgid "Public key authentication"
+msgstr "పబ్లిక్ కీ ప్రమాణీకరణ "
+
+#: ../libpurple/protocols/silc/silc.c:2098
+#: ../libpurple/protocols/silc10/silc.c:1897
+msgid "Block IMs without Key Exchange"
+msgstr "కీ ఎక్స్‌చేంజ్ లేకుండా IMs కు అవరోధం. "
+
+#: ../libpurple/protocols/silc/silc.c:2101
+#: ../libpurple/protocols/silc10/silc.c:1900
+msgid "Block messages to whiteboard"
+msgstr "వైట్ బోర్డ్ కు సందేశాలను బ్లాక్ చేయండి"
+
+#: ../libpurple/protocols/silc/silc.c:2104
+#: ../libpurple/protocols/silc10/silc.c:1903
+msgid "Automatically open whiteboard"
+msgstr "వైట్ బోర్డ్ ఆటోమేటిక్ గా తెరవండి"
+
+#: ../libpurple/protocols/silc/silc.c:2107
+#: ../libpurple/protocols/silc10/silc.c:1906
+msgid "Digitally sign and verify all messages"
+msgstr "డిజిటల్ సంతకం చేసి అన్ని సందేశాలను సరిచూడండి"
+
+#: ../libpurple/protocols/silc/util.c:207
+#: ../libpurple/protocols/silc/util.c:250
+#: ../libpurple/protocols/silc10/util.c:207
+#: ../libpurple/protocols/silc10/util.c:247
+msgid "Creating SILC key pair..."
+msgstr "SILC కీ జంటను సృష్టించండి ..."
+
+#: ../libpurple/protocols/silc/util.c:216
+#: ../libpurple/protocols/silc/util.c:259
+#, fuzzy
+msgid "Cannot create SILC key pair\n"
+msgstr "SILC కీ జంటను సృష్టించండి ..."
+
+# Hint for translators: Please check the tabulator width here and in
+# the next strings (short strings: 2 tabs, longer strings 1 tab,
+# sum: 3 tabs or 24 characters)
+#. Hint for translators: Please check the tabulator width here and in
+#. the next strings (short strings: 2 tabs, longer strings 1 tab,
+#. sum: 3 tabs or 24 characters)
+#: ../libpurple/protocols/silc/util.c:364
+#: ../libpurple/protocols/silc10/util.c:355
+#, c-format
+msgid "Real Name: \t%s\n"
+msgstr "అసలు పేరు: \t%s\n"
+
+#: ../libpurple/protocols/silc/util.c:366
+#: ../libpurple/protocols/silc10/util.c:357
+#, c-format
+msgid "User Name: \t%s\n"
+msgstr "వినియోగదారుని పేరు: \t%s\n"
+
+#: ../libpurple/protocols/silc/util.c:368
+#: ../libpurple/protocols/silc10/util.c:359
+#, c-format
+msgid "E-Mail: \t\t%s\n"
+msgstr "ఇ-మెయిల్: \t\t%s\n"
+
+#: ../libpurple/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc10/util.c:361
+#, c-format
+msgid "Host Name: \t%s\n"
+msgstr "హోస్ట్ పేరు: \t%s\n"
+
+#: ../libpurple/protocols/silc/util.c:372
+#: ../libpurple/protocols/silc10/util.c:363
+#, c-format
+msgid "Organization: \t%s\n"
+msgstr "సంస్థ: \t%s\n"
+
+#: ../libpurple/protocols/silc/util.c:374
+#: ../libpurple/protocols/silc10/util.c:365
+#, c-format
+msgid "Country: \t%s\n"
+msgstr "దేశం: \t%s\n"
+
+#: ../libpurple/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc10/util.c:366
+#, c-format
+msgid "Algorithm: \t%s\n"
+msgstr "అల్గారిథమ్ : \t%s\n"
+
+#: ../libpurple/protocols/silc/util.c:376
+#: ../libpurple/protocols/silc10/util.c:367
+#, c-format
+msgid "Key Length: \t%d bits\n"
+msgstr "తాళం పొడవు: \t%d बिट\n"
+
+#: ../libpurple/protocols/silc/util.c:380
+#: ../libpurple/protocols/silc10/util.c:369
+#, c-format
+msgid ""
+"Public Key Fingerprint:\n"
+"%s\n"
+"\n"
+msgstr ""
+"పబ్లిక్ కీ వ్రేలిముద్ర:\n"
+"%s\n"
+"\n"
+
+#: ../libpurple/protocols/silc/util.c:381
+#: ../libpurple/protocols/silc10/util.c:370
+#, c-format
+msgid ""
+"Public Key Babbleprint:\n"
+"%s"
+msgstr ""
+"పబ్లిక్ కీ బాబిల్‌ప్రింట్:\n"
+"%s"
+
+#: ../libpurple/protocols/silc/util.c:385
+#: ../libpurple/protocols/silc/util.c:386
+#: ../libpurple/protocols/silc10/util.c:374
+#: ../libpurple/protocols/silc10/util.c:375
+msgid "Public Key Information"
+msgstr "పబ్లిక్ కీ సమాచారం "
+
+#: ../libpurple/protocols/silc/util.c:565
+#: ../libpurple/protocols/silc10/util.c:555
+msgid "Paging"
+msgstr "పేజింగ్ "
+
+#: ../libpurple/protocols/silc/util.c:571
+#: ../libpurple/protocols/silc10/util.c:561
+msgid "Video Conferencing"
+msgstr "వీడియో సమావేశం"
+
+#: ../libpurple/protocols/silc/util.c:589
+#: ../libpurple/protocols/silc10/util.c:579
+msgid "Computer"
+msgstr "కంప్యూటర్ "
+
+#: ../libpurple/protocols/silc/util.c:593
+#: ../libpurple/protocols/silc10/util.c:583
+msgid "PDA"
+msgstr "PDA"
+
+#: ../libpurple/protocols/silc/util.c:595
+#: ../libpurple/protocols/silc10/util.c:585
+msgid "Terminal"
+msgstr "టెర్మినల్ "
+
+#: ../libpurple/protocols/silc/wb.c:288
+#: ../libpurple/protocols/silc10/wb.c:287
+#, c-format
+msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
+msgstr "వైట్ బోర్డ్ కు %s సందేశాన్ని పంపారు. వైట్ బోర్డ్ ను తెరిచి చూడాలనుకుంటున్నారా?"
+
+#: ../libpurple/protocols/silc/wb.c:292
+#: ../libpurple/protocols/silc10/wb.c:291
+#, c-format
+msgid "%s sent message to whiteboard on %s channel. Would you like to open the whiteboard?"
+msgstr "వైట్ బోర్డ్ కు%s సందేశాన్ని %s చానల్ కు పంపారు. వైట్ బోర్డ్ ను తెరిచి చూడాలనుకుంటున్నారా?"
+
+#: ../libpurple/protocols/silc/wb.c:306
+#: ../libpurple/protocols/silc10/wb.c:305
+msgid "Whiteboard"
+msgstr "వైట్ బోర్డ్"
+
+#: ../libpurple/protocols/silc10/ops.c:1559
+msgid "No server statistics available"
+msgstr "సెర్వర్ స్టాటిస్టిక్స్ లభ్యమగుటలేదు."
+
+#: ../libpurple/protocols/silc10/ops.c:1931
+msgid "Failure: Version mismatch, upgrade your client"
+msgstr "వైఫల్యం: వెర్షన్ మిస్‌మాచ్, మీ ఖాతాదారుని అప్‌గ్రేడ్ చేయండి."
+
+#: ../libpurple/protocols/silc10/ops.c:1934
+msgid "Failure: Remote does not trust/support your public key"
+msgstr "వైఫల్యం: రిమోట్ నమ్మడం లేదు/ పబ్లిక్ కీని సపోర్టు చేయండి."
+
+#: ../libpurple/protocols/silc10/ops.c:1937
+msgid "Failure: Remote does not support proposed KE group"
+msgstr "వైఫల్యం: ప్రతిపాదించిన KE groupను రిమోట్ సపోర్టు చేయుటలేదు."
+
+#: ../libpurple/protocols/silc10/ops.c:1940
+msgid "Failure: Remote does not support proposed cipher"
+msgstr "వైఫల్యం: ప్రతిపాదించిన సైఫర్‌కు రిమోట్ సమర్థన లేదు."
+
+#: ../libpurple/protocols/silc10/ops.c:1943
+msgid "Failure: Remote does not support proposed PKCS"
+msgstr "వైఫల్యం: ప్రతిపాదించిన PKCSకు రిమోట్ సమర్థన లేదు."
+
+#: ../libpurple/protocols/silc10/ops.c:1946
+msgid "Failure: Remote does not support proposed hash function"
+msgstr "వైఫల్యం: ప్రతిపాదించిన హాష్ వాడకానికి రిమోట్ సమర్థన లేదు. "
+
+#: ../libpurple/protocols/silc10/ops.c:1949
+msgid "Failure: Remote does not support proposed HMAC"
+msgstr "వైఫల్యం: ప్రతిపాదించిన HMAC వాడకానికి రిమోట్ సమర్థన లేదు. "
+
+#: ../libpurple/protocols/silc10/ops.c:1951
+msgid "Failure: Incorrect signature"
+msgstr "వైఫల్యం: తప్పు సంతకం "
+
+#: ../libpurple/protocols/silc10/ops.c:1953
+msgid "Failure: Invalid cookie"
+msgstr "వైఫల్యం: పనికిరాని కుకీ "
+
+#: ../libpurple/protocols/silc10/ops.c:1964
+msgid "Failure: Authentication failed"
+msgstr "వైఫల్యం: ప్రమాణీకరణ వైఫల్యం "
+
+#: ../libpurple/protocols/silc10/silc.c:182
+msgid "Cannot initialize SILC Client connection"
+msgstr "SILC ఖాతాదారుల కనెక్షన్ ప్రారంభించడం సాధ్యం కాదు."
+
+#: ../libpurple/protocols/silc10/silc.c:290
+msgid "John Noname"
+msgstr "జాన్ నోనేమ్"
+
+#: ../libpurple/protocols/silc10/silc.c:320
+msgid "Cannot find/access ~/.silc directory"
+msgstr " ~/.silc డైరెక్టరీని కనుగొనజాలదు  /అందుకొనజాలదు"
+
+#: ../libpurple/protocols/silc10/silc.c:334
+#, c-format
+msgid "Could not load SILC key pair: %s"
+msgstr " SILC కీ పెయిర్: %s ను లోడ్ చేయలేదు"
+
+#: ../libpurple/protocols/simple/simple.c:419
+msgid "Could not write"
+msgstr "రాయలేక పోతున్నాం"
+
+#: ../libpurple/protocols/simple/simple.c:443
+#: ../libpurple/protocols/simple/simple.c:1691
+msgid "Could not connect"
+msgstr "కనెక్ట్ చేయడం సాధ్యంమగుట లేదు. "
+
+# #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
+# gnome-session/gsm-client-row.c:43
+# #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
+#: ../libpurple/protocols/simple/simple.c:1127
+#, fuzzy
+msgid "Unknown server response."
+msgstr "అజ్ఞాత తప్పు."
+
+#: ../libpurple/protocols/simple/simple.c:1727
+#: ../libpurple/protocols/simple/simple.c:1773
+#: ../libpurple/protocols/simple/simple.c:1788
+#: ../libpurple/protocols/simple/simple.c:1843
+msgid "Could not create listen socket"
+msgstr "వినదగిన సాకెట్ ను సృష్టించలేకపోతున్నాం"
+
+#: ../libpurple/protocols/simple/simple.c:1752
+msgid "Couldn't resolve host"
+msgstr "హోస్ట్ ను నిశ్చయించలేకపోయాం"
+
+#: ../libpurple/protocols/simple/simple.c:1853
+msgid "Could not resolve hostname"
+msgstr "హోస్ట్ పేరును నిశ్చయించలేకపోతున్నాం"
+
+#: ../libpurple/protocols/simple/simple.c:1871
+msgid "SIP screen names may not contain whitespaces or @ symbols"
+msgstr "SIP స్క్రీన్ పేరులో ఖాళీలు లేదా @ గుర్తు ఉండకూడదు"
 
 #. *< type
 #. *< ui_requirement
@@ -12480,381 +12981,43 @@
 #. *< id
 #. *< name
 #. *< version
-#. *  summary
-#: ../libpurple/protocols/silc/silc.c:1876
-#: ../libpurple/protocols/silc10/silc.c:1819
-msgid "SILC Protocol Plugin"
-msgstr "SILC Protocol Plugin"
-
-#. *  description
-#: ../libpurple/protocols/silc/silc.c:1878
-#: ../libpurple/protocols/silc10/silc.c:1821
-msgid "Secure Internet Live Conferencing (SILC) Protocol"
-msgstr "Secure Internet Live Conferencing (SILC) Protocol"
-
-#: ../libpurple/protocols/silc/silc.c:1910
-#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2036
-msgid "Network"
-msgstr "నెట్‌వర్క్"
-
-#: ../libpurple/protocols/silc/silc.c:1921
-#: ../libpurple/protocols/silc10/silc.c:1864
-msgid "Public Key file"
-msgstr "పబ్లిక్ కీ ఫైల్"
-
-#: ../libpurple/protocols/silc/silc.c:1925
-#: ../libpurple/protocols/silc10/silc.c:1868
-msgid "Private Key file"
-msgstr "ప్రైవేట్ కీ ఫైల్ "
-
-#: ../libpurple/protocols/silc/silc.c:1935
-#: ../libpurple/protocols/silc10/silc.c:1878
-msgid "Cipher"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:1945
-#: ../libpurple/protocols/silc10/silc.c:1888
-msgid "HMAC"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:1948
-msgid "Use Perfect Forward Secrecy"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:1952
-#: ../libpurple/protocols/silc10/silc.c:1891
-msgid "Public key authentication"
-msgstr "పబ్లిక్ కీ ప్రమాణీకరణ "
-
-#: ../libpurple/protocols/silc/silc.c:1955
-#: ../libpurple/protocols/silc10/silc.c:1894
-msgid "Block IMs without Key Exchange"
-msgstr "కీ ఎక్స్‌చేంజ్ లేకుండా IMs కు అవరోధం. "
-
-#: ../libpurple/protocols/silc/silc.c:1958
-#: ../libpurple/protocols/silc10/silc.c:1897
-msgid "Block messages to whiteboard"
-msgstr ""
-
-#: ../libpurple/protocols/silc/silc.c:1961
-#: ../libpurple/protocols/silc10/silc.c:1900
-#, fuzzy
-msgid "Automatically open whiteboard"
-msgstr "_పరిచయాలను ఆటోమేటిక్‌గా ఎక్‌స్పాండ్ చేయుము."
-
-#: ../libpurple/protocols/silc/silc.c:1964
-#: ../libpurple/protocols/silc10/silc.c:1903
-#, fuzzy
-msgid "Digitally sign and verify all messages"
-msgstr "అన్ని IM సందేశాలపై డిజిటల్‌గా సైన్‌ చేయండి."
-
-#: ../libpurple/protocols/silc/util.c:207
-#: ../libpurple/protocols/silc/util.c:249
-#: ../libpurple/protocols/silc10/util.c:207
-#: ../libpurple/protocols/silc10/util.c:247
-msgid "Creating SILC key pair..."
-msgstr "SILC కీ జంటను సృష్టించండి ..."
-
-#: ../libpurple/protocols/silc/util.c:215
-#: ../libpurple/protocols/silc/util.c:257
-#, fuzzy
-msgid "Cannot create SILC key pair\n"
-msgstr "SILC కీ జంటను సృష్టించండి ..."
-
-#. Hint for translators: Please check the tabulator width here and in
-#. the next strings (short strings: 2 tabs, longer strings 1 tab,
-#. sum: 3 tabs or 24 characters)
-#: ../libpurple/protocols/silc/util.c:358
-#: ../libpurple/protocols/silc10/util.c:355
-#, c-format
-msgid "Real Name: \t%s\n"
-msgstr "అసలు పేరు: \t%s\n"
-
-#: ../libpurple/protocols/silc/util.c:360
-#: ../libpurple/protocols/silc10/util.c:357
-#, c-format
-msgid "User Name: \t%s\n"
-msgstr "వినియోగదారుని పేరు: \t%s\n"
-
-#: ../libpurple/protocols/silc/util.c:362
-#: ../libpurple/protocols/silc10/util.c:359
-#, fuzzy, c-format
-msgid "E-Mail: \t\t%s\n"
-msgstr "ఇ-మెయిల్: \t\t%s\n"
-
-#: ../libpurple/protocols/silc/util.c:364
-#: ../libpurple/protocols/silc10/util.c:361
-#, c-format
-msgid "Host Name: \t%s\n"
-msgstr "హోస్ట్ పేరు: \t%s\n"
-
-#: ../libpurple/protocols/silc/util.c:366
-#: ../libpurple/protocols/silc10/util.c:363
-#, c-format
-msgid "Organization: \t%s\n"
-msgstr "సంస్థ: \t%s\n"
-
-#: ../libpurple/protocols/silc/util.c:368
-#: ../libpurple/protocols/silc10/util.c:365
-#, c-format
-msgid "Country: \t%s\n"
-msgstr "దేశం: \t%s\n"
-
-#: ../libpurple/protocols/silc/util.c:369
-#: ../libpurple/protocols/silc10/util.c:366
-#, c-format
-msgid "Algorithm: \t%s\n"
-msgstr "అల్గారిథమ్ : \t%s\n"
-
-#: ../libpurple/protocols/silc/util.c:370
-#: ../libpurple/protocols/silc10/util.c:367
-#, fuzzy, c-format
-msgid "Key Length: \t%d bits\n"
-msgstr "తాళం పొడవు: \t%d बिट\n"
-
-#: ../libpurple/protocols/silc/util.c:372
-#, fuzzy, c-format
-msgid "Version: \t%s\n"
-msgstr "సంస్థ: \t%s\n"
-
-#: ../libpurple/protocols/silc/util.c:374
-#: ../libpurple/protocols/silc10/util.c:369
-#, c-format
-msgid ""
-"Public Key Fingerprint:\n"
-"%s\n"
-"\n"
-msgstr ""
-"పబ్లిక్ కీ వ్రేలిముద్ర:\n"
-"%s\n"
-"\n"
-
-#: ../libpurple/protocols/silc/util.c:375
-#: ../libpurple/protocols/silc10/util.c:370
-#, c-format
-msgid ""
-"Public Key Babbleprint:\n"
-"%s"
-msgstr ""
-"పబ్లిక్ కీ బాబిల్‌ప్రింట్:\n"
-"%s"
-
-#: ../libpurple/protocols/silc/util.c:379
-#: ../libpurple/protocols/silc/util.c:380
-#: ../libpurple/protocols/silc10/util.c:374
-#: ../libpurple/protocols/silc10/util.c:375
-msgid "Public Key Information"
-msgstr "పబ్లిక్ కీ సమాచారం "
-
-#: ../libpurple/protocols/silc/util.c:559
-#: ../libpurple/protocols/silc10/util.c:555
-msgid "Paging"
-msgstr "పేజింగ్ "
-
-#: ../libpurple/protocols/silc/util.c:565
-#: ../libpurple/protocols/silc10/util.c:561
-msgid "Video Conferencing"
-msgstr "వీడియో సమావేశం"
-
-#: ../libpurple/protocols/silc/util.c:583
-#: ../libpurple/protocols/silc10/util.c:579
-msgid "Computer"
-msgstr "కంప్యూటర్ "
-
-#: ../libpurple/protocols/silc/util.c:587
-#: ../libpurple/protocols/silc10/util.c:583
-msgid "PDA"
-msgstr "PDA"
-
-#: ../libpurple/protocols/silc/util.c:589
-#: ../libpurple/protocols/silc10/util.c:585
-msgid "Terminal"
-msgstr "టెర్మినల్ "
-
-#: ../libpurple/protocols/silc/wb.c:284 ../libpurple/protocols/silc10/wb.c:284
-#, c-format
-msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
-msgstr ""
-
-#: ../libpurple/protocols/silc/wb.c:288 ../libpurple/protocols/silc10/wb.c:288
-#, c-format
-msgid ""
-"%s sent message to whiteboard on %s channel. Would you like to open the "
-"whiteboard?"
-msgstr ""
-
-#: ../libpurple/protocols/silc/wb.c:302 ../libpurple/protocols/silc10/wb.c:302
-msgid "Whiteboard"
-msgstr ""
-
-#: ../libpurple/protocols/silc10/ops.c:1559
-msgid "No server statistics available"
-msgstr "సెర్వర్ స్టాటిస్టిక్స్ లభ్యమగుటలేదు."
-
-#: ../libpurple/protocols/silc10/ops.c:1931
-#, c-format
-msgid "Failure: Version mismatch, upgrade your client"
-msgstr "వైఫల్యం: వెర్షన్ మిస్‌మాచ్, మీ ఖాతాదారుని అప్‌గ్రేడ్ చేయండి."
-
-#: ../libpurple/protocols/silc10/ops.c:1934
-#, c-format
-msgid "Failure: Remote does not trust/support your public key"
-msgstr "వైఫల్యం: రిమోట్ నమ్మడం లేదు/ పబ్లిక్ కీని సపోర్టు చేయండి."
-
-#: ../libpurple/protocols/silc10/ops.c:1937
-#, c-format
-msgid "Failure: Remote does not support proposed KE group"
-msgstr "వైఫల్యం: ప్రతిపాదించిన KE groupను రిమోట్ సపోర్టు చేయుటలేదు."
-
-#: ../libpurple/protocols/silc10/ops.c:1940
-#, c-format
-msgid "Failure: Remote does not support proposed cipher"
-msgstr "వైఫల్యం: ప్రతిపాదించిన సైఫర్‌కు రిమోట్ సమర్థన లేదు."
-
-#: ../libpurple/protocols/silc10/ops.c:1943
-#, c-format
-msgid "Failure: Remote does not support proposed PKCS"
-msgstr "వైఫల్యం: ప్రతిపాదించిన PKCSకు రిమోట్ సమర్థన లేదు."
-
-#: ../libpurple/protocols/silc10/ops.c:1946
-#, c-format
-msgid "Failure: Remote does not support proposed hash function"
-msgstr "వైఫల్యం: ప్రతిపాదించిన హాష్ వాడకానికి రిమోట్ సమర్థన లేదు. "
-
-#: ../libpurple/protocols/silc10/ops.c:1949
-#, c-format
-msgid "Failure: Remote does not support proposed HMAC"
-msgstr "వైఫల్యం: ప్రతిపాదించిన HMAC వాడకానికి రిమోట్ సమర్థన లేదు. "
-
-#: ../libpurple/protocols/silc10/ops.c:1951
-#, c-format
-msgid "Failure: Incorrect signature"
-msgstr "వైఫల్యం: తప్పు సంతకం "
-
-#: ../libpurple/protocols/silc10/ops.c:1953
-#, c-format
-msgid "Failure: Invalid cookie"
-msgstr "వైఫల్యం: పనికిరాని కుకీ "
-
-#: ../libpurple/protocols/silc10/ops.c:1964
-#, c-format
-msgid "Failure: Authentication failed"
-msgstr "వైఫల్యం: ప్రమాణీకరణ వైఫల్యం "
-
-#: ../libpurple/protocols/silc10/silc.c:182
-msgid "Cannot initialize SILC Client connection"
-msgstr "SILC ఖాతాదారుల కనెక్షన్ ప్రారంభించడం సాధ్యం కాదు."
-
-#: ../libpurple/protocols/silc10/silc.c:290
-#, fuzzy
-msgid "John Noname"
-msgstr "చివరి పేరు:"
-
-#: ../libpurple/protocols/silc10/silc.c:320
-#, fuzzy
-msgid "Cannot find/access ~/.silc directory"
-msgstr "డైరెక్టరీని పంపలేదు."
-
-#: ../libpurple/protocols/silc10/silc.c:334
-#, fuzzy, c-format
-msgid "Could not load SILC key pair: %s"
-msgstr "పబ్లిక్ కీని లోడ్ చేయుట సాధ్యమగుటలేదు. "
-
-#. TODO: do we really want to disconnect on a failure to write?
-#: ../libpurple/protocols/simple/simple.c:416
-#, fuzzy
-msgid "Could not write"
-msgstr "పంపలేకపోయింది."
-
-#: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1529
-msgid "Could not connect"
-msgstr "కనెక్ట్ చేయడం సాధ్యంమగుట లేదు. "
-
-# #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
-# gnome-session/gsm-client-row.c:43
-# #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
-# gnome-session/gsm-client-row.c:43
-#: ../libpurple/protocols/simple/simple.c:1059
-#, fuzzy
-msgid "Unknown server response."
-msgstr "అజ్ఞాత తప్పు."
-
-#: ../libpurple/protocols/simple/simple.c:1563
-#: ../libpurple/protocols/simple/simple.c:1605
-#: ../libpurple/protocols/simple/simple.c:1618
-#: ../libpurple/protocols/simple/simple.c:1669
-#, fuzzy
-msgid "Could not create listen socket"
-msgstr "సాకెట్‌ను సృష్టించలేదు. "
-
-#: ../libpurple/protocols/simple/simple.c:1586
-#, fuzzy
-msgid "Couldn't resolve host"
-msgstr "హోస్ట్‌కు కనెక్ట్ చేయలేదు."
-
-#: ../libpurple/protocols/simple/simple.c:1677
-#, fuzzy
-msgid "Could not resolve hostname"
-msgstr "హోస్ట్‌పేరును వెదకలేని స్థితి."
-
-#: ../libpurple/protocols/simple/simple.c:1694
-#, fuzzy
-msgid "SIP screen names may not contain whitespaces or @ symbols"
-msgstr "IRC ఉపనామములలో తెల్లకాళీ లేదు."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#: ../libpurple/protocols/simple/simple.c:1870
-#, fuzzy
+#: ../libpurple/protocols/simple/simple.c:2057
 msgid "SIP/SIMPLE Protocol Plugin"
-msgstr "SILC Protocol Plugin"
+msgstr "SIP/SIMPLE ప్రొటోకాల్ ప్లగ్ ఇన్"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1871
-#, fuzzy
+#: ../libpurple/protocols/simple/simple.c:2058
 msgid "The SIP/SIMPLE Protocol Plugin"
-msgstr "SILC Protocol Plugin"
-
-#: ../libpurple/protocols/simple/simple.c:1899
+msgstr "SIP/SIMPLE ప్రొటోకాల్ ప్లగ్ ఇన్"
+
+#: ../libpurple/protocols/simple/simple.c:2086
 msgid "Publish status (note: everyone may watch you)"
-msgstr ""
-
-#: ../libpurple/protocols/simple/simple.c:1905
-#, fuzzy
+msgstr "స్థాయిని ప్రచురించు (గమనిక: అందరూ మిమ్మల్ని గమనించవచ్చు)"
+
+#: ../libpurple/protocols/simple/simple.c:2092
 msgid "Use UDP"
-msgstr "వినియోగదారుని ID"
-
-#: ../libpurple/protocols/simple/simple.c:1907
-#, fuzzy
+msgstr "UDP ని ఉపయోగించు"
+
+#: ../libpurple/protocols/simple/simple.c:2094
 msgid "Use proxy"
-msgstr "ప్రాక్సీ లేదు "
-
-#: ../libpurple/protocols/simple/simple.c:1909
-#, fuzzy
+msgstr "ప్రాక్సీని ఉపయోగించు"
+
+#: ../libpurple/protocols/simple/simple.c:2096
 msgid "Proxy"
-msgstr "ప్రాక్సీ లేదు "
-
-#: ../libpurple/protocols/simple/simple.c:1911
-#, fuzzy
+msgstr "ప్రాక్సీ"
+
+#: ../libpurple/protocols/simple/simple.c:2098
 msgid "Auth User"
-msgstr "AP వినియోగదారుడు "
-
-#: ../libpurple/protocols/simple/simple.c:1913
-#, fuzzy
+msgstr "ప్రమాణీకరణ పొందిన వినియోగదారు"
+
+#: ../libpurple/protocols/simple/simple.c:2100
 msgid "Auth Domain"
-msgstr "ఆటోమేటిక్ "
+msgstr "ప్రమాణీకరణ పొందిన డొమైన్"
 
 #: ../libpurple/protocols/toc/toc.c:139
 #, c-format
 msgid "Looking up %s"
-msgstr "%s ను చూస్తున్నది "
+msgstr "%s కోసం చూస్తున్నది "
 
 #: ../libpurple/protocols/toc/toc.c:148
 #, c-format
@@ -12869,32 +13032,31 @@
 #: ../libpurple/protocols/toc/toc.c:488
 #, c-format
 msgid "Unable to write file %s."
-msgstr "%s ఫైలును వ్రాయడంలో అసమర్థత. "
+msgstr "%s ఫైలును రైట్ చేయలేకపోతోంది."
 
 #: ../libpurple/protocols/toc/toc.c:491
 #, c-format
 msgid "Unable to read file %s."
-msgstr "%s ఫైలును చదవడంలో అసమర్థత."
+msgstr "%s ఫైలును రీడ్ చేయలేకపోతోంది."
 
 #: ../libpurple/protocols/toc/toc.c:494
 #, c-format
 msgid "Message too long, last %s bytes truncated."
-msgstr "సందేశం చాలా పొడవుగా ఉంది, చివరి %s బైట్స్ ఉత్తరించబడినవి. "
+msgstr "సందేశం చాలా పొడవుగా ఉంది, చివరి %s బైట్స్ కుదించబడ్డాయి. "
 
 #: ../libpurple/protocols/toc/toc.c:497
 #, c-format
 msgid "%s not currently logged in."
-msgstr "%s వర్తమానంలో లాగ్ ఇన్ చేయలేదు."
+msgstr "%s ప్రస్తుతం లాగ్ ఇన్ కాలేదు."
 
 #: ../libpurple/protocols/toc/toc.c:500
 #, c-format
 msgid "Warning of %s not allowed."
-msgstr "%s ను హెచ్చరించుటకు అనుమతి లేదు."
+msgstr "%s చేసిన హెచ్చరికకు అనుమతిలేదు."
 
 #: ../libpurple/protocols/toc/toc.c:503
-#, c-format
 msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "ఒక సందేశాన్ని వదిలివేయడమైనది. మీ సెర్వర్ స్పీడ్ లిమిట్‌ను దాటినారు. "
+msgstr "ఒక సందేశాన్ని వదిలివేయడమైనది. మీ సర్వర్ వేగపరిమితిని దాటింది."
 
 #: ../libpurple/protocols/toc/toc.c:506
 #, c-format
@@ -12909,86 +13071,69 @@
 #: ../libpurple/protocols/toc/toc.c:512
 #, c-format
 msgid "You missed an IM from %s because it was too big."
-msgstr "మీరు  ఒక  IMను %s నుండి మిస్ అయినారు, ఎందుకంటే అది చాలా పెద్దది. "
+msgstr "మీరు  ఒక  IMను %s నుంచి మిస్ అయినారు, ఎందుకంటే అది చాలా పెద్దది. "
 
 #: ../libpurple/protocols/toc/toc.c:515
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
-msgstr "మీరు  ఒక  IMను %s నుండి మిస్ అయినారు, ఎందుకంటే అది మహావేగంతో పంపబడింది."
+msgstr "మీరు  ఒక  IMను %s నుంచి మిస్ అయినారు, ఎందుకంటే అది అతివేగంతో పంపబడింది."
 
 #: ../libpurple/protocols/toc/toc.c:518
-#, c-format
 msgid "Failure."
-msgstr "వైఫల్యం"
+msgstr "వైఫల్యం."
 
 #: ../libpurple/protocols/toc/toc.c:521
-#, c-format
 msgid "Too many matches."
-msgstr "చాలా మాచ్‌లున్నాయి. "
+msgstr "సరిపోలేవి అనేకం ఉన్నాయి."
 
 #: ../libpurple/protocols/toc/toc.c:524
-#, c-format
 msgid "Need more qualifiers."
-msgstr "ఇంకా ఎక్కువ క్వాలిఫైయర్స్ కావాలి."
+msgstr "మరిన్ని క్వాలిఫైయర్స్ కావాలి."
 
 #: ../libpurple/protocols/toc/toc.c:527
-#, c-format
 msgid "Dir service temporarily unavailable."
-msgstr "డైరెక్టరీ సేవ తాత్కాలికంగా అలభ్యం. "
+msgstr "డైరెక్టరీ సేవ తాత్కాలికంగా అందుబాటులో లేదు."
 
 #: ../libpurple/protocols/toc/toc.c:530
-#, c-format
 msgid "E-mail lookup restricted."
-msgstr "ఇ-మెయిల్‌ను చూడడం నియంత్రించబడింది. "
+msgstr "ఇ-మెయిల్‌ను చూడటంపై ఆంక్షలు."
 
 #: ../libpurple/protocols/toc/toc.c:533
-#, c-format
 msgid "Keyword ignored."
-msgstr "కీవర్డ్ అపేక్షించబడింది."
+msgstr "కీవర్డ్ విస్మరించబడింది."
 
 #: ../libpurple/protocols/toc/toc.c:536
-#, c-format
 msgid "No keywords."
 msgstr "కీవర్డ్స్ లేవు. "
 
 #: ../libpurple/protocols/toc/toc.c:539
-#, c-format
 msgid "User has no directory information."
 msgstr "వినియోగాదారునికి డైరెక్టరీ సమాచారం లేదు. "
 
 #: ../libpurple/protocols/toc/toc.c:543
-#, c-format
 msgid "Country not supported."
 msgstr "దేశానికి సపోర్టు లేదు. "
 
 #: ../libpurple/protocols/toc/toc.c:546
 #, c-format
 msgid "Failure unknown: %s."
-msgstr "వైఫల్యం తెలియదు: %s."
+msgstr "తెలియని వైఫల్యం: %s."
 
 #: ../libpurple/protocols/toc/toc.c:549
-#, fuzzy, c-format
 msgid "Incorrect screen name or password."
-msgstr "ఉపనామం లేక పాస్‌వర్డ్ తప్పు. "
+msgstr "స్క్రీన్ పేరు లేదా  పాస్‌వర్డ్ తప్పు. "
 
 #: ../libpurple/protocols/toc/toc.c:552
-#, c-format
 msgid "The service is temporarily unavailable."
-msgstr "సర్వీస్ తాత్కాలికంగా అలభ్యం. "
+msgstr "సర్వీస్ తాత్కాలికంగా అందుబాటులే లేదు. "
 
 #: ../libpurple/protocols/toc/toc.c:555
-#, c-format
 msgid "Your warning level is currently too high to log in."
-msgstr "లాగిన్ చేయడానికి మీ వార్నింగ్ లెవల్ చాలా ఉన్నతంగా ఉంది. "
+msgstr "లాగిన్ చేయడానికి మీ వార్నింగ్ లెవల్ చాలా ఎక్కువగా ఉంది. "
 
 #: ../libpurple/protocols/toc/toc.c:558
-#, c-format
-msgid ""
-"You have been connecting and disconnecting too frequently.  Wait ten minutes "
-"and try again.  If you continue to try, you will need to wait even longer."
-msgstr ""
-"మీరు చాలా తరచుగా కనెక్ట్ చేస్తున్నారు, డిస్‌కనెక్ట్ చేస్తున్నారు. పది నిమిషాలు వేచి చూసి మరల ప్రయత్నించండి. "
-"మీరు ఇలాగే ప్రయత్నిస్తుంటే ఇంకా ఎక్కువ సమయం నిరీక్షించవలసియుంటుంది. "
+msgid "You have been connecting and disconnecting too frequently.  Wait ten minutes and try again.  If you continue to try, you will need to wait even longer."
+msgstr "మీరు చాలా తరచుగా కనెక్ట్ చేస్తున్నారు, డిస్‌కనెక్ట్ చేస్తున్నారు. పది నిమిషాలు వేచి చూసి మరల ప్రయత్నించండి. మీరు ఇలాగే ప్రయత్నిస్తుంటే ఇంకా ఎక్కువ సమయం నిరీక్షించాల్సివస్తుంది. "
 
 #: ../libpurple/protocols/toc/toc.c:560
 #, c-format
@@ -13001,13 +13146,12 @@
 msgstr "అజ్ఞాత పొరపాటు, %d , సంభవించింది. సమాచారం: %s"
 
 #: ../libpurple/protocols/toc/toc.c:590
-#, fuzzy
 msgid "Invalid Groupname"
-msgstr "పనికిరాని గ్రూప్ "
+msgstr "చెల్లుబాటుకాని గ్రూప్ పేరు"
 
 #: ../libpurple/protocols/toc/toc.c:674
 msgid "Connection Closed"
-msgstr "కనెక్షన్ క్లోజ్ అయినది."
+msgstr "కనెక్షన్ ముగిసింది"
 
 #: ../libpurple/protocols/toc/toc.c:714
 msgid "Waiting for reply..."
@@ -13015,20 +13159,21 @@
 
 #: ../libpurple/protocols/toc/toc.c:792
 msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "ఆగిన TOC మరల వెనక్కు వచ్చినది. మీరు మరల సందేశాలను పంపవచ్చును."
+msgstr "ఆగిన TOC మరల వెనక్కు వచ్చినది. మీరు మళ్ళీ సందేశాలను పంపవచ్చును."
 
 #: ../libpurple/protocols/toc/toc.c:995
 msgid "Password Change Successful"
-msgstr "పాస్‌వర్డ్‌ మార్పు విజయవంతమైనది."
-
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5582
-#: ../pidgin/gtkblist.c:5932
+msgstr "విజయవంతంగా పాస్‌వర్డ్‌ మార్పు"
+
+#: ../libpurple/protocols/toc/toc.c:1366
+#: ../pidgin/gtkblist.c:6270
+#: ../pidgin/gtkblist.c:6628
 msgid "_Group:"
 msgstr "_గ్రూప్:"
 
 #: ../libpurple/protocols/toc/toc.c:1535
 msgid "Get Dir Info"
-msgstr "డైరెక్టరీ సమాచారాన్ని తీసుకురండి. "
+msgstr "డైరెక్టరీ సమాచారాన్ని పొందండి"
 
 #: ../libpurple/protocols/toc/toc.c:1675
 msgid "Set Dir Info"
@@ -13043,8 +13188,10 @@
 msgid "File transfer failed; other side probably canceled."
 msgstr "ఫైల్ ట్రాన్స్‌ఫర్ వైఫల్యం; బహుశా రెండవవైపు రద్దయి ఉంటుంది. "
 
-#: ../libpurple/protocols/toc/toc.c:1878 ../libpurple/protocols/toc/toc.c:1918
-#: ../libpurple/protocols/toc/toc.c:2042 ../libpurple/protocols/toc/toc.c:2130
+#: ../libpurple/protocols/toc/toc.c:1878
+#: ../libpurple/protocols/toc/toc.c:1918
+#: ../libpurple/protocols/toc/toc.c:2042
+#: ../libpurple/protocols/toc/toc.c:2130
 msgid "Could not connect for transfer."
 msgstr "ట్రాన్స్‌ఫర్ కోసం కనెక్ట్ చేయడం సాధ్యం కాలేదు. "
 
@@ -13053,9 +13200,8 @@
 msgstr "ఫైల్ శీర్షికను వ్రాయడం సాధ్యం కాలేదు. ఫైల్‌ ట్రాన్స్‌ఫర్ చేయబడదు."
 
 #: ../libpurple/protocols/toc/toc.c:2175
-#, fuzzy
 msgid "Save As..."
-msgstr "పేరుతో ఐకన్‌ను సేవ్ చేయుము..."
+msgstr "ఇలా సేవ్ చేయండి..."
 
 #: ../libpurple/protocols/toc/toc.c:2209
 #, c-format
@@ -13069,6 +13215,16 @@
 msgid "%s requests you to send them a file"
 msgstr "ఫైల్ పంపవలసిందిగా %s మిమ్మల్ని అభ్యర్థిస్తున్నారు."
 
+# *< type
+# *< ui_requirement
+# *< flags
+# *< dependencies
+# *< priority
+# *< id
+# *< name
+# *< version
+# *  summary
+# *  description
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -13079,248 +13235,228 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/toc/toc.c:2306 ../libpurple/protocols/toc/toc.c:2308
+#: ../libpurple/protocols/toc/toc.c:2306
+#: ../libpurple/protocols/toc/toc.c:2308
 msgid "TOC Protocol Plugin"
-msgstr "TOC Protocol Plugin"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:782
+msgstr "TOC ప్రొటోకాల్ ప్లగ్ ఇన్"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:784
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo.c:838
+#: ../libpurple/protocols/yahoo/yahoo.c:840
 msgid "Your Yahoo! message did not get sent."
-msgstr "మీ Yahoo! సందేశాన్ని పంపుట సాధ్యం కాలేదు. "
-
-#: ../libpurple/protocols/yahoo/yahoo.c:960
+msgstr "మీ Yahoo! సందేశాన్ని పంపటం సాధ్యం కాలేదు. "
+
+#: ../libpurple/protocols/yahoo/yahoo.c:962
 #, c-format
 msgid "Yahoo! system message for %s:"
-msgstr "%s కోసం యాహూ సందేశం."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1029
-#, fuzzy
+msgstr "%s కోసం యాహూ! సిస్టం సందేశం."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1031
 msgid "Authorization denied message:"
-msgstr "ఆథరైజేషన్ నిరాకరణ సందేశం:"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1047
-#, c-format
-msgid ""
-"%s has (retroactively) denied your request to add them to your list for the "
-"following reason: %s."
-msgstr ""
-"%s తమను మీ లిస్టులో చేర్చడానికిగాను మీరు చేసిన మనవిని ఈ క్రింది కారణాల ననుసరించి (retroactively) "
-"త్రోసిపుచ్చారు: %s."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1050
+msgstr "సందేశాన్ని  నిరాకరించిన ఆథరైజేషన్:"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1049
+#, c-format
+msgid "%s has (retroactively) denied your request to add them to your list for the following reason: %s."
+msgstr "తమను మీ లిస్టులో చేర్చడానికి మీరు చేసిన మనవిని (retroactively) %s తోసిపుచ్చిన కారణం: %s."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1052
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
-msgstr "%s తమను మీ లిస్టులో చేర్చడానికిగాను మీరు చేసిన మనవిని (retroactively) త్రోసిపుచ్చారు."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1052
+msgstr "తమను మీ లిస్టులో చేర్చడానికి మీరు చేసిన మనవిని (retroactively) %s తోసిపుచ్చారు."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1054
 msgid "Add buddy rejected"
-msgstr "మిత్రుని పేరును చేర్చడం నిరాకరించబడింది. "
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1994
-#, fuzzy, c-format
-msgid ""
-"The Yahoo server has requested the use of an unrecognized authentication "
-"method.  You will probably not be able to successfully sign on to Yahoo.  "
-"Check %s for updates."
-msgstr ""
-"యాహూ సెర్వర్ అజ్ఞాత ప్రమాణీకరణ విధానాన్ని సూచించింది. ఈ గెయిమ్ వెర్షన్ యాహూపై సైన్ చేయడం సాధ్యం కాదు.  "
-"అప్‌డేట్స్ కోసం %s చేయండి. "
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1997
+msgstr "మిత్రుణ్ని చేర్చుకోవడానికి నిరాకరణ"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1996
+#, c-format
+msgid "The Yahoo server has requested the use of an unrecognized authentication method.  You will probably not be able to successfully sign on to Yahoo.  Check %s for updates."
+msgstr "గుర్తింపులేని ప్రమాణీకరణ విధానాన్ని ఉపయోగించాలని యాహూ సర్వర్ కోరింది. యాహూపై సైన్ చేయడం సాధ్యంకాకపోవచ్చు. అప్‌డేట్స్ కోసం %s చూడండి. "
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1999
 msgid "Failed Yahoo! Authentication"
 msgstr "యూహూ! ప్రమాణీకరణ వైఫల్యం."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2063
-#, c-format
-msgid ""
-"You have tried to ignore %s, but the user is on your buddy list.  Clicking "
-"\"Yes\" will remove and ignore the buddy."
-msgstr ""
-"మీరు %s ను అపేక్షించాలని ప్రయత్నించారు, కాని వినియోగదారుడు మీ లిస్టులో ఉన్నాడు. \"Yes\" క్లిక్ చేస్తే "
-"మీకు మిత్రుని బెడద ఉండదు.  "
-
-#: ../libpurple/protocols/yahoo/yahoo.c:2066
+#: ../libpurple/protocols/yahoo/yahoo.c:2065
+#, c-format
+msgid "You have tried to ignore %s, but the user is on your buddy list.  Clicking \"Yes\" will remove and ignore the buddy."
+msgstr "మీరు %s ను విస్మరించాలని ప్రయత్నించారు, కానీ వినియోగదారు మీ మిత్రుల జాబితాలో ఉన్నారు. \"Yes\" క్లిక్ చేస్తే మిత్రుడు తొలగిపోతాడు."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2068
 msgid "Ignore buddy?"
-msgstr "మిత్రుని అపేక్షిస్తారా?"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:2129
+msgstr "మిత్రుని విస్మరిస్తారా?"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2133
 msgid "Your account is locked, please log in to the Yahoo! website."
-msgstr "మీ ఎకౌంట్ లాక్ అయినది. దయచేసి యాహూ వెబ్‌సైట్‌లో లాగ్‌ఇన్ చేయండి. "
-
-#: ../libpurple/protocols/yahoo/yahoo.c:2132
+msgstr "మీ అకౌంట్ లాక్ అయినది. దయచేసి యాహూ! వెబ్‌సైట్‌లో లాగ్‌ఇన్ చేయండి. "
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2136
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
-msgstr "అజ్ఞాత పొరపాటు సంఖ్య %d. యాహూ లోకి లాగ్-ఇన్ అవుతోంది. దీనిని వెబ్‌సైట్ సరిచేయగలదు."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:2186
+msgstr "అజ్ఞాత పొరపాటు సంఖ్య %d. యాహూ! లోకి లాగ్-ఇన్ అవుతోంది. దీనిని వెబ్‌సైట్ సరిచేయవచ్చు."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2189
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
-msgstr "Could not add buddy %s to group %s to the server list on account %s."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:2189
+msgstr "%s అకౌంట్ లోని సర్వర్ జాబితాకు %s మిత్రుణ్ని %s గ్రూపునకు చేర్చలేకపోయింది."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2192
 msgid "Could not add buddy to server list"
-msgstr "సెర్వర్ లిస్టులో మిత్రునిపేరు చేర్చడం సాధ్యం కాదు. "
-
-#: ../libpurple/protocols/yahoo/yahoo.c:2308
+msgstr "సర్వర్ జాబితాకు మిత్రుణ్ని చేర్చడం సాధ్యంకాలేదు. "
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2311
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:2651
-#, fuzzy
+msgstr "[ వినదగిన %s/%s/%s.swf ] %s"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2657
 msgid "Received unexpected HTTP response from server."
-msgstr "సెర్వర్‌నుండి విలువలేని బాధ్యత."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:2675
-#: ../libpurple/protocols/yahoo/yahoo.c:2861
-#: ../libpurple/protocols/yahoo/yahoo.c:2964
+msgstr "సర్వర్ నుంచి ఊహించని HTTP ప్రతిస్పందన అందింది."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2682
+#: ../libpurple/protocols/yahoo/yahoo.c:2870
 #: ../libpurple/protocols/yahoo/yahoo.c:2974
+#: ../libpurple/protocols/yahoo/yahoo.c:2985
 #: ../libpurple/protocols/yahoo/yahoochat.c:1514
 #: ../libpurple/protocols/yahoo/yahoochat.c:1584
-#: ../libpurple/protocols/yahoo/ycht.c:585
+#: ../libpurple/protocols/yahoo/ycht.c:586
 msgid "Connection problem"
 msgstr "కనెక్షన్ సమస్య"
 
-#  Conversations
-#: ../libpurple/protocols/yahoo/yahoo.c:2701
-#, fuzzy, c-format
+#: ../libpurple/protocols/yahoo/yahoo.c:2708
+#, c-format
 msgid ""
 "Lost connection with %s:\n"
 "%s"
-msgstr "%s తో సంభాషణలు "
-
-#: ../libpurple/protocols/yahoo/yahoo.c:2726
+msgstr ""
+"సర్వర్ తో కనెక్షన్ పోయింది:\n"
+"%s"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2733
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
 "%s"
 msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3081
-#: ../libpurple/protocols/yahoo/yahoo.c:3767
-#, fuzzy
+"సర్వర్ తో కనెక్షన్ సాధ్యపడలేదు: \n"
+"%s"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3092
+#: ../libpurple/protocols/yahoo/yahoo.c:3778
 msgid "Not at Home"
-msgstr "ఇంట్లో లేరు."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3083
-#: ../libpurple/protocols/yahoo/yahoo.c:3770
-#, fuzzy
+msgstr "ఇంట్లో లేరు"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3094
+#: ../libpurple/protocols/yahoo/yahoo.c:3781
 msgid "Not at Desk"
-msgstr "డెస్క్‌మీద లేదు. "
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3085
-#: ../libpurple/protocols/yahoo/yahoo.c:3773
-#, fuzzy
+msgstr "డెస్క్‌లో లేరు "
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3096
+#: ../libpurple/protocols/yahoo/yahoo.c:3784
 msgid "Not in Office"
-msgstr "ఆఫీసులో లేరు."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3089
-#: ../libpurple/protocols/yahoo/yahoo.c:3779
+msgstr "ఆఫీసులో లేరు"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3100
+#: ../libpurple/protocols/yahoo/yahoo.c:3790
 msgid "On Vacation"
-msgstr "సెలవులో ఉన్నారు. "
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3093
-#: ../libpurple/protocols/yahoo/yahoo.c:3785
+msgstr "సెలవులో ఉన్నారు"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3104
+#: ../libpurple/protocols/yahoo/yahoo.c:3796
 msgid "Stepped Out"
-msgstr "బయటకు వెళ్లినారు. "
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3186
-#: ../libpurple/protocols/yahoo/yahoo.c:3216
+msgstr "బయటకు వెళ్లారు"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3197
+#: ../libpurple/protocols/yahoo/yahoo.c:3227
 msgid "Not on server list"
-msgstr "సెర్వర్ లిస్టులో లేరు."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3233
-#: ../libpurple/protocols/yahoo/yahoo.c:3291
-#, fuzzy
+msgstr "సర్వర్ జాబితాలో లేరు"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3244
+#: ../libpurple/protocols/yahoo/yahoo.c:3302
 msgid "Appear Online"
-msgstr "ఆఫ్‌లైన్ "
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3236
-#: ../libpurple/protocols/yahoo/yahoo.c:3312
-#, fuzzy
+msgstr "ఆన్ లైన్ లో ఉన్నట్టు చూపండి "
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3247
+#: ../libpurple/protocols/yahoo/yahoo.c:3323
 msgid "Appear Permanently Offline"
-msgstr "ఆఫ్‌లైన్ "
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3254
-#, fuzzy
+msgstr "శాశ్వతంగా ఆఫ్ లైన్ గా కనిపించు"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3265
 msgid "Presence"
-msgstr "అభిరుచులు "
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3297
+msgstr "ఉన్నారు"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3308
 msgid "Appear Offline"
-msgstr "ఆఫ్‌లైన్ "
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3306
-#, fuzzy
+msgstr "ఆఫ్‌లైన్ లో ఉన్నట్టు చూపండి"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3317
 msgid "Don't Appear Permanently Offline"
-msgstr "ఆఫ్‌లైన్ "
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3354
+msgstr "శాశ్వతంగా ఆఫ్ లైన్ గా కనిపించవద్దు"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3365
 msgid "Join in Chat"
-msgstr "సంభాషణలో చేరినారు "
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3360
+msgstr "సంభాషణలో చేరు"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3371
 msgid "Initiate Conference"
-msgstr "సమావేశాన్ని ప్రారంభించారు."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3388
-#, fuzzy
+msgstr "సమావేశాన్ని ప్రారంభించు"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3399
 msgid "Presence Settings"
-msgstr "ఎన్వైరాన్‌మెంటల్ సెట్టింగ్స్‌ను ఉపయోగించుము. "
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3394
+msgstr "ఉన్నారో లేదో తెలిపే సెట్టింగ్ లు"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3405
 msgid "Start Doodling"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3495
+msgstr "డూడ్లింగ్ ప్రారంభించు"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3506
 #, fuzzy
 msgid "Activate which ID?"
-msgstr "ఏ  IDని యాక్టివ్ చేద్దాం?"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3506
-msgid "Join whom in chat?"
-msgstr "ఎవరితో మాట్లాడుదాం ?"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3518
+msgstr "ఏ IDని యాక్టివ్ చేయాలి?"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3517
+msgid "Join who in chat?"
+msgstr "ఎవరితో చాట్ చేయాలి?"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3529
 msgid "Activate ID..."
-msgstr "IDని యాక్టివేట్ చేద్దాం..."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3522
-#, fuzzy
+msgstr "IDని యాక్టివేట్ చేయండి..."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3533
 msgid "Join User in Chat..."
-msgstr "సంభాషణలో వినియోగదారుని చేర్చండి..."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3527
+msgstr "వినియోగదారుతో చాట్ లో చేరండి..."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3538
+#, fuzzy
 msgid "Open Inbox"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4119
-#, fuzzy
-msgid "Buzz"
-msgstr "బజ్!!"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4121
-#, c-format
-msgid "Buzzing %s..."
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4136
+msgstr "హాట్ మెయిల్ ఇన్ బాక్స్ ను తెరవండి."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4147
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join &lt;గది&gt;:  యాహు నెట్‌వర్క్‌లో సంభాషణ గదిలో చేరుదాం."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4141
-#, fuzzy
+#: ../libpurple/protocols/yahoo/yahoo.c:4152
 msgid "list: List rooms on the Yahoo network"
-msgstr "లిస్ట్: ఈ నెట్‌వర్క్‌లో చానల్స్‌ను లిస్టు చేయండి. "
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4149
+msgstr "జాబితా: యాహూ నెట్ వర్క్ లోనున్న రూమ్ ల జాబితా"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4160
 msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
+msgstr "డూడుల్: డూడుల్  సెషన్ ప్రారంభించవలసిందిగా వినియోగదారును అభ్యర్థించు"
+
+# *< type
+# *< ui_requirement
+# *< flags
+# *< dependencies
+# *< priority
+# *< id
+# *< name
+# *< version
+# *  summary
+# *  description
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -13331,72 +13467,65 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4358
-#: ../libpurple/protocols/yahoo/yahoo.c:4360
+#: ../libpurple/protocols/yahoo/yahoo.c:4369
+#: ../libpurple/protocols/yahoo/yahoo.c:4371
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo Protocol Plugin"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4383
+#: ../libpurple/protocols/yahoo/yahoo.c:4394
 msgid "Yahoo Japan"
 msgstr "యూహూ జపాన్ "
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4386
-#, fuzzy
+#: ../libpurple/protocols/yahoo/yahoo.c:4397
 msgid "Pager server"
-msgstr "ప్రాక్సీ సెర్వర్ "
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4389
-#, fuzzy
+msgstr "పేజర్ సర్వర్"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4400
 msgid "Japan Pager server"
-msgstr "జపాన్ పేజర్ హోస్ట్"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4392
+msgstr "జపాన్ పేజర్ సర్వర్"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4403
 msgid "Pager port"
 msgstr "పేజర్ పోర్ట్ "
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4395
-#, fuzzy
+#: ../libpurple/protocols/yahoo/yahoo.c:4406
 msgid "File transfer server"
-msgstr "ఫైల్ ట్రాన్స్‌ఫర్ హోస్ట్"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4398
-#, fuzzy
+msgstr "ఫైల్ బదిలీ సర్వర్"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4409
 msgid "Japan file transfer server"
-msgstr "జపాన్ ఫైల్ ట్రాన్స్‌ఫర్ హోస్ట్"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4401
+msgstr "జపాన్ ఫైల్ బదిలీ సర్వర్"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4412
 msgid "File transfer port"
 msgstr "ఫైల్ ట్రాన్స్‌ఫర్ పోర్ట్"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4404
-#, fuzzy
+#: ../libpurple/protocols/yahoo/yahoo.c:4415
 msgid "Chat room locale"
-msgstr "సంభాషణ గది ప్రదేశం "
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4407
-msgid "Ignore conference and chatroom invitations"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4415
-#, fuzzy
-msgid "Chat room list URL"
-msgstr "సంభాషణ గది List Url"
+msgstr "చాట్ రూమ్ ప్రదేశం "
 
 #: ../libpurple/protocols/yahoo/yahoo.c:4418
+msgid "Ignore conference and chatroom invitations"
+msgstr "చాట్ రూమ్ మరియు గోష్టులను పట్టించుకోవద్దు"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4426
+msgid "Chat room list URL"
+msgstr "చాట్ రూమ్ జాబితా Url"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4429
 msgid "Yahoo Chat server"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4421
-#, fuzzy
+msgstr "యాహూ చాట్ సర్వర్"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4432
 msgid "Yahoo Chat port"
-msgstr "యూహూ జపాన్ "
+msgstr "యాహూ చాట్ పోర్ట్"
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 #: ../libpurple/protocols/yahoo/yahoo_doodle.c:98
 msgid "Sent Doodle request."
-msgstr ""
+msgstr "డూడుల్ కోసం అభ్యర్థనను పంపించు."
 
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:270
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:279
@@ -13404,11 +13533,9 @@
 msgid "Unable to establish file descriptor."
 msgstr "ఫైల్ డెస్క్రిప్టర్‌ను స్థాపించడంలో అసమర్థత."
 
-#. TODO: what to do here - do we really have to disconnect?
 #: ../libpurple/protocols/yahoo/yahoo_packet.c:307
-#, fuzzy
 msgid "Write Error"
-msgstr "వ్రాయడంలో పొరపాటు."
+msgstr "రైట్ చేయడంలో పొరపాటు"
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:797
 msgid "Yahoo! Japan Profile"
@@ -13419,17 +13546,12 @@
 msgstr "యూహూ ప్రొఫైల్ "
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:838
-msgid ""
-"Sorry, profiles marked as containing adult content are not supported at this "
-"time."
+msgid "Sorry, profiles marked as containing adult content are not supported at this time."
 msgstr "క్షమించాలి. పెద్దలకు మాత్రమే అని గుర్తించిన ప్రొఫైల్స్‌కు ఈ సమయంలో సపోర్టు లభించదని మనవి."
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:840
-#, fuzzy
-msgid ""
-"If you wish to view this profile, you will need to visit this link in your "
-"web browser:"
-msgstr "ఈ ప్రొఫైల్‌ను మీరు చూడదల్చుకుంటే, మీ వెబ్ బ్రౌజర్‌లో ఈ లింకును మీరు దర్శించాలి."
+msgid "If you wish to view this profile, you will need to visit this link in your web browser:"
+msgstr " మీరు  ఈ ప్రొఫైల్ చూడదలచు కుంటే ,మీ వెబ్ బ్రౌజర్ లోని ఈ లింక్ కు వెళ్లాల్సి ఉంటుంది: "
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1034
 msgid "Yahoo! ID"
@@ -13472,29 +13594,16 @@
 msgstr " %s కు సంబంధించిన వినియోగదారుని సమాచారం అలభ్యం. "
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1205
-#, fuzzy
-msgid ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
-msgstr "క్షమించాలి. ఈ ప్రొఫైల్‌లో వాడిన భాషకు ఈ సమయంలో సపోర్టు లేదు. "
+msgid "Sorry, this profile seems to be in a language or format that is not supported at this time."
+msgstr "క్షమించండి, ఈ ప్రొఫైల్‌లో వాడిన భాషకు లేదా ఫార్మాట్ కు ఈ సమయంలో సపోర్టు లభించడం లేదు. "
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1221
-msgid ""
-"Could not retrieve the user's profile. This most likely is a temporary "
-"server-side problem. Please try again later."
-msgstr ""
-"వినియోగదారుని ప్రొఫైల్‌ను రిట్రీవ్ చేయుట సాధ్యపడలేదు. సమస్య దాదాపు తాత్కాలిక సెర్వర్-సైడ్‌దే అయివుంటుంది. తర్వాత "
-"మరల ప్రయత్నించండి. "
+msgid "Could not retrieve the user's profile. This most likely is a temporary server-side problem. Please try again later."
+msgstr "వినియోగదారుని ప్రొఫైల్‌ను రిట్రీవ్ చేయుట సాధ్యపడలేదు. సమస్య దాదాపు తాత్కాలిక సెర్వర్-సైడ్‌దే అయివుంటుంది. తర్వాత మరల ప్రయత్నించండి. "
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1224
-msgid ""
-"Could not retrieve the user's profile. This most likely means that the user "
-"does not exist; however, Yahoo! sometimes does fail to find a user's "
-"profile. If you know that the user exists, please try again later."
-msgstr ""
-"వినియోగదారుని ప్రొఫైల్‌ను రిట్రీవ్ చేయుట సాధ్యపడలేదు. అంటే దాదాపుగా దీనర్థం వినియోగదారుడు లేడు అని. యాహూ "
-"కొన్ని సమయాల్లో వినియోగదారుని ప్రొఫైల్‌ను కనుగొనలేదు. వినియోగదారుడు ఉన్నాడని మీకు తెలిసుంటే, దయచేసి తర్వాత "
-"మరోసారి ప్రయత్నించండి. "
+msgid "Could not retrieve the user's profile. This most likely means that the user does not exist; however, Yahoo! sometimes does fail to find a user's profile. If you know that the user exists, please try again later."
+msgstr "వినియోగదారుని ప్రొఫైల్‌ను రిట్రీవ్ చేయుట సాధ్యపడలేదు. అంటే దాదాపుగా దీనర్థం వినియోగదారుడు లేడు అని. యాహూ కొన్ని సమయాల్లో వినియోగదారుని ప్రొఫైల్‌ను కనుగొనలేదు. వినియోగదారుడు ఉన్నాడని మీకు తెలిసుంటే, దయచేసి తర్వాత మరోసారి ప్రయత్నించండి. "
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1231
 msgid "The user's profile is empty."
@@ -13516,30 +13625,24 @@
 # #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
 # gnome-session/gsm-client-row.c:43
 # #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
-# gnome-session/gsm-client-row.c:43
 #. -6
 #: ../libpurple/protocols/yahoo/yahoochat.c:441
-#, fuzzy
 msgid "Unknown room"
-msgstr "అజ్ఞాత పొరపాటు. "
+msgstr "అజ్ఞాత రూమ్ "
 
 #. -15
 #: ../libpurple/protocols/yahoo/yahoochat.c:444
-#, fuzzy
 msgid "Maybe the room is full"
-msgstr "గది నిండిపోయిందేమో?"
+msgstr "రూమ్ నిండి ఉండవచ్చు "
 
 #. -35
 #: ../libpurple/protocols/yahoo/yahoochat.c:447
-#, fuzzy
 msgid "Not available"
-msgstr "లభించదు."
+msgstr "అందుబాటు లో లేదు"
 
 #: ../libpurple/protocols/yahoo/yahoochat.c:451
-msgid ""
-"Unknown error. You may need to logout and wait five minutes before being "
-"able to rejoin a chatroom"
-msgstr ""
+msgid "Unknown error. You may need to logout and wait five minutes before being able to rejoin a chatroom"
+msgstr "అజ్ఞాత పొరపాటు. చాట్ రూమ్ లో మరల చేరడం ప్రారంభించడానికి మీరు లాగ్ అవుట్ అయి, ఐదు నిముషాలు వేచిచూడాల్సివుంటుంది."
 
 #: ../libpurple/protocols/yahoo/yahoochat.c:534
 #, c-format
@@ -13576,34 +13679,32 @@
 msgid "User Rooms"
 msgstr "వినియోగదారుని గదులు "
 
-#: ../libpurple/protocols/yahoo/ycht.c:456
+#: ../libpurple/protocols/yahoo/ycht.c:457
 msgid "Connection problem with the YCHT server."
 msgstr "YCHT సెర్వర్‌తో కనెక్షన్ సమస్య."
 
-#: ../libpurple/protocols/yahoo/ycht.c:475
-#, fuzzy, c-format
+#: ../libpurple/protocols/yahoo/ycht.c:476
+#, c-format
 msgid ""
 "Lost connection with server\n"
 "%s"
-msgstr "మీరు సెర్వర్‌నుండి డిస్‌కనెక్ట్ అయినారు."
+msgstr ""
+"సర్వర్ నుంచి కనెక్షన్ తెగిపోయింది \n"
+"%s"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:354
-msgid ""
-"(There was an error converting this message.\t Check the 'Encoding' option "
-"in the Account Editor)"
-msgstr ""
-"(ఈ సందేశాన్ని పరివర్తన చేయడంలో పొరపాటు.\t ఎకౌంట్ ఎడిటర్‌లోగల 'ఎన్‌కోడింగ్' ఆప్షన్‌ను చెక్ చేయండి.)."
+msgid "(There was an error converting this message.\t Check the 'Encoding' option in the Account Editor)"
+msgstr "(ఈ సందేశాన్ని పరివర్తన చేయడంలో పొరపాటు.\t ఎకౌంట్ ఎడిటర్‌లోగల 'ఎన్‌కోడింగ్' ఆప్షన్‌ను చెక్ చేయండి.)."
 
 #: ../libpurple/protocols/zephyr/zephyr.c:752
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send to chat %s,%s,%s"
-msgstr "సంభాషణకు పంపడంలో అసమర్థత %s,%s,%s"
+msgstr "%s,%s,%s చాట్ ను పంపలేకపోతున్నాం"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:791
 #: ../libpurple/protocols/zephyr/zephyr.c:1210
-#, fuzzy
 msgid "Hidden or not logged-in"
-msgstr "<br>దాచివేయబడినది లేదా లాగ్-ఇన్ చేయలేదు."
+msgstr "దాగి ఉన్నది లేదా లాగ్-ఇన్ చేయబడలేదు"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:797
 #: ../libpurple/protocols/zephyr/zephyr.c:1212
@@ -13650,42 +13751,28 @@
 msgstr "inst &lt;instance&gt;: Set the instance to be used on this class"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2710
-#, fuzzy
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "inst &lt;instance&gt;: Set the instance to be used on this class"
+msgstr "inst &lt;instance&gt;: ఈ శ్రేణిపై ఉపయోగించేలా ఇన్ స్టన్స్ ను సెట్ చేయండి"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2716
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr "sub &lt;class&gt; &lt;instance&gt; &lt;స్వీకర్త&gt;: కొత్త సంభాషణలో చేరుము."
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2721
-msgid ""
-"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
-msgstr ""
-"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+msgid "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+msgstr "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2727
-msgid ""
-"zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
-"<i>instance</i>,*&gt;"
-msgstr ""
-"zci &lt;class&gt; &lt;instance&gt;: &lt;<i>class</i>,<i>instance</i>,*&gt;"
+msgid "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,<i>instance</i>,*&gt;"
+msgstr "zci &lt;class&gt; &lt;instance&gt;: &lt;<i>class</i>,<i>instance</i>,*&gt;"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2733
-msgid ""
-"zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
-"<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
-msgstr ""
-"zcir &lt;class&gt; &lt;instance&gt; &lt;స్వీకర్త&gt;: వీరికి ఒక సందేశం పంపించుదాం &lt;"
-"<i>class</i>,<i>instance</i>,<i>प्राप्तकर्ता</i>&gt;"
+msgid "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
+msgstr "zcir &lt;class&gt; &lt;instance&gt; &lt;స్వీకర్త&gt;: వీరికి ఒక సందేశం పంపించుదాం &lt;<i>class</i>,<i>instance</i>,<i>प्राप्तकर्ता</i>&gt;"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2739
-msgid ""
-"zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
-"<i>instance</i>,<i>recipient</i>&gt;"
-msgstr ""
-"zir &lt;instance&gt; &lt;प्राप्तकर्ता&gt;: వీరికి ఒక సందేశం పంపించుదాం &lt;MESSAGE,"
-"<i>instance</i>,<i>प्राप्तकर्ता</i>&gt;"
+msgid "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,<i>instance</i>,<i>recipient</i>&gt;"
+msgstr "zir &lt;instance&gt; &lt;प्राप्तकर्ता&gt;: వీరికి ఒక సందేశం పంపించుదాం &lt;MESSAGE,<i>instance</i>,<i>प्राप्तकर्ता</i>&gt;"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2744
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
@@ -13699,6 +13786,16 @@
 msgid "Retrieve subscriptions from server"
 msgstr "సెర్వర్‌నుండి చందాలను రిట్రీవ్ చేయుము. "
 
+# *< type
+# *< ui_requirement
+# *< flags
+# *< dependencies
+# *< priority
+# *< id
+# *< name
+# *< version
+# *  summary
+# *  description
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -13715,14 +13812,12 @@
 msgstr "Zephyr Protocol Plugin"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2973
-#, fuzzy
 msgid "Use tzc"
-msgstr "యూనిట్ "
+msgstr "tzcను ఉపయోగించండి"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2976
-#, fuzzy
 msgid "tzc command"
-msgstr "అలాంటి కమాండ్ లేదు."
+msgstr "tzc కమాండ్"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2979
 msgid "Export to .anyone"
@@ -13733,90 +13828,115 @@
 msgstr ".zephyr.subs కు ఎక్స్‌పోర్ట్ చేయండి."
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2985
-#, fuzzy
 msgid "Import from .anyone"
-msgstr ".anyone కు ఎక్స్‌పోర్ట్ చేయండి. "
+msgstr ".anyone నుంచి ఇంపోర్ట్ చేసుకోండి"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2988
-#, fuzzy
 msgid "Import from .zephyr.subs"
-msgstr ".zephyr.subs కు ఎక్స్‌పోర్ట్ చేయండి."
+msgstr ".zephyr.subs నుంచి ఇంపోర్ట్  చేయండి"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2991
-#, fuzzy
 msgid "Realm"
-msgstr "నిజమైన పేరు "
+msgstr "అభిరుచి గల విషయం"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2994
 msgid "Exposure"
 msgstr "చూపించుము."
 
-#: ../libpurple/proxy.c:459 ../libpurple/proxy.c:894 ../libpurple/proxy.c:1049
-#: ../libpurple/proxy.c:1617
-#, fuzzy, c-format
+#: ../libpurple/proxy.c:461
+#: ../libpurple/proxy.c:902
+#: ../libpurple/proxy.c:1061
+#: ../libpurple/proxy.c:1632
+#, c-format
 msgid ""
 "Unable to create socket:\n"
 "%s"
 msgstr "సాకెట్‌ను సృష్టించలేదు. "
 
-#: ../libpurple/proxy.c:659
-#, fuzzy, c-format
+#: ../libpurple/proxy.c:662
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr "%s को संदेश भेजने में असमर्थ"
-
-#: ../libpurple/proxy.c:698 ../libpurple/proxy.c:744 ../libpurple/proxy.c:780
-#: ../libpurple/proxy.c:792
-#, fuzzy, c-format
+msgstr " నుంచి స్పందనను విశ్లేషించలేక పోయింది HTTP ప్రాక్సి: %s\n"
+
+#: ../libpurple/proxy.c:702
+#: ../libpurple/proxy.c:750
+#: ../libpurple/proxy.c:786
+#: ../libpurple/proxy.c:798
+#, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "ప్రాక్సీ కనెక్షన్ పొరపాటు %d."
 
-#: ../libpurple/proxy.c:788
-#, fuzzy, c-format
+# XXX: why in the hell are we calling gaim_connection_error() here?
+# Forbidden
+#: ../libpurple/proxy.c:794
+#, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
 msgstr "ప్రవేశం నిషేధం: ప్రాక్సీ సెర్వర్ port %d tunnelling వదిలేస్తోంది."
 
-#: ../libpurple/proxy.c:1012
-#, fuzzy, c-format
+#: ../libpurple/proxy.c:1022
+#, c-format
 msgid "Error resolving %s"
-msgstr "%s సంభాషణలో పాల్గొనుటలో పొరపాటు."
-
-#: ../libpurple/proxy.c:1714
-#, fuzzy
+msgstr "%s నిశ్చయించడంలో పొరపాటు"
+
+#: ../libpurple/proxy.c:1730
 msgid "Could not resolve host name"
-msgstr "హోస్ట్‌పేరును వెదకలేని స్థితి."
-
+msgstr "హోస్ట్ పేరును నిశ్చయించలేకపోతున్నాం"
+
+# *
+# * A wrapper for gaim_request_action() that uses Yes and No buttons.
+# * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
+# * @since 2.3.0
+# * @deprecated Please use purple_request_yes_no_with_hint instead.
+#. *
+#. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
+#. *
+#. * @since 2.3.0
+#.
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
+#. *
+#. * @deprecated Please use purple_request_yes_no_with_hint instead.
 #.
-#: ../libpurple/request.h:1378
-#, fuzzy
+#: ../libpurple/request.h:1802
+#: ../libpurple/request.h:1815
 msgid "_Yes"
-msgstr "అవును."
-
-#: ../libpurple/request.h:1378
-#, fuzzy
+msgstr "_అవును"
+
+#: ../libpurple/request.h:1802
+#: ../libpurple/request.h:1815
 msgid "_No"
-msgstr "కాదు"
-
+msgstr "_వద్దు/లేదు"
+
+# *
+# * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
+# * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
+# * @since 2.3.0
+# * @deprecated Please use purple_request_accept_cancel_with_hint instead.
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
+#. *
+#. * @since 2.3.0
 #.
-#: ../libpurple/request.h:1398
-#, fuzzy
+#. *
+#. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
+#. *
+#. * @deprecated Please use purple_request_accept_cancel_with_hint instead.
+#.
+#: ../libpurple/request.h:1854
+#: ../libpurple/request.h:1867
 msgid "_Accept"
-msgstr "అంగీకరించు "
+msgstr "_అంగీకరించు "
 
 #. *
 #. * The default message to use when the user becomes auto-away.
 #.
 #: ../libpurple/savedstatuses.c:48
 msgid "I'm not here right now"
-msgstr ""
+msgstr "నేను ప్రస్తుతం ఇక్కడ లేను"
 
 #: ../libpurple/savedstatuses.c:535
-#, fuzzy
 msgid "saved statuses"
-msgstr "సెర్వర్ స్టాటిస్టిక్స్ "
+msgstr "సేవ్ చేసిన స్థితులు"
 
 #: ../libpurple/server.c:234
 #, c-format
@@ -13829,36 +13949,38 @@
 msgstr ""
 
 #: ../libpurple/server.c:347
-#, fuzzy, c-format
+#, c-format
 msgid "%s has requested your attention!"
 msgstr "%s మీ సమాచారాన్ని అడిగినారు."
 
-#  Remove on type button
-#: ../libpurple/server.c:796
-#, fuzzy, c-format
+# Remove on type button
+#: ../libpurple/server.c:793
+#, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
 "%s"
-msgstr "%s has invited %s to the chat room %s\n"
-
-#  Remove on type button
-#: ../libpurple/server.c:801
+msgstr ""
+"%s has invited %s to the chat room %s\n"
+"%s"
+
+# Remove on type button
+#: ../libpurple/server.c:798
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s has invited %s to the chat room %s\n"
 
-#: ../libpurple/server.c:805
+#: ../libpurple/server.c:802
 msgid "Accept chat invitation?"
 msgstr "సంభాషణ ఆహ్వానాన్ని అంగీకరించారా?"
 
 #: ../libpurple/sslconn.c:164
 #, fuzzy
 msgid "SSL Connection Failed"
-msgstr "కనెక్షన్ విఫలమైనది."
+msgstr "కనెక్షన్ విఫలమైనది"
 
 #: ../libpurple/sslconn.c:166
 msgid "SSL Handshake Failed"
-msgstr "SSL హాండ్‌షేక్ విఫలమైనది."
+msgstr "SSL హ్యాండ్ షేక్  విఫలమైనది"
 
 #: ../libpurple/sslconn.c:168
 #, fuzzy
@@ -13868,272 +13990,287 @@
 # #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
 # gnome-session/gsm-client-row.c:43
 # #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
-# gnome-session/gsm-client-row.c:43
 #: ../libpurple/sslconn.c:171
 #, fuzzy
 msgid "Unknown SSL error"
-msgstr "తెలియని పొరపాటు."
+msgstr "అజ్ఞాత పొరపాటు"
 
 #: ../libpurple/status.c:153
-#, fuzzy
 msgid "Unset"
-msgstr "యూనిట్ "
-
-#: ../libpurple/status.c:156 ../pidgin/gtkstatusbox.c:1059
+msgstr "సెట్ చేయవద్దు"
+
+#: ../libpurple/status.c:156
+#: ../pidgin/gtkdocklet.c:553
+#: ../pidgin/gtkstatusbox.c:1059
 #, fuzzy
 msgid "Do not disturb"
-msgstr "అంతరాయము కలిగించవద్దు."
+msgstr "అంతరాయము కలిగించవద్దు"
 
 #: ../libpurple/status.c:159
 #, fuzzy
 msgid "Extended away"
-msgstr "దూరమైపోయినది."
+msgstr "దూరమైపోయినది"
 
 #: ../libpurple/status.c:160
-#, fuzzy
 msgid "Mobile"
-msgstr "మొబైల్ ఫోన్"
-
-#: ../libpurple/status.c:609
-#, fuzzy, c-format
+msgstr "మొబైల్"
+
+#: ../libpurple/status.c:161
+msgid "Listening to music"
+msgstr ""
+
+#: ../libpurple/status.c:610
+#, c-format
 msgid "%s changed status from %s to %s"
-msgstr "%s విషయాన్ని %sకు మార్చాడు "
-
-#: ../libpurple/status.c:619
-#, fuzzy, c-format
-msgid "%s is now %s"
-msgstr "%s కొత్తపేరు %s."
+msgstr "%s స్థితిని %s నుంచి %s కు మార్చబడింది"
+
+#: ../libpurple/status.c:613
+#, c-format
+msgid "%s (%s) changed status from %s to %s"
+msgstr "%s స్థితిని %s నుంచి %s కు మార్చబడింది"
 
 #: ../libpurple/status.c:624
-#, fuzzy, c-format
+#, c-format
+msgid "%s is now %s"
+msgstr "%s ఇప్పుడు %s"
+
+#: ../libpurple/status.c:626
+#, c-format
+msgid "%s (%s) is now %s"
+msgstr "%s ఇప్పుడు %s"
+
+#: ../libpurple/status.c:632
+#, c-format
 msgid "%s is no longer %s"
 msgstr "ఇప్పుడు %s  దూరంలో లేరు/దు."
 
-#: ../libpurple/status.c:1234
+#: ../libpurple/status.c:634
+#, c-format
+msgid "%s (%s) is no longer %s"
+msgstr "ఇప్పుడు %s  దూరంలో లేరు/దు."
+
+#: ../libpurple/status.c:1247
 #, c-format
 msgid "%s became idle"
 msgstr "%s సోమరిగా తయారైనారు."
 
-#: ../libpurple/status.c:1251
+#: ../libpurple/status.c:1264
 #, c-format
 msgid "%s became unidle"
 msgstr "%s సోమరితనం లేనివారైనారు."
 
-#: ../libpurple/status.c:1314
-#, fuzzy, c-format
+#: ../libpurple/status.c:1327
+#, c-format
 msgid "+++ %s became idle"
 msgstr "%s సోమరిగా తయారైనారు."
 
-#: ../libpurple/status.c:1316
-#, fuzzy, c-format
+#: ../libpurple/status.c:1329
+#, c-format
 msgid "+++ %s became unidle"
 msgstr "%s సోమరితనం లేనివారైనారు."
 
-#: ../libpurple/util.c:718
+#: ../libpurple/util.c:721
 #, c-format
 msgid "%x %X"
-msgstr ""
-
-#: ../libpurple/util.c:2722
-#, fuzzy, c-format
+msgstr "%x %X"
+
+#: ../libpurple/util.c:2783
+#, c-format
 msgid "Error Reading %s"
-msgstr ""
-"చదవడంలో పొరపాటు %s: \n"
-"%s.\n"
-
-#: ../libpurple/util.c:2723
-#, fuzzy, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr ""
-"మీ మిత్రుల లిస్టును విశ్లేషణ చేయడంలో పొరపాటు జరిగింది. లిస్టు లోడ్ కాలేదు, అంతేగాక పాత ఫైల్ blist."
-"xml~లో చేరినది."
-
-#: ../libpurple/util.c:3223
+msgstr "%s చదవడంలో పొరపాటు"
+
+#: ../libpurple/util.c:2784
+#, c-format
+msgid "An error was encountered reading your %s.  They have not been loaded, and the old file has been renamed to %s~."
+msgstr "%sను చదువుతున్నప్పుడు పొరపాటు జరిగింది. అవి లోడ్ కాలేదు, మరియు  పాత ఫైలు పేరు %s~గా మార్చబడింది."
+
+#: ../libpurple/util.c:3281
 msgid "Calculating..."
 msgstr "లెక్కిస్తూ..."
 
 # #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
 # gnome-session/gsm-client-row.c:43
 # #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
-# gnome-session/gsm-client-row.c:43
-#: ../libpurple/util.c:3226
+#: ../libpurple/util.c:3284
 msgid "Unknown."
 msgstr "అజ్ఞాత"
 
-#: ../libpurple/util.c:3252
-#, fuzzy, c-format
+#: ../libpurple/util.c:3310
+#, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
-msgstr[0] "సెకండ్లు"
-msgstr[1] "सेकंडों"
-
-#: ../libpurple/util.c:3264
-#, fuzzy, c-format
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libpurple/util.c:3322
+#, c-format
 msgid "%d day"
 msgid_plural "%d days"
-msgstr[0] "రోజు"
-msgstr[1] "दिनों"
-
-#: ../libpurple/util.c:3272
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libpurple/util.c:3330
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libpurple/util.c:3278
-#, fuzzy, c-format
+#: ../libpurple/util.c:3336
+#, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
-msgstr[0] "గంట"
-msgstr[1] "घंटें"
-
-#: ../libpurple/util.c:3286
-#, fuzzy, c-format
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libpurple/util.c:3344
+#, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
-msgstr[0] "నిమిషం"
-msgstr[1] "मिनटों"
-
-#: ../libpurple/util.c:3292
-#, fuzzy, c-format
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libpurple/util.c:3350
+#, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
-msgstr[0] "నిమిషం"
-msgstr[1] "मिनटों"
-
-#: ../libpurple/util.c:3552
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../libpurple/util.c:3610
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr ""
 
-#: ../libpurple/util.c:3589 ../libpurple/util.c:3885
-#, fuzzy, c-format
+#: ../libpurple/util.c:3647
+#: ../libpurple/util.c:3943
+#, c-format
 msgid "Unable to connect to %s"
-msgstr "సెర్వర్‌కు కనెక్ట్‌చేయలేని స్థితి. "
-
-#: ../libpurple/util.c:3712
-#, c-format
-msgid ""
-"Unable to allocate enough memory to hold the contents from %s.  The web "
-"server may be trying something malicious."
-msgstr ""
-
-#: ../libpurple/util.c:3747
-#, fuzzy, c-format
+msgstr ",ర్వర్‌కు కనెక్ట్‌చేయలేని స్థితి. "
+
+#: ../libpurple/util.c:3770
+#, c-format
+msgid "Unable to allocate enough memory to hold the contents from %s.  The web server may be trying something malicious."
+msgstr "%s నుంచి అందిన విషయాలను నిలిపిఉంచడానికి కావల్సినంత మెమొరీని కేటాయించలేక పోతోంది. ఏదో హాని చేయడానికి వెబ్ సర్వర్ ప్రయత్నిస్తూ ఉండవచ్చు.  "
+
+#: ../libpurple/util.c:3805
+#, c-format
 msgid "Error reading from %s: %s"
-msgstr ""
-"చదవడంలో పొరపాటు %s: \n"
-"%s.\n"
-
-#: ../libpurple/util.c:3778
-#, fuzzy, c-format
+msgstr "%s నుంచి చదవడంలో లోపం: %s"
+
+#: ../libpurple/util.c:3836
+#, c-format
 msgid "Error writing to %s: %s"
-msgstr ""
-"%s:వ్రాయడంలో పొరపాటు\n"
-"%s.\n"
-
-#: ../libpurple/util.c:3803
-#, fuzzy, c-format
+msgstr "%sకు రాయడంలో లోపం: %s"
+
+#: ../libpurple/util.c:3861
+#, c-format
 msgid "Unable to connect to %s: %s"
-msgstr "సెర్వర్‌కు కనెక్ట్‌చేయలేని స్థితి. "
+msgstr "సర్వర్‌కు కనెక్ట్‌చేయలేని స్థితి. "
 
 #: ../pidgin.desktop.in.h:1
-#, fuzzy
 msgid "Internet Messenger"
-msgstr "సత్వర సందేశాలు "
+msgstr "ఇంటర్నెట్ మెసెంజర్"
 
 #: ../pidgin.desktop.in.h:2
-#, fuzzy
 msgid "Pidgin Internet Messenger"
-msgstr "సత్వర సందేశాలు "
+msgstr "పిడ్జిన్ ఇంటర్నెట్ మెసెంజర్"
 
 #: ../pidgin.desktop.in.h:3
 msgid "Send instant messages over multiple protocols"
-msgstr ""
-
-#: ../pidgin/eggtrayicon.c:129
+msgstr "వివిధ ప్రొటోకాల్స్ కి సత్వర సందేశాన్ని పంపండి"
+
+#: ../pidgin/eggtrayicon.c:128
 msgid "Orientation"
 msgstr "దిశ"
 
-#: ../pidgin/eggtrayicon.c:130
+#: ../pidgin/eggtrayicon.c:129
 msgid "The orientation of the tray."
 msgstr "ట్రే దిశ"
 
+# Build the login options frame.
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:407
+#: ../pidgin/gtkaccount.c:410
 msgid "Login Options"
 msgstr "ఆప్షన్లను లాగిన్ చేయండి. "
 
-#: ../pidgin/gtkaccount.c:428
+#: ../pidgin/gtkaccount.c:431
 #, fuzzy
 msgid "Pro_tocol:"
 msgstr "ప్రొటోకాల్:"
 
-#: ../pidgin/gtkaccount.c:439
+#: ../pidgin/gtkaccount.c:442
 #, fuzzy
 msgid "Screen _name:"
 msgstr "స్క్రీన్ పేరు:"
 
-#: ../pidgin/gtkaccount.c:529
+#: ../pidgin/gtkaccount.c:532
 #, fuzzy
 msgid "_Local alias:"
-msgstr "స్థానిక ఫైల్:"
-
-#: ../pidgin/gtkaccount.c:533
+msgstr "స్థానిక లేదా:"
+
+#: ../pidgin/gtkaccount.c:536
 #, fuzzy
 msgid "Remember pass_word"
-msgstr "పాస్‌వర్డ్‌ను గుర్తుంచుకోండి. "
-
+msgstr "పాస్‌వర్డ్‌ను గుర్తుంచుకోండి "
+
+# Build the user options frame.
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:591
+#: ../pidgin/gtkaccount.c:594
 msgid "User Options"
 msgstr "వినియోగదారుని ఆప్షన్స్."
 
-#: ../pidgin/gtkaccount.c:604
+#: ../pidgin/gtkaccount.c:607
 #, fuzzy
 msgid "New _mail notifications"
-msgstr "న్యూ మెయిల్ నోటిఫికేషన్లు "
+msgstr "కొత్త మెయిల్ నోటిఫికేషన్లు "
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:609
+#: ../pidgin/gtkaccount.c:612
+#, fuzzy
 msgid "Use this buddy _icon for this account:"
-msgstr ""
-
+msgstr "ఈ అకౌంటు కోసం ఈ మిత్రుని ఐకన్ ను ఉపయోగించండి:"
+
+# Build the protocol options frame.
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:731
+#: ../pidgin/gtkaccount.c:734
 #, c-format
 msgid "%s Options"
 msgstr "%s ఆప్షన్స్"
 
-#: ../pidgin/gtkaccount.c:936
-#, fuzzy
+# Use Global Proxy Settings
+#: ../pidgin/gtkaccount.c:939
 msgid "Use GNOME Proxy Settings"
-msgstr "గ్లోబల్ ప్రాక్సీ సెట్టింగులను వినియోగించండి. "
-
-#: ../pidgin/gtkaccount.c:937
+msgstr "GNOME  ప్రాక్సీ సెట్టింగులను వినియోగించండి. "
+
+# Use Global Proxy Settings
+#: ../pidgin/gtkaccount.c:940
 msgid "Use Global Proxy Settings"
 msgstr "గ్లోబల్ ప్రాక్సీ సెట్టింగులను వినియోగించండి. "
 
-#: ../pidgin/gtkaccount.c:943
+# No Proxy
+#: ../pidgin/gtkaccount.c:946
 msgid "No Proxy"
 msgstr "ప్రాక్సీ లేదు "
 
-#: ../pidgin/gtkaccount.c:949
+# HTTP
+#: ../pidgin/gtkaccount.c:952
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:955
+# SOCKS 4
+#: ../pidgin/gtkaccount.c:958
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:961
+# SOCKS 5
+#: ../pidgin/gtkaccount.c:964
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1211
+# Use Environmental Settings
+#: ../pidgin/gtkaccount.c:970
+#: ../pidgin/gtkprefs.c:1283
 msgid "Use Environmental Settings"
 msgstr "ఎన్వైరాన్‌మెంటల్ సెట్టింగ్స్‌ను ఉపయోగించుము. "
 
@@ -14142,350 +14279,386 @@
 #. A) your network is really slow and you have nothing better to do than
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
-#: ../pidgin/gtkaccount.c:1006
+#: ../pidgin/gtkaccount.c:1009
 msgid "If you look real closely"
 msgstr "మీరు పరిశీలనగా చూస్తే "
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:1009
+#: ../pidgin/gtkaccount.c:1012
 msgid "you can see the butterflies mating"
 msgstr "మీరు సీతకోకచిలుకల కలయికను చూశారు."
 
-#: ../pidgin/gtkaccount.c:1030
+#: ../pidgin/gtkaccount.c:1033
 msgid "Proxy Options"
 msgstr "ప్రాక్సీ ఆప్షన్లు "
 
-#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1205
+#: ../pidgin/gtkaccount.c:1047
+#: ../pidgin/gtkprefs.c:1277
 msgid "Proxy _type:"
 msgstr "ప్రాక్సీ _టైప్:"
 
-#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1226
+#: ../pidgin/gtkaccount.c:1056
+#: ../pidgin/gtkprefs.c:1298
 msgid "_Host:"
 msgstr "_హోస్ట్:"
 
-#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1244
+#: ../pidgin/gtkaccount.c:1060
+#: ../pidgin/gtkprefs.c:1316
 msgid "_Port:"
 msgstr "_పోర్ట్:"
 
-#: ../pidgin/gtkaccount.c:1065
+#: ../pidgin/gtkaccount.c:1068
 msgid "_Username:"
 msgstr "వినియోగదారుని పేరు:"
 
-#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1281
+#: ../pidgin/gtkaccount.c:1075
+#: ../pidgin/gtkprefs.c:1353
 msgid "Pa_ssword:"
 msgstr "పాస్‌వర్డ్:"
 
-#: ../pidgin/gtkaccount.c:1195
+#: ../pidgin/gtkaccount.c:1199
 #, fuzzy
 msgid "Unable to save new account"
-msgstr "కొత్త కనెక్షన్ సృష్టించడంలో అసమర్థత. "
-
-#: ../pidgin/gtkaccount.c:1196
+msgstr " కనెక్షన్ ఏర్పరచలేని స్థితి "
+
+#: ../pidgin/gtkaccount.c:1200
 msgid "An account already exists with the specified criteria."
 msgstr ""
 
-#  And now for the buttons
-#: ../pidgin/gtkaccount.c:1473
+# And now for the buttons
+#: ../pidgin/gtkaccount.c:1478
 msgid "Add Account"
 msgstr "ఖాతాను చేర్చండి"
 
-#: ../pidgin/gtkaccount.c:1492
-#, fuzzy
+#: ../pidgin/gtkaccount.c:1497
 msgid "_Basic"
-msgstr "వెనుక"
-
-#: ../pidgin/gtkaccount.c:1499
+msgstr "_ప్రాథమిక"
+
+#: ../pidgin/gtkaccount.c:1504
 msgid "Create this new account on the server"
 msgstr ""
 
-# #-#-#-#-#  anjuta.ANJUTA_1_2_0.hi.po (anjuta2 VERSION)  #-#-#-#-#
-# #-#-#-#-#  gnome-session.HEAD.hi.po (gnome-session VERSION)  #-#-#-#-#
-# gnome-session/session-properties.c:179
-#  Cancel button.
-#: ../pidgin/gtkaccount.c:1515
-#, fuzzy
+#: ../pidgin/gtkaccount.c:1520
 msgid "_Advanced"
-msgstr "_రద్దుచేయండి"
-
-#: ../pidgin/gtkaccount.c:1973 ../pidgin/gtkplugin.c:569
-#, fuzzy
+msgstr "_Advanced"
+
+#: ../pidgin/gtkaccount.c:1978
+#: ../pidgin/gtkplugin.c:595
 msgid "Enabled"
-msgstr "విఫలమైనది "
-
-#: ../pidgin/gtkaccount.c:2001
+msgstr "ఎనేబుల్"
+
+#: ../pidgin/gtkaccount.c:2006
 msgid "Protocol"
 msgstr "ప్రొటోకాల్"
 
-#: ../pidgin/gtkaccount.c:2201
+#: ../pidgin/gtkaccount.c:2207
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
 "\n"
-"You have no IM accounts configured. To start connecting with %s press the "
-"<b>Add</b> button below and configure your first account. If you want %s to "
-"connect to multiple IM accounts, press <b>Add</b> again to configure them "
-"all.\n"
-"\n"
-"You can come back to this window to add, edit, or remove accounts from "
-"<b>Accounts->Add/Edit</b> in the Buddy List window"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:767
-msgid "Join a Chat"
-msgstr "సంభాషణలో చేరండి."
-
-#: ../pidgin/gtkblist.c:788
-msgid ""
-"Please enter the appropriate information about the chat you would like to "
-"join.\n"
+"You have no IM accounts configured. To start connecting with %s press the <b>Add</b> button below and configure your first account. If you want %s to connect to multiple IM accounts, press <b>Add</b> again to configure them all.\n"
+"\n"
+"You can come back to this window to add, edit, or remove accounts from <b>Accounts->Add/Edit</b> in the Buddy List window"
+msgstr ""
+"<స్పాన్ పరిమాణం='పెద్ద' బరువు='బోల్డ్'>స్వాగతం %s!</స్పాన్>\n"
+"\n"
+"మీ IM అకౌంట్లు కన్ఫిగర్ కాలేదు. %s తో కనెక్ట్ కావడం ప్రారంభించడానికి  <b>Add</b> ప్రెస్ చేయండి"
+
+#: ../pidgin/gtkblist.c:543
+#, c-format
+msgid "You have %d contact named %s. Would you like to merge them?"
+msgid_plural "You currently have %d contacts named %s. Would you like to merge them?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../pidgin/gtkblist.c:544
+msgid "Merging these contacts will cause them to share a single entry on the buddy list and use a single conversation window. You can separate them again by choosing 'Expand' from the contact's context menu"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:546
+msgid "_Merge"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:961
+msgid "Please enter the appropriate information about the chat you would like to join.\n"
 msgstr "మీరు జాయిన్ కాదల్చుకున్న సంభాషణగురించి సరైన సమాచారం ఎంటర్ చేయండి.\n"
 
-#  And now for the buttons
-#. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:799 ../pidgin/gtkblist.c:5530
-#: ../pidgin/gtkblist.c:5893 ../pidgin/gtkpounce.c:539
-#: ../pidgin/gtkroomlist.c:396
+# And now for the buttons
+#: ../pidgin/gtkblist.c:972
+#: ../pidgin/gtkblist.c:6589
+#: ../pidgin/gtkpounce.c:554
+#: ../pidgin/gtkroomlist.c:709
 msgid "_Account:"
 msgstr "_ఖాతా:"
 
-#: ../pidgin/gtkblist.c:1088 ../pidgin/gtkprivacy.c:603
-#: ../pidgin/gtkprivacy.c:617
-#, fuzzy
+#: ../pidgin/gtkblist.c:1261
+#: ../pidgin/gtkprivacy.c:605
+#: ../pidgin/gtkprivacy.c:619
 msgid "_Block"
-msgstr "ఆపుము "
-
-#: ../pidgin/gtkblist.c:1088
-#, fuzzy
+msgstr "నిలువరించుము "
+
+#: ../pidgin/gtkblist.c:1261
 msgid "Un_block"
-msgstr "ఆపుము "
-
-#: ../pidgin/gtkblist.c:1139
+msgstr "బ్లాక్_చేయవద్దు"
+
+#: ../pidgin/gtkblist.c:1304
+msgid "Move to"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:1344
 msgid "Get _Info"
 msgstr "_సమాచారాన్ని సేకరించండి."
 
-#: ../pidgin/gtkblist.c:1142 ../pidgin/pidginstock.c:90
+#: ../pidgin/gtkblist.c:1347
+#: ../pidgin/pidginstock.c:90
 msgid "I_M"
 msgstr "I_M"
 
-#: ../pidgin/gtkblist.c:1148
-#, fuzzy
-msgid "_Send File"
-msgstr "ఫైలును పంపుము."
-
-#: ../pidgin/gtkblist.c:1155
-#, fuzzy
-msgid "Add Buddy _Pounce"
+#: ../pidgin/gtkblist.c:1353
+#, fuzzy
+msgid "_Send File..."
+msgstr "_ఫైలును పంపుము. "
+
+#: ../pidgin/gtkblist.c:1360
+#, fuzzy
+msgid "Add Buddy _Pounce..."
 msgstr "Buddy _Pounceను చేర్చండి."
 
-#: ../pidgin/gtkblist.c:1160 ../pidgin/gtkblist.c:1164
-#: ../pidgin/gtkblist.c:1269 ../pidgin/gtkblist.c:1292
+#: ../pidgin/gtkblist.c:1365
+#: ../pidgin/gtkblist.c:1369
+#: ../pidgin/gtkblist.c:1484
+#: ../pidgin/gtkblist.c:1507
 msgid "View _Log"
 msgstr "View _Log"
 
-#: ../pidgin/gtkblist.c:1177 ../pidgin/gtkblist.c:1186
-#: ../pidgin/gtkblist.c:1277 ../pidgin/gtkblist.c:1298
+#: ../pidgin/gtkblist.c:1375
+msgid "Hide when offline"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:1375
+msgid "Show when offline"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:1389
+#: ../pidgin/gtkblist.c:1398
+#: ../pidgin/gtkblist.c:1492
+#: ../pidgin/gtkblist.c:1513
 msgid "_Alias..."
-msgstr "_ఉపనామం ..."
-
-#: ../pidgin/gtkblist.c:1180 ../pidgin/gtkblist.c:1188
-#: ../pidgin/gtkblist.c:1279 ../pidgin/gtkblist.c:1300
+msgstr "_మారుపేరు ..."
+
+#: ../pidgin/gtkblist.c:1392
+#: ../pidgin/gtkblist.c:1400
+#: ../pidgin/gtkblist.c:1494
+#: ../pidgin/gtkblist.c:1515
 msgid "_Remove"
 msgstr "_తొలగించండి "
 
-#: ../pidgin/gtkblist.c:1238
-msgid "Add a _Buddy"
-msgstr "ఒక _మిత్రునిపేరును చేర్చండి"
-
-#: ../pidgin/gtkblist.c:1241
-msgid "Add a C_hat"
-msgstr "ఒక సంభాషణను చేర్చండి "
-
-#: ../pidgin/gtkblist.c:1244
+#: ../pidgin/gtkblist.c:1450
+#, fuzzy
+msgid "Add _Buddy..."
+msgstr "మిత్రుని చేర్చుము "
+
+#: ../pidgin/gtkblist.c:1453
+#, fuzzy
+msgid "Add C_hat..."
+msgstr "సంభాషణ చేర్చండి"
+
+#: ../pidgin/gtkblist.c:1456
 msgid "_Delete Group"
 msgstr "గ్రూపును _తొలగించండి  "
 
-#: ../pidgin/gtkblist.c:1246
+#: ../pidgin/gtkblist.c:1458
 msgid "_Rename"
 msgstr "_కొత్తపేరు"
 
+# join button
 #. join button
-#: ../pidgin/gtkblist.c:1265 ../pidgin/gtkroomlist.c:307
-#: ../pidgin/gtkroomlist.c:460 ../pidgin/pidginstock.c:88
+#: ../pidgin/gtkblist.c:1478
+#: ../pidgin/gtkroomlist.c:316
+#: ../pidgin/gtkroomlist.c:773
+#: ../pidgin/pidginstock.c:88
 msgid "_Join"
 msgstr "_జాయిన్ అగు"
 
-#: ../pidgin/gtkblist.c:1267
+#: ../pidgin/gtkblist.c:1480
 msgid "Auto-Join"
 msgstr "ఆటో జాయిన్"
 
-#: ../pidgin/gtkblist.c:1305 ../pidgin/gtkblist.c:1329
+#: ../pidgin/gtkblist.c:1482
+#, fuzzy
+msgid "Persistent"
+msgstr "పర్షియన్"
+
+#: ../pidgin/gtkblist.c:1520
+#: ../pidgin/gtkblist.c:1543
 msgid "_Collapse"
 msgstr "_కూలిపోవుట"
 
-#: ../pidgin/gtkblist.c:1334
+#: ../pidgin/gtkblist.c:1548
 msgid "_Expand"
 msgstr "_Expand"
 
-#: ../pidgin/gtkblist.c:1585 ../pidgin/gtkblist.c:1597
-#: ../pidgin/gtkblist.c:4603 ../pidgin/gtkblist.c:4616
+#: ../pidgin/gtkblist.c:1799
+#: ../pidgin/gtkblist.c:1811
+#: ../pidgin/gtkblist.c:5254
+#: ../pidgin/gtkblist.c:5267
 msgid "/Tools/Mute Sounds"
-msgstr "/औज़ार/आवाज़ बंद करें"
-
-#: ../pidgin/gtkblist.c:2057 ../pidgin/gtkconv.c:4840
-#: ../pidgin/gtkpounce.c:430
-msgid ""
-"You are not currently signed on with an account that can add that buddy."
+msgstr "/Tools/Mute Sounds"
+
+#: ../pidgin/gtkblist.c:2271
+#: ../pidgin/gtkconv.c:4922
+#: ../pidgin/gtkpounce.c:437
+msgid "You are not currently signed on with an account that can add that buddy."
 msgstr "మీరు ఏ ఖాతాను సైన్‌ఆన్ చేయలేదు. అందుచేత మీరు ఆ మిత్రుని చేర్చలేరు."
 
+# Buddies menu
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2869
+#: ../pidgin/gtkblist.c:3103
 msgid "/_Buddies"
 msgstr "/_మిత్రులు "
 
-#: ../pidgin/gtkblist.c:2870
+#: ../pidgin/gtkblist.c:3104
 msgid "/Buddies/New Instant _Message..."
 msgstr "/మిత్రులు/సరికొత్త సత్వర _సందేశం..."
 
-#: ../pidgin/gtkblist.c:2871
+#: ../pidgin/gtkblist.c:3105
 msgid "/Buddies/Join a _Chat..."
 msgstr "/మిత్రులు/ _సంభాషణలో ప్రవేశించండి ..."
 
-#: ../pidgin/gtkblist.c:2872
+#: ../pidgin/gtkblist.c:3106
 msgid "/Buddies/Get User _Info..."
 msgstr "/మిత్రులు/వినియోగదారుని _సమాచారం సేకరించండి..."
 
-#: ../pidgin/gtkblist.c:2873
+#: ../pidgin/gtkblist.c:3107
 msgid "/Buddies/View User _Log..."
 msgstr "/మిత్రులు/వినియోగదారుని దృశ్యం _లాగ్ ..."
 
-#: ../pidgin/gtkblist.c:2875
-#, fuzzy
-msgid "/Buddies/Show"
-msgstr "/మిత్రులు/_సైన్‌ఆఫ్ "
-
-#: ../pidgin/gtkblist.c:2876
+#: ../pidgin/gtkblist.c:3109
+#, fuzzy
+msgid "/Buddies/Sh_ow"
+msgstr "/మిత్రులు/_వదిలేయండి"
+
+#: ../pidgin/gtkblist.c:3110
 #, fuzzy
 msgid "/Buddies/Show/_Offline Buddies"
 msgstr "/మిత్రులు/_ఆఫ్‌లైన్ మిత్రులను చూపించుము "
 
-#: ../pidgin/gtkblist.c:2877
+#: ../pidgin/gtkblist.c:3111
 #, fuzzy
 msgid "/Buddies/Show/_Empty Groups"
 msgstr "/మిత్రులు/ _కాళీ గ్రూపులను చూపించుము."
 
-#: ../pidgin/gtkblist.c:2878
+#: ../pidgin/gtkblist.c:3112
 #, fuzzy
 msgid "/Buddies/Show/Buddy _Details"
-msgstr "/మిత్రులు/ఆఫ్‌లైన్‌ అయిన మిత్రులను చూపించండి. "
-
-#: ../pidgin/gtkblist.c:2879
+msgstr "/మిత్రులు/మిత్రుని_వివరాలు చూపించండి"
+
+#: ../pidgin/gtkblist.c:3113
 #, fuzzy
 msgid "/Buddies/Show/Idle _Times"
-msgstr "/మిత్రులు/ఆఫ్‌లైన్‌ అయిన మిత్రులను చూపించండి. "
-
-#: ../pidgin/gtkblist.c:2880
+msgstr "/మిత్రులు/ఖాళీ_సమయాన్ని చూపించండి"
+
+#: ../pidgin/gtkblist.c:3114
 #, fuzzy
 msgid "/Buddies/Show/_Protocol Icons"
 msgstr "/మిత్రులు/ _కాళీ గ్రూపులను చూపించుము."
 
-#: ../pidgin/gtkblist.c:2881
-#, fuzzy
+#: ../pidgin/gtkblist.c:3115
 msgid "/Buddies/_Sort Buddies"
-msgstr "/మిత్రులు/ఆఫ్‌లైన్‌ అయిన మిత్రులను చూపించండి. "
-
-#: ../pidgin/gtkblist.c:2883
+msgstr "/మిత్రులు/_మిత్రులను వర్గీకరించి చూపండి"
+
+#: ../pidgin/gtkblist.c:3117
 msgid "/Buddies/_Add Buddy..."
 msgstr "/మిత్రులు/ _మిత్రులను చేర్చుము... "
 
-#: ../pidgin/gtkblist.c:2884
+#: ../pidgin/gtkblist.c:3118
 msgid "/Buddies/Add C_hat..."
 msgstr "/మిత్రులు/సంభాషణ చేర్చండి ..."
 
-#: ../pidgin/gtkblist.c:2885
+#: ../pidgin/gtkblist.c:3119
 msgid "/Buddies/Add _Group..."
 msgstr "/మిత్రులు/ _గ్రూపును చేర్చండి..."
 
-#: ../pidgin/gtkblist.c:2887
+#: ../pidgin/gtkblist.c:3121
 msgid "/Buddies/_Quit"
 msgstr "/మిత్రులు/_వదిలేయండి"
 
-#  And now for the buttons
+# And now for the buttons
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2890
-#, fuzzy
+#: ../pidgin/gtkblist.c:3124
 msgid "/_Accounts"
-msgstr "ఖాతాలు"
-
-#  And now for the buttons
-#: ../pidgin/gtkblist.c:2891 ../pidgin/gtkblist.c:6589
-#, fuzzy
-msgid "/Accounts/Add\\/Edit"
-msgstr "ఖాతాలు"
-
+msgstr "/_ అకౌంట్లు"
+
+# And now for the buttons
+#: ../pidgin/gtkblist.c:3125
+#: ../pidgin/gtkblist.c:7291
+#, fuzzy
+msgid "/Accounts/Manage"
+msgstr "/అకౌంట్లు"
+
+# Tools
 #. Tools
-#: ../pidgin/gtkblist.c:2894
+#: ../pidgin/gtkblist.c:3128
 msgid "/_Tools"
 msgstr "/_ఉపకరణాలు "
 
-#: ../pidgin/gtkblist.c:2895
-#, fuzzy
+#: ../pidgin/gtkblist.c:3129
 msgid "/Tools/Buddy _Pounces"
-msgstr "/ఉపకరణాలు /స్నేహితుడు _హఠాత్తుగా మీదకు దుముకుట"
-
-#: ../pidgin/gtkblist.c:2896
+msgstr "/ఉపకరణాలు/మిత్రుడు _హఠాత్తుగా దూసుకు వస్తున్నాడు "
+
+#: ../pidgin/gtkblist.c:3130
 #, fuzzy
 msgid "/Tools/_Certificates"
 msgstr "/ఉపకరణాలు/ప్రెఫరెన్సెస్ "
 
-#  And now for the buttons
-#: ../pidgin/gtkblist.c:2897
-#, fuzzy
+#: ../pidgin/gtkblist.c:3131
 msgid "/Tools/Plu_gins"
-msgstr "/ఉపకరణాలు/ప్లగ్‌ఇన్ చర్యలు "
-
-#: ../pidgin/gtkblist.c:2898
+msgstr "/టూల్స్/ప్లగ్_ఇన్ లు"
+
+#: ../pidgin/gtkblist.c:3132
 msgid "/Tools/Pr_eferences"
 msgstr "/ఉపకరణాలు/ప్రెఫరెన్సెస్ "
 
-#: ../pidgin/gtkblist.c:2899
+#: ../pidgin/gtkblist.c:3133
 msgid "/Tools/Pr_ivacy"
 msgstr "/ఉపకరణాలు/రహస్యము"
 
-#: ../pidgin/gtkblist.c:2901
+#: ../pidgin/gtkblist.c:3135
 msgid "/Tools/_File Transfers"
 msgstr "/ఉపకరణాలు/_ఫైల్ ట్రాన్స్‌ఫర్లు "
 
-#: ../pidgin/gtkblist.c:2902
+#: ../pidgin/gtkblist.c:3136
 msgid "/Tools/R_oom List"
 msgstr "/ఉపకరణాలు/గది లిస్టు "
 
-#: ../pidgin/gtkblist.c:2903
-#, fuzzy
+#: ../pidgin/gtkblist.c:3137
 msgid "/Tools/System _Log"
-msgstr "/ఉపకరణాలు/సిస్టం లాగ్‌ను చూడండి "
-
-#: ../pidgin/gtkblist.c:2905
+msgstr "/ఉపకరణాలు/సిస్టం _లాగ్‌ "
+
+#: ../pidgin/gtkblist.c:3139
 msgid "/Tools/Mute _Sounds"
 msgstr "/औज़ार/आवाज़ बंद करें(_S)"
 
+# Help
 #. Help
-#: ../pidgin/gtkblist.c:2907
+#: ../pidgin/gtkblist.c:3141
 msgid "/_Help"
 msgstr "/_సహాయం"
 
-#: ../pidgin/gtkblist.c:2908
+#: ../pidgin/gtkblist.c:3142
 msgid "/Help/Online _Help"
 msgstr "/సహాయం/ఆన్‌లైన్ _సహాయం"
 
-#: ../pidgin/gtkblist.c:2909
+#: ../pidgin/gtkblist.c:3143
 msgid "/Help/_Debug Window"
 msgstr "/సహాయం/విండోను _డీబగ్ చేయుము"
 
-#: ../pidgin/gtkblist.c:2911 ../pidgin/gtkblist.c:2913
+#: ../pidgin/gtkblist.c:3145
+#: ../pidgin/gtkblist.c:3147
 msgid "/Help/_About"
 msgstr "/సహాయం/_గురించి"
 
-#: ../pidgin/gtkblist.c:2942
+#: ../pidgin/gtkblist.c:3176
 #, c-format
 msgid ""
 "\n"
@@ -14494,834 +14667,810 @@
 "\n"
 "<b>ఖాతా:</b> %s"
 
-#  Buddy List
-#: ../pidgin/gtkblist.c:3020
-#, fuzzy
+#: ../pidgin/gtkblist.c:3254
 msgid "Buddy Alias"
-msgstr "మిత్రుల లిస్ట్ "
-
-#: ../pidgin/gtkblist.c:3049
-#, fuzzy
+msgstr "మిత్రుని మారుపేరు"
+
+#: ../pidgin/gtkblist.c:3283
 msgid "Logged In"
-msgstr "లాగ్ ఔట్ అయినది. "
-
-#: ../pidgin/gtkblist.c:3095
-#, fuzzy
+msgstr "లాగ్ ఇన్ చేయబడింది"
+
+#: ../pidgin/gtkblist.c:3329
 msgid "Last Seen"
-msgstr "చివరి పేరు:"
-
-#: ../pidgin/gtkblist.c:3116
+msgstr "చివరిసారిగా చూసినది"
+
+#: ../pidgin/gtkblist.c:3350
 msgid "Spooky"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:3118
+msgstr "భయంకరం"
+
+#: ../pidgin/gtkblist.c:3352
 msgid "Awesome"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:3120
+msgstr "భవ్యం"
+
+#: ../pidgin/gtkblist.c:3354
 msgid "Rockin'"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:3453
-#, fuzzy, c-format
+msgstr "సుదృఢం"
+
+#: ../pidgin/gtkblist.c:3693
+#, c-format
 msgid "Idle %dd %dh %02dm"
-msgstr "సోమరి (%dh%02dm) "
-
-#: ../pidgin/gtkblist.c:3455
-#, fuzzy, c-format
+msgstr "ఖాళీ %dh %02dm"
+
+#: ../pidgin/gtkblist.c:3695
+#, c-format
 msgid "Idle %dh %02dm"
-msgstr "సోమరి (%dh%02dm) "
-
-#: ../pidgin/gtkblist.c:3457
-#, fuzzy, c-format
+msgstr "ఖాళీ %dh %02dm"
+
+#: ../pidgin/gtkblist.c:3697
+#, c-format
 msgid "Idle %dm"
-msgstr "సోమరి (%dm) "
-
-#: ../pidgin/gtkblist.c:3602
-#, fuzzy
+msgstr "%dm ఖాళీగా ఉంది"
+
+#: ../pidgin/gtkblist.c:3851
 msgid "/Buddies/New Instant Message..."
-msgstr "/మిత్రులు/సరికొత్త సత్వర _సందేశం..."
-
-#: ../pidgin/gtkblist.c:3603 ../pidgin/gtkblist.c:3636
+msgstr "/మిత్రులు/సరికొత్త సత్వర సందేశం..."
+
+#: ../pidgin/gtkblist.c:3852
+#: ../pidgin/gtkblist.c:3885
 msgid "/Buddies/Join a Chat..."
 msgstr "/మిత్రులు/సంభాషణలో చేరుము ..."
 
-#: ../pidgin/gtkblist.c:3604
-#, fuzzy
+#: ../pidgin/gtkblist.c:3853
 msgid "/Buddies/Get User Info..."
-msgstr "/మిత్రులు/వినియోగదారుని _సమాచారం సేకరించండి..."
-
-#: ../pidgin/gtkblist.c:3605
-#, fuzzy
+msgstr "/మిత్రులు/వినియోగదారు సమాచారం పొందండి..."
+
+#: ../pidgin/gtkblist.c:3854
 msgid "/Buddies/Add Buddy..."
-msgstr "/మిత్రులు/ _మిత్రులను చేర్చుము... "
-
-#: ../pidgin/gtkblist.c:3606 ../pidgin/gtkblist.c:3639
-#, fuzzy
+msgstr "/మిత్రులు/ మిత్రులను చేర్చుము... "
+
+#: ../pidgin/gtkblist.c:3855
+#: ../pidgin/gtkblist.c:3888
 msgid "/Buddies/Add Chat..."
-msgstr "/మిత్రులు/సంభాషణ చేర్చండి ..."
-
-#: ../pidgin/gtkblist.c:3607
-#, fuzzy
+msgstr "/మిత్రులు/సంభాషణ చేర్చుము ..."
+
+#: ../pidgin/gtkblist.c:3856
 msgid "/Buddies/Add Group..."
-msgstr "/మిత్రులు/ _గ్రూపును చేర్చండి..."
-
-#: ../pidgin/gtkblist.c:3642
+msgstr "/మిత్రులు/ గ్రూపును చేర్చుము..."
+
+#: ../pidgin/gtkblist.c:3891
 msgid "/Tools/Privacy"
 msgstr "/ఉపకరణాలు/రహస్యము"
 
-#: ../pidgin/gtkblist.c:3645
+#: ../pidgin/gtkblist.c:3894
 msgid "/Tools/Room List"
 msgstr "ఉపకరణాలు/గది లిస్టు"
 
-#: ../pidgin/gtkblist.c:3742 ../pidgin/gtkdocklet.c:153
-#, fuzzy, c-format
+#: ../pidgin/gtkblist.c:4026
+#: ../pidgin/gtkdocklet.c:155
+#: ../pidgin/gtkdocklet.c:160
+#, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
-msgstr[0] "%s నుండి సందేశం "
-msgstr[1] "%s నుండి సందేశం "
-
-#: ../pidgin/gtkblist.c:3822
-#, fuzzy
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../pidgin/gtkblist.c:4189
 msgid "Manually"
-msgstr "మాన్యుయల్ "
-
-#: ../pidgin/gtkblist.c:3824
-#, fuzzy
-msgid "Alphabetically"
-msgstr "వర్ణమాల క్రమంలో"
-
-#: ../pidgin/gtkblist.c:3825
+msgstr "మాన్యువల్లీ"
+
+#: ../pidgin/gtkblist.c:4192
 msgid "By status"
 msgstr "వస్తుస్థితి (స్టాటస్) చేత "
 
-#: ../pidgin/gtkblist.c:3826
+#: ../pidgin/gtkblist.c:4193
 msgid "By log size"
 msgstr "లాగ్ సైజ్ వలన "
 
-#: ../pidgin/gtkblist.c:4031 ../pidgin/gtkconn.c:179
-#, fuzzy, c-format
+#: ../pidgin/gtkblist.c:4492
+#, c-format
 msgid "%s disconnected"
-msgstr "డిస్‌కనెక్ట్ అయింది."
-
-#: ../pidgin/gtkblist.c:4067
-#, fuzzy, c-format
-msgid "<span color=\"red\">%s disconnected: %s</span>"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">%s కనెక్షన్ తెగిపోయింది।</span>\n"
-"\n"
-"%s\n"
-"%s"
-
-#: ../pidgin/gtkblist.c:4219
-#, fuzzy
+msgstr "%s డిస్కనెక్ట్అయింది"
+
+#: ../pidgin/gtkblist.c:4494
+#, c-format
+msgid "%s disabled"
+msgstr "కమాండ్ పని చేయడం లేదు"
+
+#: ../pidgin/gtkblist.c:4498
+msgid "Reconnect"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:4498
+#: ../pidgin/gtkblist.c:4606
+#, fuzzy
+msgid "Re-enable"
+msgstr "తిరిగి సాధ్యపడే అకౌంటు"
+
+#: ../pidgin/gtkblist.c:4502
+#: ../pidgin/gtkblist.c:4609
+#: ../pidgin/gtkconv.c:1679
+msgid "Ignore"
+msgstr "ఉపేక్ష "
+
+# MSG_SERVER_GHOST
+# Looks like someone logged in as us! =-O
+#: ../pidgin/gtkblist.c:4633
+#, c-format
+msgid "%d account was disabled because you signed on from another location."
+msgid_plural "%d accounts were disabled because you signed on from another location."
+msgstr[0] "మీరు మరో ప్రదేశంనుండి సైన్ ఆన్ చేశారు."
+msgstr[1] "మీరు మరో ప్రదేశంనుండి సైన్ ఆన్ చేశారు."
+
+#: ../pidgin/gtkblist.c:4860
 msgid "<b>Username:</b>"
-msgstr ""
-"\n"
-"<b>హెచ్చరించడమైనది:</b>"
-
-#: ../pidgin/gtkblist.c:4226
+msgstr "<b>వినియోగదారుని పేరు:</b>"
+
+#: ../pidgin/gtkblist.c:4867
 #, fuzzy
 msgid "<b>Password:</b>"
 msgstr "<b>_పాస్‌వర్డ్:</b>"
 
-#: ../pidgin/gtkblist.c:4237
-#, fuzzy
+#: ../pidgin/gtkblist.c:4878
 msgid "_Login"
-msgstr "లాగ్ ఇన్ "
-
-#  And now for the buttons
-#: ../pidgin/gtkblist.c:4320
-#, fuzzy
+msgstr "_లాగ్ ఇన్ "
+
+# And now for the buttons
+#: ../pidgin/gtkblist.c:4963
 msgid "/Accounts"
-msgstr "ఖాతాలు"
+msgstr "/అకౌంట్లు"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4334
+#: ../pidgin/gtkblist.c:4977
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
 "\n"
-"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
-"b> window at <b>Accounts->Add/Edit</b>. Once you enable accounts, you'll be "
-"able to sign on, set your status, and talk to your friends."
-msgstr ""
-
+"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</b> window at <b>Accounts->Manage</b>. Once you enable accounts, you'll be able to sign on, set your status, and talk to your friends."
+msgstr ""
+"<స్పాన్ బరువు='బోల్డ్ '  పరిమాణం ='పెద్దది'> %s కు స్వాగతం!</స్పాన్>\n"
+"\n"
+"మీ అకౌంట్లు క్రియాశీలం కాలేదు. <b>అకౌంట్లు->చేర్చు/ఎడిట్ చేయు</b>వద్ద <b>అకౌంట్లు</b>విండోనుంచి మీ IM అకౌంట్లను క్రియాశీలం చేయండి. మీరు అకౌంట్లను క్రియాశీలం చేస్తేచాలు, సైన్ ఆన్ చేయడానికి, మీ స్థాయిని సెట్ చేయడానికి, మిత్రులతో మాట్లాడటానికి మీకు వీలవుతుంది."
+
+# set the Show Offline Buddies option. must be done
+# * after the treeview or faceprint gets mad. -Robot101
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4597
+#: ../pidgin/gtkblist.c:5248
 #, fuzzy
 msgid "/Buddies/Show/Offline Buddies"
 msgstr "/మిత్రులు/ఆఫ్‌లైన్‌ అయిన మిత్రులను చూపించండి. "
 
-#: ../pidgin/gtkblist.c:4600
+#: ../pidgin/gtkblist.c:5251
 #, fuzzy
 msgid "/Buddies/Show/Empty Groups"
 msgstr "/మిత్రులు/కాళీ గ్రూపులను చూపించుము"
 
-#: ../pidgin/gtkblist.c:4606
+#: ../pidgin/gtkblist.c:5257
 #, fuzzy
 msgid "/Buddies/Show/Buddy Details"
-msgstr "/మిత్రులు/ఆఫ్‌లైన్‌ అయిన మిత్రులను చూపించండి. "
-
-#: ../pidgin/gtkblist.c:4609
+msgstr "/మిత్రులు/మిత్రుల వివరాలు చూపించు"
+
+#: ../pidgin/gtkblist.c:5260
 #, fuzzy
 msgid "/Buddies/Show/Idle Times"
-msgstr "/మిత్రులు/ఆఫ్‌లైన్‌ అయిన మిత్రులను చూపించండి. "
-
-#: ../pidgin/gtkblist.c:4612
+msgstr "/మిత్రులు/ఖాళీ సమయాలను చూపించు"
+
+#: ../pidgin/gtkblist.c:5263
 #, fuzzy
 msgid "/Buddies/Show/Protocol Icons"
 msgstr "/మిత్రులు/కాళీ గ్రూపులను చూపించుము"
 
-#: ../pidgin/gtkblist.c:5507
-msgid ""
-"Please enter the screen name of the person you would like to add to your "
-"buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
-"The alias will be displayed in place of the screen name whenever possible.\n"
-msgstr ""
-"మీ మిత్రుల లిస్టుకు చేర్చదల్చుకున్న వ్యక్తి స్క్రీన్‌పేరును ఎంటర్ చేయండి. ఆప్షన్‌గా మీరు ఉపనామాన్ని ఎంటర్ "
-"చేయవచ్చును. సాధ్యమైనచోట్ల స్క్రీన్ పేరు బదులుగా ఉపనామము ప్రదర్శించబడును. \n"
+#: ../pidgin/gtkblist.c:6195
+msgid "Please enter the screen name of the person you would like to add to your buddy list. You may optionally enter an alias, or nickname,  for the buddy. The alias will be displayed in place of the screen name whenever possible.\n"
+msgstr "మీ మిత్రుల లిస్టుకు చేర్చదల్చుకున్న వ్యక్తి స్క్రీన్‌పేరును ఎంటర్ చేయండి. ఆప్షన్‌గా మీరు ఉపనామాన్ని ఎంటర్ చేయవచ్చును. సాధ్యమైనచోట్ల స్క్రీన్ పేరు బదులుగా ఉపనామము ప్రదర్శించబడును. \n"
+
+# And now for the buttons
+# Set up stuff for the account box
+#. Set up stuff for the account box
+#: ../pidgin/gtkblist.c:6218
+#, fuzzy
+msgid "A_ccount:"
+msgstr "అకౌంటు:"
 
 #. End of account box
-#: ../pidgin/gtkblist.c:5542
+#: ../pidgin/gtkblist.c:6230
 #, fuzzy
 msgid "_Screen name:"
-msgstr "_స్క్రీన్ పేరు "
-
-#: ../pidgin/gtkblist.c:5564 ../pidgin/gtkblist.c:5914
+msgstr "స్క్రీన్ పేరు:"
+
+#: ../pidgin/gtkblist.c:6252
+#: ../pidgin/gtkblist.c:6610
 #, fuzzy
 msgid "A_lias:"
-msgstr "ఉపనామం:"
-
-#: ../pidgin/gtkblist.c:5826
+msgstr "మారు పేరు:"
+
+#: ../pidgin/gtkblist.c:6520
 msgid "This protocol does not support chat rooms."
 msgstr "ఈ ప్రొటోకాల్ సంభాషణ గదులను సపోర్ట్ చేయదు."
 
-#: ../pidgin/gtkblist.c:5842
-msgid ""
-"You are not currently signed on with any protocols that have the ability to "
-"chat."
+#: ../pidgin/gtkblist.c:6536
+msgid "You are not currently signed on with any protocols that have the ability to chat."
 msgstr "మీరు వర్తమాన కాలంలో సంభాషింప నేర్పుగల ప్రొటోకాల్స్‌తో సంతకంచేసి యుండలేదు."
 
-#: ../pidgin/gtkblist.c:5883
-msgid ""
-"Please enter an alias, and the appropriate information about the chat you "
-"would like to add to your buddy list.\n"
-msgstr ""
-"ఒక ఉపనామాన్ని, దానితోపాటు మీ మిత్రుల లిస్టుకు చేర్చదల్చుకున్న సంభాషణ గురించిన సరైన సమాచారం  ఎంటర్ "
-"చేయండి. \n"
-
-#: ../pidgin/gtkblist.c:5964
+#: ../pidgin/gtkblist.c:6579
+msgid "Please enter an alias, and the appropriate information about the chat you would like to add to your buddy list.\n"
+msgstr "ఒక మారుపేరు, దానితోపాటు మీ మిత్రుల లిస్టుకు చేర్చదల్చుకున్న సంభాషణ గురించిన సరైన సమాచారం  ఎంటర్ చేయండి. \n"
+
+#: ../pidgin/gtkblist.c:6638
+msgid "Autojoin when account becomes online."
+msgstr ""
+
+#: ../pidgin/gtkblist.c:6639
+msgid "Hide chat when the window is closed."
+msgstr ""
+
+#: ../pidgin/gtkblist.c:6665
 msgid "Please enter the name of the group to be added."
 msgstr "చేర్చదలచుకున్న గ్రూప్ పేరును ఎంటర్ చేయండి."
 
-#: ../pidgin/gtkblist.c:6609
+#: ../pidgin/gtkblist.c:7311
 msgid "<PurpleMain>/Accounts/"
-msgstr ""
-
-#  And now for the buttons
-#: ../pidgin/gtkblist.c:6633
-#, fuzzy
+msgstr "<PurpleMain>/అకౌంట్లు/"
+
+#: ../pidgin/gtkblist.c:7335
 msgid "_Edit Account"
-msgstr "_ఖాతా "
-
-#: ../pidgin/gtkblist.c:6646 ../pidgin/gtkconv.c:3073
+msgstr "_అకౌంటును ఎడిట్ చేయి"
+
+#: ../pidgin/gtkblist.c:7348
+#: ../pidgin/gtkconv.c:3146
 msgid "No actions available"
 msgstr "ఏ పనులూ లభించవు."
 
-#: ../pidgin/gtkblist.c:6654
-#, fuzzy
+#: ../pidgin/gtkblist.c:7356
 msgid "_Disable"
-msgstr "దృశ్యమాన"
-
-#  And now for the buttons
-#: ../pidgin/gtkblist.c:6666
-#, fuzzy
+msgstr "_పనిచేయనీయకుండా చేయు"
+
+#: ../pidgin/gtkblist.c:7368
 msgid "Enable Account"
-msgstr "ఖాతా "
-
-#: ../pidgin/gtkblist.c:6672
+msgstr "అకౌంటును క్రియాశీలం చేయు"
+
+#: ../pidgin/gtkblist.c:7374
 msgid "<PurpleMain>/Accounts/Enable Account"
-msgstr ""
-
-#: ../pidgin/gtkblist.c:6721
-#, fuzzy
+msgstr "<పర్పుల్ మెయిన్>/అకౌంట్లు/అకౌంటును క్రియాశీలంచేయు"
+
+# Tools
+#: ../pidgin/gtkblist.c:7423
 msgid "/Tools"
-msgstr "/_ఉపకరణాలు "
-
-#: ../pidgin/gtkblist.c:6791
-#, fuzzy
+msgstr "/ఉపకరణాలు "
+
+#: ../pidgin/gtkblist.c:7493
 msgid "/Buddies/Sort Buddies"
-msgstr "/మిత్రులు/ఆఫ్‌లైన్‌ అయిన మిత్రులను చూపించండి. "
+msgstr "/మిత్రులు/మిత్రులను వర్గీకరించు"
 
 #. Widget creation function
-#: ../pidgin/gtkcertmgr.c:530
+#: ../pidgin/gtkcertmgr.c:531
 #, fuzzy
 msgid "SSL Servers"
-msgstr "సెర్వర్ "
-
-#: ../pidgin/gtkconn.c:180
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"%s will not attempt to reconnect the account until you correct the error and "
-"re-enable the account."
-msgstr ""
+msgstr "సర్వర్ "
 
 # #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
 # gnome-session/gsm-client-row.c:43
 # #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
-# gnome-session/gsm-client-row.c:43
-#: ../pidgin/gtkconv.c:482
+#: ../pidgin/gtkconv.c:524
 #, fuzzy
 msgid "Unknown command."
 msgstr "అజ్ఞాత కమాండ్. "
 
-#: ../pidgin/gtkconv.c:754 ../pidgin/gtkconv.c:780
-#, fuzzy
+#: ../pidgin/gtkconv.c:796
+#: ../pidgin/gtkconv.c:822
 msgid "That buddy is not on the same protocol as this chat."
-msgstr "ఈ చాట్‌లాగానే ఆ మిత్రుడుకూడా అదే ప్రొటోకాల్‌లో లేడు. "
-
-#: ../pidgin/gtkconv.c:774
-msgid ""
-"You are not currently signed on with an account that can invite that buddy."
+msgstr "ఆ మిత్రుని ప్రొటోకాల్ ఈ చాట్ లో ఉన్న ప్రొటోకాల్ లాంటిది కాదు."
+
+#: ../pidgin/gtkconv.c:816
+msgid "You are not currently signed on with an account that can invite that buddy."
 msgstr "ఆ మిత్రుని ఆహ్వానించగలిగే వర్తమానపు ఖాతాలో మీరు సంతకం చేయలేదు."
 
-#: ../pidgin/gtkconv.c:827
+#: ../pidgin/gtkconv.c:869
 msgid "Invite Buddy Into Chat Room"
 msgstr "చాట్ గదిలోనికి మీ మిత్రుని ఆహ్వానించండి."
 
+# Put our happy label in it.
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:857
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
+#: ../pidgin/gtkconv.c:899
+msgid "Please enter the name of the user you wish to invite, along with an optional invite message."
 msgstr "మీరు ఆహ్వానించదల్చుకున్న మిత్రుని పేరును ఆప్షనల్ ఆహ్వాన సందేశంతో పాటుగా ఎంటర్ చేయండి."
 
-#: ../pidgin/gtkconv.c:878
+#: ../pidgin/gtkconv.c:920
 msgid "_Buddy:"
 msgstr "_మిత్రుడు:"
 
-#: ../pidgin/gtkconv.c:889 ../pidgin/gtksavedstatuses.c:1194
-#: ../pidgin/gtksavedstatuses.c:1528
+#: ../pidgin/gtkconv.c:931
+#: ../pidgin/gtksavedstatuses.c:1200
+#: ../pidgin/gtksavedstatuses.c:1536
 msgid "_Message:"
 msgstr "_సందేశం:"
 
-#: ../pidgin/gtkconv.c:947 ../pidgin/gtkconv.c:2598 ../pidgin/gtkdebug.c:219
-#: ../pidgin/gtkft.c:543
-msgid "Unable to open file."
-msgstr "ఫైలు ఓపెన్ చేయ నలవి కాదు."
-
-#  Conversations
-#: ../pidgin/gtkconv.c:953
+# Conversations
+#: ../pidgin/gtkconv.c:995
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1> %s తో సంభాషణ</h1>\n"
 
-#  Conversations
-#: ../pidgin/gtkconv.c:991
+# Conversations
+#: ../pidgin/gtkconv.c:1033
 msgid "Save Conversation"
 msgstr "సంభాషణను సేవ్ చేయండి"
 
-#: ../pidgin/gtkconv.c:1140 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:743
+#: ../pidgin/gtkconv.c:1179
+#: ../pidgin/gtkdebug.c:168
+#: ../pidgin/gtkdebug.c:748
 msgid "Find"
 msgstr "కనుగొనుము"
 
-#: ../pidgin/gtkconv.c:1166 ../pidgin/gtkdebug.c:195
+#: ../pidgin/gtkconv.c:1205
+#: ../pidgin/gtkdebug.c:196
 msgid "_Search for:"
 msgstr "_అన్వేషించుము :"
 
-#: ../pidgin/gtkconv.c:1622
+#: ../pidgin/gtkconv.c:1676
 msgid "Un-Ignore"
 msgstr "అపేక్ష "
 
-#: ../pidgin/gtkconv.c:1625
-msgid "Ignore"
-msgstr "ఉపేక్ష "
-
-#: ../pidgin/gtkconv.c:1645
-#, fuzzy
+#: ../pidgin/gtkconv.c:1699
 msgid "Get Away Message"
-msgstr "కొత్త సుదూర సందేశం. "
-
-#: ../pidgin/gtkconv.c:1668
-#, fuzzy
+msgstr "సందేశానికి దూరంగా"
+
+#: ../pidgin/gtkconv.c:1722
 msgid "Last said"
-msgstr "చివరి పేరు:"
-
-#: ../pidgin/gtkconv.c:2606
+msgstr "చివరిగా చెప్పినది"
+
+#: ../pidgin/gtkconv.c:2671
 msgid "Unable to save icon file to disk."
 msgstr "ఐకన్ ఫైలును డిస్క్‌పై సేవ్ చేయుట సాధ్యం కాదు."
 
-#: ../pidgin/gtkconv.c:2657
+#: ../pidgin/gtkconv.c:2722
 msgid "Save Icon"
 msgstr "ఐకన్‌ను సేవ్ చేయుము "
 
-#: ../pidgin/gtkconv.c:2709
+#: ../pidgin/gtkconv.c:2774
 msgid "Animate"
 msgstr "యానిమేట్ "
 
-#: ../pidgin/gtkconv.c:2714
+#: ../pidgin/gtkconv.c:2779
 msgid "Hide Icon"
 msgstr "ఐకన్‌ను దాయుము "
 
-#: ../pidgin/gtkconv.c:2717
+#: ../pidgin/gtkconv.c:2782
 msgid "Save Icon As..."
 msgstr "పేరుతో ఐకన్‌ను సేవ్ చేయుము..."
 
-#: ../pidgin/gtkconv.c:2721
-#, fuzzy
+#: ../pidgin/gtkconv.c:2786
 msgid "Set Custom Icon..."
-msgstr "ఇచ్ఛాపూర్వక "
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-#: ../pidgin/gtkconv.c:2734
-#, fuzzy
+msgstr "కస్టమ్ ఐకన్లను సెట్ చేయండి..."
+
+#: ../pidgin/gtkconv.c:2799
 msgid "Remove Custom Icon"
-msgstr "సంబంధాన్ని తొలగించండి "
-
-#: ../pidgin/gtkconv.c:2861
+msgstr "కస్టమ్ ఐకన్లను తీసేయండి"
+
+#: ../pidgin/gtkconv.c:2931
 msgid "Show All"
 msgstr ""
 
-#  Conversations
+# Conversations
+# Conversation menu
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2880
+#: ../pidgin/gtkconv.c:2950
 msgid "/_Conversation"
 msgstr "/_సంభాషణ"
 
-#: ../pidgin/gtkconv.c:2882
+#: ../pidgin/gtkconv.c:2952
 msgid "/Conversation/New Instant _Message..."
 msgstr "/సంభాషణ/సరికొత్త సత్వర _సందేశం ..."
 
-#  Conversations
-#: ../pidgin/gtkconv.c:2887
+# Conversations
+#: ../pidgin/gtkconv.c:2957
 msgid "/Conversation/_Find..."
 msgstr "/సంభాషణ/_కనుగొనుము..."
 
-#  Conversations
-#: ../pidgin/gtkconv.c:2889
+# Conversations
+#: ../pidgin/gtkconv.c:2959
 msgid "/Conversation/View _Log"
 msgstr "/సంభాషణ/_లాగ్‌ను చూడండి."
 
-#  Conversations
-#: ../pidgin/gtkconv.c:2890
+# Conversations
+#: ../pidgin/gtkconv.c:2960
 msgid "/Conversation/_Save As..."
 msgstr "/సంభాషణ/_పేరుతో సేవ్ చేయండి..."
 
-#  Conversations
-#: ../pidgin/gtkconv.c:2892
-#, fuzzy
+#: ../pidgin/gtkconv.c:2962
 msgid "/Conversation/Clea_r Scrollback"
-msgstr "/సంభాషణ/స్పష్టంగా"
-
-#  Conversations
-#: ../pidgin/gtkconv.c:2896
+msgstr "/సంభాషణ/క్లియర్_ స్క్రోల్ బ్యాక్"
+
+# Conversations
+#: ../pidgin/gtkconv.c:2966
 msgid "/Conversation/Se_nd File..."
 msgstr "/సంభాషణ/ఫైలును పంపుము..."
 
-#: ../pidgin/gtkconv.c:2897
+#: ../pidgin/gtkconv.c:2967
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/సంభాషణ/స్నేహితుడు _దుముకుటను చేర్చుము..."
 
-#  Conversations
-#: ../pidgin/gtkconv.c:2899
+# Conversations
+#: ../pidgin/gtkconv.c:2969
 msgid "/Conversation/_Get Info"
 msgstr "/సంభాషణ/_సమాచారం సేకరించుము. "
 
-#  Conversations
-#: ../pidgin/gtkconv.c:2901
+# Conversations
+#: ../pidgin/gtkconv.c:2971
 msgid "/Conversation/In_vite..."
 msgstr "/సంభాషణ/ఆహ్వానించుము..."
 
-#  Conversations
-#: ../pidgin/gtkconv.c:2903
-#, fuzzy
+# Conversations
+#: ../pidgin/gtkconv.c:2973
 msgid "/Conversation/M_ore"
-msgstr "/సంభాషణ/_ముగించుము"
-
-#  Conversations
-#: ../pidgin/gtkconv.c:2907
-#, fuzzy
+msgstr "/సంభాషణ/_ఇంకా"
+
+# Conversations
+#: ../pidgin/gtkconv.c:2977
 msgid "/Conversation/Al_ias..."
-msgstr "/సంభాషణ/ఉపనామం..."
-
-#  Conversations
-#: ../pidgin/gtkconv.c:2909
+msgstr "/సంభాషణ/_మారు పేరు..."
+
+# Conversations
+#: ../pidgin/gtkconv.c:2979
 msgid "/Conversation/_Block..."
 msgstr "/సంభాషణ/_అపుము..."
 
-#  Conversations
-#: ../pidgin/gtkconv.c:2911
-#, fuzzy
+# Conversations
+#: ../pidgin/gtkconv.c:2981
 msgid "/Conversation/_Unblock..."
-msgstr "/సంభాషణ/_అపుము..."
-
-#  Conversations
-#: ../pidgin/gtkconv.c:2913
+msgstr "/సంభాషణ/_సాగేలా చూడు..."
+
+# Conversations
+#: ../pidgin/gtkconv.c:2983
 msgid "/Conversation/_Add..."
 msgstr "/సంభాషణ/_చేర్చుము..."
 
-#  Conversations
-#: ../pidgin/gtkconv.c:2915
+# Conversations
+#: ../pidgin/gtkconv.c:2985
 msgid "/Conversation/_Remove..."
 msgstr "/సంభాషణ/_తొలగించుము..."
 
 #  Conversations
-#: ../pidgin/gtkconv.c:2920
+#: ../pidgin/gtkconv.c:2990
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/సంభాషణ/లింకును చేర్చుము..."
 
 #  Conversations
-#: ../pidgin/gtkconv.c:2922
+#: ../pidgin/gtkconv.c:2992
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/సంభాషణ/సచిత్రమును చేర్చుము..."
 
-#  Conversations
-#: ../pidgin/gtkconv.c:2928
+# Conversations
+#: ../pidgin/gtkconv.c:2998
 msgid "/Conversation/_Close"
 msgstr "/సంభాషణ/_ముగించుము"
 
+# Options
 #. Options
-#: ../pidgin/gtkconv.c:2932
+#: ../pidgin/gtkconv.c:3002
 msgid "/_Options"
 msgstr "/_ఆప్షన్స్ "
 
-#: ../pidgin/gtkconv.c:2933
+#: ../pidgin/gtkconv.c:3003
 msgid "/Options/Enable _Logging"
 msgstr "/ఆప్షన్స్/ఎనేబుల్ _లాగింగ్"
 
-#: ../pidgin/gtkconv.c:2934
+#: ../pidgin/gtkconv.c:3004
 msgid "/Options/Enable _Sounds"
 msgstr "/ఆప్షన్స్/ఎనేబుల్ _సౌండ్స్"
 
-#: ../pidgin/gtkconv.c:2936
-#, fuzzy
+#: ../pidgin/gtkconv.c:3006
 msgid "/Options/Show Formatting _Toolbars"
-msgstr "/ఆప్షన్స్/ఫార్మాటింగ్ _టూల్‌బార్‌ను చూపించుము "
-
-#: ../pidgin/gtkconv.c:2937
-#, fuzzy
+msgstr "/అవకాశాలు/ఫార్మాట్ చేసే _టూల్ బార్ లను చూపించు"
+
+#: ../pidgin/gtkconv.c:3007
 msgid "/Options/Show Ti_mestamps"
-msgstr "/ఆప్షన్స్/టైమ్‌స్టాంప్స్ చూపించుము "
-
-#  Conversations
-#: ../pidgin/gtkconv.c:3061
-#, fuzzy
+msgstr "/ఆప్షలు/_టైమ్‌స్టాంప్స్ చూపించు"
+
+# Conversations
+#: ../pidgin/gtkconv.c:3134
 msgid "/Conversation/More"
-msgstr "/సంభాషణ/_ముగించుము"
-
-#: ../pidgin/gtkconv.c:3117
+msgstr "/సంభాషణ/ఇంకా"
+
+# Options
+#: ../pidgin/gtkconv.c:3190
 #, fuzzy
 msgid "/Options"
 msgstr "/_ఆప్షన్స్ "
 
-#  Conversations
+# Conversations
+# Conversation menu
 #. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
 #. * the 'Conversation' menu pops up.
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:3152 ../pidgin/gtkconv.c:3184
-#, fuzzy
+#: ../pidgin/gtkconv.c:3225
+#: ../pidgin/gtkconv.c:3257
 msgid "/Conversation"
-msgstr "/_సంభాషణ"
-
-#  Conversations
-#: ../pidgin/gtkconv.c:3192
+msgstr "/సంభాషణ"
+
+# Conversations
+#: ../pidgin/gtkconv.c:3265
 msgid "/Conversation/View Log"
 msgstr "/సంభాషణ/ వ్యూ లాగ్ "
 
-#  Conversations
-#: ../pidgin/gtkconv.c:3198
+# Conversations
+#: ../pidgin/gtkconv.c:3271
 msgid "/Conversation/Send File..."
 msgstr "/సంభాషణ/ఫైలును పంపుము..."
 
-#: ../pidgin/gtkconv.c:3202
+#: ../pidgin/gtkconv.c:3275
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/సంభాషణ/మిత్రుని దూకుడును చేర్చుము..."
 
-#  Conversations
-#: ../pidgin/gtkconv.c:3208
+# Conversations
+#: ../pidgin/gtkconv.c:3281
 msgid "/Conversation/Get Info"
 msgstr "/సంభాషణ/సమాచారం సేకరింపుము."
 
-#  Conversations
-#: ../pidgin/gtkconv.c:3212
+# Conversations
+#: ../pidgin/gtkconv.c:3285
 msgid "/Conversation/Invite..."
 msgstr "/సంభాషణ/ఆహ్వానం..."
 
-#  Conversations
-#: ../pidgin/gtkconv.c:3218
+# Conversations
+#: ../pidgin/gtkconv.c:3291
 msgid "/Conversation/Alias..."
-msgstr "/సంభాషణ/ఉపనామం..."
-
-#  Conversations
-#: ../pidgin/gtkconv.c:3222
+msgstr "/సంభాషణ/మారుపేరు..."
+
+# Conversations
+#: ../pidgin/gtkconv.c:3295
 msgid "/Conversation/Block..."
 msgstr "/సంభాషణ/ఆపుము..."
 
-#  Conversations
-#: ../pidgin/gtkconv.c:3226
-#, fuzzy
+# Conversations
+#: ../pidgin/gtkconv.c:3299
 msgid "/Conversation/Unblock..."
-msgstr "/సంభాషణ/ఆపుము..."
-
-#  Conversations
-#: ../pidgin/gtkconv.c:3230
+msgstr "/సంభాషణ/సాగేలా చూడు..."
+
+# Conversations
+#: ../pidgin/gtkconv.c:3303
 msgid "/Conversation/Add..."
 msgstr "/సంభాషణ/చేర్చుము..."
 
-#  Conversations
-#: ../pidgin/gtkconv.c:3234
+# Conversations
+#: ../pidgin/gtkconv.c:3307
 msgid "/Conversation/Remove..."
 msgstr "/సంభాషణ/తొలగించుము..."
 
 #  Conversations
-#: ../pidgin/gtkconv.c:3240
+#: ../pidgin/gtkconv.c:3313
 msgid "/Conversation/Insert Link..."
 msgstr "/సంభాషణ/లింకును చేర్చుము..."
 
 #  Conversations
-#: ../pidgin/gtkconv.c:3244
+#: ../pidgin/gtkconv.c:3317
 msgid "/Conversation/Insert Image..."
 msgstr "/సంభాషణ/సచిత్రమును చేర్చుము..."
 
-#: ../pidgin/gtkconv.c:3250
+#: ../pidgin/gtkconv.c:3323
 msgid "/Options/Enable Logging"
 msgstr "/ఆప్షన్స్/ఎనేబుల్ లాగింగ్ "
 
-#: ../pidgin/gtkconv.c:3253
+#: ../pidgin/gtkconv.c:3326
 msgid "/Options/Enable Sounds"
 msgstr "/ఆప్షన్స్/ఎనేబుల్ సౌండ్స్ "
 
-#: ../pidgin/gtkconv.c:3266
-#, fuzzy
+#: ../pidgin/gtkconv.c:3339
 msgid "/Options/Show Formatting Toolbars"
-msgstr "/ఆప్షన్స్/ఫార్మాటింగ్ టూల్‌బార్‌ను చూపించుము "
-
-#: ../pidgin/gtkconv.c:3269
+msgstr "/అవకాశాలు/ఫార్మాట్ చేసే టూల్ బార్ లను చూపించు"
+
+#: ../pidgin/gtkconv.c:3342
 msgid "/Options/Show Timestamps"
 msgstr "/ఆప్షన్స్/టైమ్‌స్టాంప్స్ చూపించుము "
 
-#: ../pidgin/gtkconv.c:3346 ../pidgin/gtkconv.c:3388
+#: ../pidgin/gtkconv.c:3419
+#: ../pidgin/gtkconv.c:3461
 msgid "User is typing..."
 msgstr "వినియోగదారుడు టైప్ చేస్తున్నాడు ... "
 
-#: ../pidgin/gtkconv.c:3391
-#, fuzzy
+#: ../pidgin/gtkconv.c:3464
 msgid "User has typed something and stopped"
-msgstr "వినియోగదారుడు కొంతవరకు టైప్ చేసి ఆగినారు."
+msgstr "వినియోగదారు ఏదో  టైప్ చేసి ఆగిపోయారు"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3574 ../pidgin/gtkconv.c:8022
-#, fuzzy
-msgid "_Send To"
-msgstr "_పేరుతో పంపుము"
-
-#: ../pidgin/gtkconv.c:4286
-#, fuzzy
+#: ../pidgin/gtkconv.c:3648
+#: ../pidgin/gtkconv.c:8248
+#, fuzzy
+msgid "S_end To"
+msgstr "_వీరికి పంపండి"
+
+#: ../pidgin/gtkconv.c:4360
 msgid "_Send"
-msgstr "పంపుము "
-
+msgstr "_పంపించు "
+
+# Setup the label telling how many people are in the room.
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4390
+#: ../pidgin/gtkconv.c:4473
 msgid "0 people in room"
 msgstr "గదిలో 0 మంది ఉన్నారు"
 
-#: ../pidgin/gtkconv.c:5759 ../pidgin/gtkconv.c:5880
+#: ../pidgin/gtkconv.c:5846
+#: ../pidgin/gtkconv.c:5967
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "గదిలో %d మనుషులున్నారు "
 msgstr[1] "कक्ष में 0 लोग हैं"
 
-#: ../pidgin/gtkconv.c:6486 ../pidgin/gtkstatusbox.c:660
-#, fuzzy
+#: ../pidgin/gtkconv.c:6574
+#: ../pidgin/gtkstatusbox.c:660
 msgid "Typing"
-msgstr "పింగ్ "
-
-#: ../pidgin/gtkconv.c:6490
-#, fuzzy
+msgstr "టైపు చేస్తున్నారు"
+
+#: ../pidgin/gtkconv.c:6578
 msgid "Stopped Typing"
-msgstr "పింగ్ "
-
-#: ../pidgin/gtkconv.c:6493
-#, fuzzy
+msgstr "టైపుచేయడం ఆపేశారు"
+
+#: ../pidgin/gtkconv.c:6581
 msgid "Nick Said"
-msgstr "ఉప నామము "
-
-#: ../pidgin/gtkconv.c:6496 ../pidgin/gtkdocklet.c:492
-#, fuzzy
+msgstr "నిక్ చెప్పారు"
+
+#: ../pidgin/gtkconv.c:6584
+#: ../pidgin/gtkdocklet.c:685
 msgid "Unread Messages"
-msgstr "సందేశాన్ని పంపండి. "
-
-#: ../pidgin/gtkconv.c:6499
-#, fuzzy
+msgstr "చదవని సందేశాలు"
+
+#: ../pidgin/gtkconv.c:6590
 msgid "New Event"
-msgstr "ఘటన"
-
-#  Remove on type button
-#: ../pidgin/gtkconv.c:7572
+msgstr "కొత్త సంఘటనలు"
+
+#: ../pidgin/gtkconv.c:7767
 #, fuzzy
 msgid "clear: Clears all conversation scrollbacks."
-msgstr "సంభాషణ విండోను %s క్లోజ్ చేశారు."
-
-#  And now for the buttons
-#: ../pidgin/gtkconv.c:7736
-#, fuzzy
+msgstr "క్లియర్: సంభాషణ స్క్రోల్ బ్యాక్ ను క్లియర్ చేస్తుంది."
+
+#: ../pidgin/gtkconv.c:7930
 msgid "Confirm close"
-msgstr "ఎకౌంట్‌ను నిర్ధారించండి. "
-
-#: ../pidgin/gtkconv.c:7768
-#, fuzzy
+msgstr "మూసేయడాన్ని నిర్ధారించండి"
+
+#: ../pidgin/gtkconv.c:7962
 msgid "You have unread messages. Are you sure you want to close the window?"
-msgstr "మీరు %sను తప్పకుండా తొలగించదల్చుకున్నారా?"
-
-#: ../pidgin/gtkconv.c:8355
+msgstr "మీరు చదవని సందేశాలున్నాయి. మీరు ఈ విండోను మూసివేయాలని నిర్ధారించుకున్నారా?"
+
+#: ../pidgin/gtkconv.c:8581
 msgid "Close other tabs"
-msgstr ""
-
-#: ../pidgin/gtkconv.c:8361
+msgstr "ఇతర టాబ్ లను మూసేయండి"
+
+#: ../pidgin/gtkconv.c:8587
 msgid "Close all tabs"
-msgstr ""
-
-#: ../pidgin/gtkconv.c:8369
+msgstr "అన్ని టాబ్ లను మూసేయండి"
+
+#: ../pidgin/gtkconv.c:8595
 msgid "Detach this tab"
-msgstr ""
-
-#: ../pidgin/gtkconv.c:8375
+msgstr "ఈ టాబ్ ను వేరుచేయండి"
+
+#: ../pidgin/gtkconv.c:8601
 msgid "Close this tab"
-msgstr ""
-
-#  Conversations
-#: ../pidgin/gtkconv.c:8875
+msgstr "ఈ టాబ్ ను మూసేయండి"
+
+# Conversations
+#: ../pidgin/gtkconv.c:9106
 msgid "Close conversation"
 msgstr "సంభాషణను క్లోజ్ చేయుము "
 
-#: ../pidgin/gtkconv.c:9477
+#: ../pidgin/gtkconv.c:9708
 msgid "Last created window"
 msgstr "చివరగా సృష్టించిన విండో."
 
-#: ../pidgin/gtkconv.c:9479
+#: ../pidgin/gtkconv.c:9710
 msgid "Separate IM and Chat windows"
 msgstr "IM మరియు Chat విండోలను వేరుచేయుము. "
 
-#: ../pidgin/gtkconv.c:9481 ../pidgin/gtkprefs.c:1415
+#: ../pidgin/gtkconv.c:9712
+#: ../pidgin/gtkprefs.c:1510
 msgid "New window"
 msgstr "కొత్త విండో."
 
-#: ../pidgin/gtkconv.c:9483
+#: ../pidgin/gtkconv.c:9714
 msgid "By group"
 msgstr "గ్రూప్‌ చేత "
 
-#  And now for the buttons
-#: ../pidgin/gtkconv.c:9485
+# And now for the buttons
+#: ../pidgin/gtkconv.c:9716
 msgid "By account"
 msgstr "ఖాతా చేత "
 
-#: ../pidgin/gtkdebug.c:234
+#: ../pidgin/gtkdebug.c:235
 msgid "Save Debug Log"
 msgstr "డీబగ్ లాగ్‌ను సేవ్ చేయుము."
 
-#: ../pidgin/gtkdebug.c:582
-#, fuzzy
+#: ../pidgin/gtkdebug.c:583
 msgid "Invert"
-msgstr "_చేర్చండి."
-
-#: ../pidgin/gtkdebug.c:585
+msgstr "ఇన్ వెస్ట్ చేయు"
+
+#: ../pidgin/gtkdebug.c:586
 msgid "Highlight matches"
-msgstr ""
-
-#: ../pidgin/gtkdebug.c:652
-msgid "_Icon Only"
-msgstr ""
+msgstr "సరిపోలేవాటిని ప్రత్యేకంగా చూపించు"
 
 #: ../pidgin/gtkdebug.c:653
-msgid "_Text Only"
-msgstr ""
+msgid "_Icon Only"
+msgstr "_ఐకన్ మాత్రమే"
 
 #: ../pidgin/gtkdebug.c:654
+msgid "_Text Only"
+msgstr "_టెక్స్ట్ మాత్రమే"
+
+#: ../pidgin/gtkdebug.c:655
 msgid "_Both Icon & Text"
-msgstr ""
-
-#: ../pidgin/gtkdebug.c:775
-#, fuzzy
+msgstr "_ఐకన్లు మరియు టెక్స్ట్ లు రెండూ"
+
+#: ../pidgin/gtkdebug.c:780
 msgid "Filter"
-msgstr "విఫలమైనది "
-
-#: ../pidgin/gtkdebug.c:794
-#, fuzzy
+msgstr "ఫిల్టర్"
+
+#: ../pidgin/gtkdebug.c:799
 msgid "Right click for more options."
-msgstr "ఇంకా ఆప్షన్లను చూపుము."
-
-#: ../pidgin/gtkdebug.c:824
+msgstr "మరిన్ని ఆప్షన్లకోసం రైట్ క్లిక్ చేయండి"
+
+#: ../pidgin/gtkdebug.c:829
 msgid "Level "
-msgstr ""
-
-#: ../pidgin/gtkdebug.c:825 ../pidgin/gtkdebug.c:831
+msgstr "స్థాయి"
+
+#: ../pidgin/gtkdebug.c:830
+#: ../pidgin/gtkdebug.c:836
 msgid "Select the debug filter level."
-msgstr ""
-
-#: ../pidgin/gtkdebug.c:833
-#, fuzzy
+msgstr "డిబగ్ ఫిల్టర్ స్థాయిని ఎంచుకోండి"
+
+#: ../pidgin/gtkdebug.c:838
 msgid "All"
-msgstr "అనుమతించు"
-
-#: ../pidgin/gtkdebug.c:834
+msgstr "అన్నీ"
+
+#: ../pidgin/gtkdebug.c:839
 msgid "Misc"
-msgstr ""
-
-#: ../pidgin/gtkdebug.c:836
-#, fuzzy
+msgstr "ఇతరేతర"
+
+#: ../pidgin/gtkdebug.c:841
 msgid "Warning"
-msgstr "హెచ్చరిక "
-
-#: ../pidgin/gtkdebug.c:837
+msgstr "హెచ్చరిక"
+
+#: ../pidgin/gtkdebug.c:842
 #, fuzzy
 msgid "Error "
 msgstr "పొరపాటు "
 
-#: ../pidgin/gtkdebug.c:838
-#, fuzzy
+#: ../pidgin/gtkdebug.c:843
 msgid "Fatal Error"
-msgstr "అంతర్గత పొరపాటు "
-
-#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:117
+msgstr "తీవ్రమైన లోపం"
+
+#: ../pidgin/gtkdialogs.c:72
+#: ../pidgin/gtkdialogs.c:117
 msgid "lead developer"
 msgstr "ముఖ్య డెవలపర్ "
 
-#: ../pidgin/gtkdialogs.c:73 ../pidgin/gtkdialogs.c:74
-#: ../pidgin/gtkdialogs.c:75 ../pidgin/gtkdialogs.c:76
-#: ../pidgin/gtkdialogs.c:77 ../pidgin/gtkdialogs.c:78
-#: ../pidgin/gtkdialogs.c:79 ../pidgin/gtkdialogs.c:80
-#: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
-#: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:84
-#: ../pidgin/gtkdialogs.c:85 ../pidgin/gtkdialogs.c:86
-#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:91
+#: ../pidgin/gtkdialogs.c:73
+#: ../pidgin/gtkdialogs.c:74
+#: ../pidgin/gtkdialogs.c:75
+#: ../pidgin/gtkdialogs.c:76
+#: ../pidgin/gtkdialogs.c:77
+#: ../pidgin/gtkdialogs.c:78
+#: ../pidgin/gtkdialogs.c:79
+#: ../pidgin/gtkdialogs.c:80
+#: ../pidgin/gtkdialogs.c:81
+#: ../pidgin/gtkdialogs.c:82
+#: ../pidgin/gtkdialogs.c:83
+#: ../pidgin/gtkdialogs.c:84
+#: ../pidgin/gtkdialogs.c:85
+#: ../pidgin/gtkdialogs.c:86
+#: ../pidgin/gtkdialogs.c:87
+#: ../pidgin/gtkdialogs.c:90
 #: ../pidgin/gtkdialogs.c:92
+#: ../pidgin/gtkdialogs.c:93
 msgid "developer"
 msgstr "డెవలపర్ "
 
-#: ../pidgin/gtkdialogs.c:87
+#: ../pidgin/gtkdialogs.c:88
 msgid "support"
 msgstr "సపోర్ట్ "
 
-#: ../pidgin/gtkdialogs.c:88
-#, fuzzy
+#: ../pidgin/gtkdialogs.c:89
 msgid "support/QA"
-msgstr "సపోర్ట్ "
-
-#: ../pidgin/gtkdialogs.c:90 ../pidgin/gtkdialogs.c:112
+msgstr "సపోర్ట్/QA"
+
+#: ../pidgin/gtkdialogs.c:91
+#: ../pidgin/gtkdialogs.c:112
 msgid "developer & webmaster"
 msgstr "డెవలపర్ & వెబ్ మాస్టర్"
 
@@ -15333,14 +15482,14 @@
 msgid "win32 port"
 msgstr "విన్32 పోర్ట్ "
 
-#: ../pidgin/gtkdialogs.c:109 ../pidgin/gtkdialogs.c:110
+#: ../pidgin/gtkdialogs.c:109
+#: ../pidgin/gtkdialogs.c:110
 msgid "maintainer"
 msgstr "మెయింటైనర్ "
 
 #: ../pidgin/gtkdialogs.c:111
-#, fuzzy
 msgid "libfaim maintainer"
-msgstr "పూర్వ లిబ్‌ఫెయిమ్ మెయింటెయినర్ "
+msgstr "లిబ్ ఫైమ్ నిర్వహణదారు"
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
 #: ../pidgin/gtkdialogs.c:114
@@ -15358,62 +15507,71 @@
 
 #: ../pidgin/gtkdialogs.c:133
 msgid "Afrikaans"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:226
-#, fuzzy
+msgstr "ఆఫ్రికానాస్"
+
+#: ../pidgin/gtkdialogs.c:134
+#: ../pidgin/gtkdialogs.c:226
 msgid "Arabic"
-msgstr "అమ్హారిక్ "
+msgstr "అరబిక్"
 
 #: ../pidgin/gtkdialogs.c:135
 msgid "Belarusian Latin"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
+#: ../pidgin/gtkdialogs.c:136
+#: ../pidgin/gtkdialogs.c:137
 #: ../pidgin/gtkdialogs.c:227
 msgid "Bulgarian"
 msgstr "బల్గేరియన్ "
 
-#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
+#: ../pidgin/gtkdialogs.c:138
+#: ../pidgin/gtkdialogs.c:139
+#: ../pidgin/gtkdialogs.c:140
+#: ../pidgin/gtkdialogs.c:141
 msgid "Bengali"
-msgstr ""
+msgstr "బెంగాలి"
 
 #: ../pidgin/gtkdialogs.c:142
-#, fuzzy
 msgid "Bosnian"
-msgstr "ఎస్తోనియన్ "
-
-#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:228
+msgstr "బోస్నియన్"
+
+#: ../pidgin/gtkdialogs.c:143
+#: ../pidgin/gtkdialogs.c:228
 #: ../pidgin/gtkdialogs.c:229
 msgid "Catalan"
 msgstr "కాటలాన్ "
 
-#: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:145
+#: ../pidgin/gtkdialogs.c:144
+#: ../pidgin/gtkdialogs.c:145
 msgid "Valencian-Catalan"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:146 ../pidgin/gtkdialogs.c:230
+msgstr "వలెన్ సియన్-కాటలాన్"
+
+#: ../pidgin/gtkdialogs.c:146
+#: ../pidgin/gtkdialogs.c:230
 msgid "Czech"
 msgstr "జెక్ "
 
-#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:148
+#: ../pidgin/gtkdialogs.c:147
+#: ../pidgin/gtkdialogs.c:148
 msgid "Danish"
 msgstr "డానిష్ "
 
-#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150
+#: ../pidgin/gtkdialogs.c:149
+#: ../pidgin/gtkdialogs.c:150
 #: ../pidgin/gtkdialogs.c:231
 msgid "German"
 msgstr "జర్మన్ "
 
-#: ../pidgin/gtkdialogs.c:151 ../pidgin/gtkdialogs.c:152
+#: ../pidgin/gtkdialogs.c:151
+#: ../pidgin/gtkdialogs.c:152
 #: ../pidgin/gtkdialogs.c:153
 msgid "Dzongkha"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:154 ../pidgin/gtkdialogs.c:155
+msgstr "జోంఖో"
+
+#: ../pidgin/gtkdialogs.c:154
+#: ../pidgin/gtkdialogs.c:155
 msgid "Greek"
-msgstr ""
+msgstr "గ్రీక్"
 
 #: ../pidgin/gtkdialogs.c:156
 msgid "Australian English"
@@ -15429,10 +15587,12 @@
 
 #: ../pidgin/gtkdialogs.c:159
 msgid "Esperanto"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:232
-#: ../pidgin/gtkdialogs.c:233 ../pidgin/gtkdialogs.c:234
+msgstr "ఎస్పెరాంటో"
+
+#: ../pidgin/gtkdialogs.c:160
+#: ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:234
 #: ../pidgin/gtkdialogs.c:235
 msgid "Spanish"
 msgstr "స్పానిష్ "
@@ -15440,44 +15600,50 @@
 #: ../pidgin/gtkdialogs.c:161
 #, fuzzy
 msgid "Estonian"
-msgstr "ఎస్తోనియన్ "
-
-#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163
+msgstr "బోస్నియన్"
+
+#: ../pidgin/gtkdialogs.c:162
+#: ../pidgin/gtkdialogs.c:163
 msgid "Euskera(Basque)"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:165
+msgstr "యుస్కెరా (బాస్క్)"
+
+#: ../pidgin/gtkdialogs.c:164
+#: ../pidgin/gtkdialogs.c:165
 #: ../pidgin/gtkdialogs.c:166
-#, fuzzy
 msgid "Persian"
-msgstr "సెర్బియన్ "
-
-#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:236
+msgstr "పర్షియన్"
+
+#: ../pidgin/gtkdialogs.c:167
+#: ../pidgin/gtkdialogs.c:236
 #: ../pidgin/gtkdialogs.c:237
 msgid "Finnish"
 msgstr "ఫిన్నిష్ "
 
-#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:238
-#: ../pidgin/gtkdialogs.c:239 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:168
+#: ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:239
+#: ../pidgin/gtkdialogs.c:240
 #: ../pidgin/gtkdialogs.c:241
 msgid "French"
 msgstr "ఫ్రెంచ్ "
 
-#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
+#: ../pidgin/gtkdialogs.c:169
+#: ../pidgin/gtkdialogs.c:170
 #: ../pidgin/gtkdialogs.c:242
-#, fuzzy
 msgid "Galician"
-msgstr "ఇటాలియన్ "
-
-#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:172
+msgstr "గాలిసియన్"
+
+#: ../pidgin/gtkdialogs.c:171
+#: ../pidgin/gtkdialogs.c:172
 msgid "Gujarati"
-msgstr ""
+msgstr "గుజరాతి"
 
 #: ../pidgin/gtkdialogs.c:172
 msgid "Gujarati Language Team"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:243
+#: ../pidgin/gtkdialogs.c:173
+#: ../pidgin/gtkdialogs.c:243
 msgid "Hebrew"
 msgstr "హీబ్రూ "
 
@@ -15485,89 +15651,97 @@
 msgid "Hindi"
 msgstr "హిందీ "
 
-#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:175
+#: ../pidgin/gtkdialogs.c:244
 msgid "Hungarian"
 msgstr "హంగేరియన్"
 
 #: ../pidgin/gtkdialogs.c:176
-#, fuzzy
 msgid "Indonesian"
-msgstr "మాసెడోనియన్ "
-
-#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:245
+msgstr "ఇండోనేషియన్"
+
+#: ../pidgin/gtkdialogs.c:177
+#: ../pidgin/gtkdialogs.c:245
 msgid "Italian"
 msgstr "ఇటాలియన్ "
 
-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:246
-#: ../pidgin/gtkdialogs.c:247 ../pidgin/gtkdialogs.c:248
+#: ../pidgin/gtkdialogs.c:178
+#: ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:247
+#: ../pidgin/gtkdialogs.c:248
 msgid "Japanese"
 msgstr "జాపనీస్ "
 
-#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:249
+#: ../pidgin/gtkdialogs.c:179
+#: ../pidgin/gtkdialogs.c:249
 msgid "Georgian"
 msgstr "జార్జియన్"
 
 #: ../pidgin/gtkdialogs.c:179
-#, fuzzy
 msgid "Ubuntu Georgian Translators"
-msgstr "వర్తమాన అనువాదకులు "
+msgstr ""
 
 #: ../pidgin/gtkdialogs.c:180
-#, fuzzy
 msgid "Kannada"
-msgstr "నిషేధించారు."
+msgstr "కన్నడ"
 
 #: ../pidgin/gtkdialogs.c:180
 msgid "Kannada Translation team"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:250
+#: ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:250
 #: ../pidgin/gtkdialogs.c:251
 msgid "Korean"
 msgstr "కొరియన్"
 
-#: ../pidgin/gtkdialogs.c:182 ../pidgin/gtkdialogs.c:183
+#: ../pidgin/gtkdialogs.c:182
+#: ../pidgin/gtkdialogs.c:183
 #: ../pidgin/gtkdialogs.c:184
-#, fuzzy
 msgid "Kurdish"
-msgstr "టర్కిష్ "
+msgstr "కుర్దిష్"
 
 #: ../pidgin/gtkdialogs.c:185
+#, fuzzy
 msgid "Lao"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:252
+msgstr "సింహం"
+
+#: ../pidgin/gtkdialogs.c:186
+#: ../pidgin/gtkdialogs.c:252
 #: ../pidgin/gtkdialogs.c:253
 msgid "Lithuanian"
 msgstr "లిథుయేనియన్ "
 
-#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:188
-#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:254
+#: ../pidgin/gtkdialogs.c:187
+#: ../pidgin/gtkdialogs.c:188
+#: ../pidgin/gtkdialogs.c:189
+#: ../pidgin/gtkdialogs.c:254
 msgid "Macedonian"
 msgstr "మాసెడోనియన్ "
 
-#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:255
+#: ../pidgin/gtkdialogs.c:190
+#: ../pidgin/gtkdialogs.c:255
 #: ../pidgin/gtkdialogs.c:256
-#, fuzzy
 msgid "Bokmål Norwegian"
-msgstr "నార్వేజియన్ "
+msgstr "Bokmål నార్వేజియన్"
 
 #: ../pidgin/gtkdialogs.c:191
 msgid "Nepali"
-msgstr ""
+msgstr "నేపాలి"
 
 #: ../pidgin/gtkdialogs.c:192
-#, fuzzy
 msgid "Dutch, Flemish"
-msgstr "డచ్;  ఫ్లెమిష్ "
+msgstr "డచ్, ఫ్లెమిష్"
 
 #: ../pidgin/gtkdialogs.c:193
 #, fuzzy
 msgid "Norwegian Nynorsk"
-msgstr "నార్వేజియన్ (Nynorsk)"
-
-#: ../pidgin/gtkdialogs.c:194 ../pidgin/gtkdialogs.c:195
-#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:257
+msgstr "నార్వేజియన్ "
+
+#: ../pidgin/gtkdialogs.c:194
+#: ../pidgin/gtkdialogs.c:195
+#: ../pidgin/gtkdialogs.c:196
+#: ../pidgin/gtkdialogs.c:257
 msgid "Polish"
 msgstr "పోలిష్ "
 
@@ -15580,26 +15754,29 @@
 msgstr "పోర్చుగీస్-బ్రెజిల్ "
 
 #: ../pidgin/gtkdialogs.c:199
-#, fuzzy
 msgid "Pashto"
-msgstr "ఫొటో "
+msgstr "పాస్థో"
 
 #: ../pidgin/gtkdialogs.c:200
 msgid "Romanian"
 msgstr "రొమేనియన్ "
 
-#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:258
+#: ../pidgin/gtkdialogs.c:201
+#: ../pidgin/gtkdialogs.c:258
 #: ../pidgin/gtkdialogs.c:259
 msgid "Russian"
 msgstr "రష్యన్ "
 
-#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:203
-#: ../pidgin/gtkdialogs.c:260 ../pidgin/gtkdialogs.c:261
+#: ../pidgin/gtkdialogs.c:202
+#: ../pidgin/gtkdialogs.c:203
+#: ../pidgin/gtkdialogs.c:260
+#: ../pidgin/gtkdialogs.c:261
 #: ../pidgin/gtkdialogs.c:262
 msgid "Slovak"
 msgstr "స్లోవాక్ "
 
-#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:263
+#: ../pidgin/gtkdialogs.c:204
+#: ../pidgin/gtkdialogs.c:263
 msgid "Slovenian"
 msgstr "స్లోవేనియన్ "
 
@@ -15607,30 +15784,33 @@
 msgid "Albanian"
 msgstr "అల్బేనియన్ "
 
-#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:207
-#: ../pidgin/gtkdialogs.c:264 ../pidgin/gtkdialogs.c:265
+#: ../pidgin/gtkdialogs.c:206
+#: ../pidgin/gtkdialogs.c:207
+#: ../pidgin/gtkdialogs.c:264
+#: ../pidgin/gtkdialogs.c:265
 msgid "Serbian"
 msgstr "సెర్బియన్ "
 
-#: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:266
+#: ../pidgin/gtkdialogs.c:208
+#: ../pidgin/gtkdialogs.c:266
 #: ../pidgin/gtkdialogs.c:267
 msgid "Swedish"
 msgstr "స్వీడిష్ "
 
 #: ../pidgin/gtkdialogs.c:209
-#, fuzzy
 msgid "Tamil"
-msgstr "టెర్మినల్ "
+msgstr "తమిళం"
 
 #: ../pidgin/gtkdialogs.c:210
 msgid "Telugu"
-msgstr ""
+msgstr "తెలుగు"
 
 #: ../pidgin/gtkdialogs.c:211
 msgid "Thai"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:212 ../pidgin/gtkdialogs.c:268
+msgstr "థాయ్"
+
+#: ../pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:268
 msgid "Turkish"
 msgstr "టర్కిష్ "
 
@@ -15642,16 +15822,19 @@
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "టి.యం.తన్హ్ మరియు నోమ్-వి.ఐ. దళం"
 
-#: ../pidgin/gtkdialogs.c:214 ../pidgin/gtkdialogs.c:269
+#: ../pidgin/gtkdialogs.c:214
+#: ../pidgin/gtkdialogs.c:269
 msgid "Simplified Chinese"
 msgstr "సరళ చైనీస్ "
 
-#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:216
+#: ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:216
 #: ../pidgin/gtkdialogs.c:217
 msgid "Hong Kong Chinese"
 msgstr ""
 
-#: ../pidgin/gtkdialogs.c:218 ../pidgin/gtkdialogs.c:219
+#: ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:219
 #: ../pidgin/gtkdialogs.c:270
 msgid "Traditional Chinese"
 msgstr "పారంపర చైనీస్ "
@@ -15660,293 +15843,265 @@
 msgid "Amharic"
 msgstr "అమ్హారిక్ "
 
-#: ../pidgin/gtkdialogs.c:357
-#, fuzzy, c-format
+#: ../pidgin/gtkdialogs.c:368
+#, c-format
 msgid "About %s"
-msgstr "గెయిమ్ గురించి "
-
-#: ../pidgin/gtkdialogs.c:400
-#, c-format
-msgid ""
-"%s is a graphical modular messaging client based on libpurple which is "
-"capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
-"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and "
-"QQ all at once.  It is written using GTK+.<BR><BR>You may modify and "
-"redistribute the program under the terms of the GPL (version 2 or later).  A "
-"copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s "
-"is copyrighted by its contributors.  See the 'COPYRIGHT' file for the "
-"complete list of contributors.  We provide no warranty for this program."
-"<BR><BR>"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:418
-#, fuzzy, c-format
+msgstr "సుమారు %s"
+
+#: ../pidgin/gtkdialogs.c:411
+#, c-format
+msgid "%s is a graphical modular messaging client based on libpurple which is capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and QQ all at once.  It is written using GTK+.<BR><BR>You may modify and redistribute the program under the terms of the GPL (version 2 or later).  A copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s is copyrighted by its contributors.  See the 'COPYRIGHT' file for the complete list of contributors.  We provide no warranty for this program.<BR><BR>"
+msgstr "%s ఇది AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, మరియు QQ లను తక్షణం ఉపయోగించే సామర్థ్యం కలిగిన మోడ్యులార్ మెసెజింగ్ క్లయింటు. GTK+.<BR><BR> ను ఉపయోగించి దీన్ని రైట్ చేయడం జరిగింది. GPL (వర్షన్ 2 లేదా తర్వాతి) నిబంధనల కింద మీరు ఈ కార్యక్రమాన్ని సవరించవచ్చు లేదా తిరిగి పంపిణీ చేయవచ్చు %s తో పంపిణీ చేసిన  'COPYING' ఫైలులో GPL ప్రతి ఉంది. %s ను దానిరూపకర్త కాపీరైట్ చేసిఉన్నారు.రూపకర్తల పూర్తిజాబితా కోసం 'COPYRIGHT' ఫైలును చూడండి. ఈ కార్యక్రమానికి మేము వారంటీ ఇవ్వడంలేదు. <BR><BR>"
+
+#: ../pidgin/gtkdialogs.c:429
+#, fuzzy
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"3\">IRC:</FONT> #गेम irc.freenode.net पर<BR><BR>"
-
-#: ../pidgin/gtkdialogs.c:423
-#, fuzzy
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #wingaim irc.freenode.net पर<BR><BR>"
+
+#: ../pidgin/gtkdialogs.c:434
 msgid "Current Developers"
-msgstr "రిటైర్డ్ డెవలపర్స్ "
-
-#: ../pidgin/gtkdialogs.c:438
+msgstr "ప్రస్తుత డెవలపర్లు"
+
+#: ../pidgin/gtkdialogs.c:449
 msgid "Crazy Patch Writers"
 msgstr "క్రేజీ పాచ్ రచయితలు "
 
-#: ../pidgin/gtkdialogs.c:453
+#: ../pidgin/gtkdialogs.c:464
 msgid "Retired Developers"
 msgstr "రిటైర్డ్ డెవలపర్స్ "
 
-#: ../pidgin/gtkdialogs.c:468
+#: ../pidgin/gtkdialogs.c:479
 #, fuzzy
 msgid "Retired Crazy Patch Writers"
 msgstr "క్రేజీ పాచ్ రచయితలు "
 
-#: ../pidgin/gtkdialogs.c:483
+#: ../pidgin/gtkdialogs.c:494
 msgid "Artists"
-msgstr ""
-
-#: ../pidgin/gtkdialogs.c:498
+msgstr "ఆర్టిస్టులు"
+
+#: ../pidgin/gtkdialogs.c:509
 msgid "Current Translators"
 msgstr "వర్తమాన అనువాదకులు "
 
-#: ../pidgin/gtkdialogs.c:518
+#: ../pidgin/gtkdialogs.c:529
 msgid "Past Translators"
 msgstr "భూతకాల అనువాదకులు"
 
-#: ../pidgin/gtkdialogs.c:536
-#, fuzzy
+#: ../pidgin/gtkdialogs.c:547
 msgid "Debugging Information"
-msgstr "వినియోగదారుని సమాచారం. "
-
-#: ../pidgin/gtkdialogs.c:906
+msgstr "సమాచారాన్ని డీబగ్ చేస్తోంది"
+
+#: ../pidgin/gtkdialogs.c:764
+#: ../pidgin/gtkdialogs.c:907
+#: ../pidgin/gtkdialogs.c:988
+#, fuzzy
+msgid "_Name"
+msgstr "పేరు"
+
+#: ../pidgin/gtkdialogs.c:769
+#, fuzzy
+msgid "Buddy"
+msgstr "_మిత్రుడు:"
+
+# And now for the buttons
+#: ../pidgin/gtkdialogs.c:773
+#: ../pidgin/gtkdialogs.c:912
+#: ../pidgin/gtkdialogs.c:993
+msgid "_Account"
+msgstr "_అకౌంటు"
+
+#: ../pidgin/gtkdialogs.c:920
 msgid "Get User Info"
 msgstr "వినియోగదారుని సమాచారం సేకరించండి."
 
-#: ../pidgin/gtkdialogs.c:908
-#, fuzzy
-msgid ""
-"Please enter the screen name or alias of the person whose info you would "
-"like to view."
-msgstr "మీరు సమాచారం చూడదల్చుకున్నవారి స్క్రీన్‌పేరును ఎంటర్ చేయండి."
-
-#: ../pidgin/gtkdialogs.c:998
-#, fuzzy
+#: ../pidgin/gtkdialogs.c:922
+msgid "Please enter the screen name or alias of the person whose info you would like to view."
+msgstr "మీరు చూడదల్చుకున్న వ్యక్తి వివరాలకోసం దయచేసి ఆ వ్యక్తి స్క్రీన్ పేరును లేదా మారుపేరును ఎంటర్ చేయండి."
+
+#: ../pidgin/gtkdialogs.c:1012
 msgid "View User Log"
-msgstr "వినియోగదారుని లాగ్‌ను తీసుకురండి."
-
-#: ../pidgin/gtkdialogs.c:1000
-#, fuzzy
-msgid ""
-"Please enter the screen name or alias of the person whose log you would like "
-"to view."
-msgstr "మీరు లాగ్‌ను చూడదల్చుకున్నవారి స్క్రీన్‌పేరును ఎంటర్ చేయండి."
-
-#: ../pidgin/gtkdialogs.c:1020
+msgstr "యూజర్ లాగ్ ను చూపించు"
+
+#: ../pidgin/gtkdialogs.c:1014
+msgid "Please enter the screen name or alias of the person whose log you would like to view."
+msgstr "మీరు చూడదల్చుకున్న వ్యక్తి లాగ్ కోసం దయచేసి ఆ వ్యక్తి స్క్రీన్ పేరును లేదా మారుపేరును ఎంటర్ చేయండి."
+
+#: ../pidgin/gtkdialogs.c:1034
 msgid "Alias Contact"
-msgstr "సంప్రదించినవారి ఉపనామం ..."
-
-#: ../pidgin/gtkdialogs.c:1021
+msgstr "సంప్రదించినవారి మారుపేరు ..."
+
+#: ../pidgin/gtkdialogs.c:1035
 msgid "Enter an alias for this contact."
-msgstr "ఈ సంప్రదింపుకు ఉపనామం ఎంటర్ చేయండి."
-
-#: ../pidgin/gtkdialogs.c:1043
+msgstr "ఈ సంప్రదింపుకు మారుపేరు ఎంటర్ చేయండి."
+
+#: ../pidgin/gtkdialogs.c:1057
 #, c-format
 msgid "Enter an alias for %s."
-msgstr "%s కు ఉపనామం చేర్చండి."
-
-#: ../pidgin/gtkdialogs.c:1045
+msgstr "%s కు మారుపేరు చేర్చండి."
+
+#: ../pidgin/gtkdialogs.c:1059
 msgid "Alias Buddy"
-msgstr "మిత్రుని ఉపనామం"
-
-#: ../pidgin/gtkdialogs.c:1066
+msgstr "మిత్రుని మారుపేరు"
+
+#: ../pidgin/gtkdialogs.c:1080
 msgid "Alias Chat"
-msgstr "కాలక్షేపరాయుని ఉపనామం "
-
-#: ../pidgin/gtkdialogs.c:1067
+msgstr "చాట్ మారుపేరు"
+
+#: ../pidgin/gtkdialogs.c:1081
 msgid "Enter an alias for this chat."
-msgstr "ఈ సంభాషణకు ఉపనామం ఎంటర్ చేయండి."
-
-#: ../pidgin/gtkdialogs.c:1106
-#, fuzzy, c-format
-msgid ""
-"You are about to remove the contact containing %s and %d other buddy from "
-"your buddy list.  Do you want to continue?"
-msgid_plural ""
-"You are about to remove the contact containing %s and %d other buddies from "
-"your buddy list.  Do you want to continue?"
+msgstr "ఈ సంభాషణకు మారుపేరు ఎంటర్ చేయండి."
+
+#: ../pidgin/gtkdialogs.c:1120
+#, c-format
+msgid "You are about to remove the contact containing %s and %d other buddy from your buddy list.  Do you want to continue?"
+msgid_plural "You are about to remove the contact containing %s and %d other buddies from your buddy list.  Do you want to continue?"
 msgstr[0] ""
-"మీ మిత్రుల లిస్టునుండి %s ను మరియు %d ఇతర మిత్రులను తొలగించదల్చుకున్నారు. కొనసాగించదల్చుకున్నారా?"
 msgstr[1] ""
-"మీ మిత్రుల లిస్టునుండి %s ను మరియు %d ఇతర మిత్రులను తొలగించదల్చుకున్నారు. కొనసాగించదల్చుకున్నారా?"
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-#: ../pidgin/gtkdialogs.c:1114
-msgid "Remove Contact"
-msgstr "సంబంధాన్ని తొలగించండి "
-
-#  *< api_version
+
+# *< api_version
 #  *< type
 #  *< ui_requirement
 #  *< flags
 #  *< dependencies
 #  *< priority
 #  *< id
-#: ../pidgin/gtkdialogs.c:1117
-#, fuzzy
-msgid "_Remove Contact"
+#: ../pidgin/gtkdialogs.c:1128
+msgid "Remove Contact"
 msgstr "సంబంధాన్ని తొలగించండి "
 
-#: ../pidgin/gtkdialogs.c:1148
-#, fuzzy, c-format
-msgid ""
-"You are about to merge the group called %s into the group called %s. Do you "
-"want to continue?"
-msgstr ""
-"మీ మిత్రుల లిస్టునుండి %s గ్రూపును, దాని సభ్యులందరినీ  తొలగించదల్చుకున్నారు. కొనసాగించదల్చుకున్నారా?"
-
-#  *< api_version
+# *< api_version
 #  *< type
 #  *< ui_requirement
 #  *< flags
 #  *< dependencies
 #  *< priority
 #  *< id
-#: ../pidgin/gtkdialogs.c:1155
-#, fuzzy
+#: ../pidgin/gtkdialogs.c:1131
+msgid "_Remove Contact"
+msgstr "_కాంటాక్టు తొలగించు "
+
+#: ../pidgin/gtkdialogs.c:1162
+#, c-format
+msgid "You are about to merge the group called %s into the group called %s. Do you want to continue?"
+msgstr "మీరు %s అనబడే గ్రూపును %s. అనబడే గ్రూపులో విలీనం చేయబోతున్నారు. కొనసాగిస్తారా?"
+
+#: ../pidgin/gtkdialogs.c:1169
 msgid "Merge Groups"
-msgstr "గ్రూపును తొలగించండి."
-
-#: ../pidgin/gtkdialogs.c:1158
-#, fuzzy
+msgstr "గ్రూపులను కలిపేయండి"
+
+#: ../pidgin/gtkdialogs.c:1172
 msgid "_Merge Groups"
-msgstr "గ్రూపును _తొలగించండి  "
-
-#: ../pidgin/gtkdialogs.c:1208
-#, c-format
-msgid ""
-"You are about to remove the group %s and all its members from your buddy "
-"list.  Do you want to continue?"
-msgstr ""
-"మీ మిత్రుల లిస్టునుండి %s గ్రూపును, దాని సభ్యులందరినీ  తొలగించదల్చుకున్నారు. కొనసాగించదల్చుకున్నారా?"
-
-#  *< api_version
+msgstr "_గ్రూపులను కలిపేయండి"
+
+#: ../pidgin/gtkdialogs.c:1222
+#, c-format
+msgid "You are about to remove the group %s and all its members from your buddy list.  Do you want to continue?"
+msgstr "మీ మిత్రుల లిస్టునుండి %s గ్రూపును, దాని సభ్యులందరినీ  తొలగించదల్చుకున్నారు. కొనసాగించదల్చుకున్నారా?"
+
+# *< api_version
 #  *< type
 #  *< ui_requirement
 #  *< flags
 #  *< dependencies
 #  *< priority
 #  *< id
-#: ../pidgin/gtkdialogs.c:1211
+#: ../pidgin/gtkdialogs.c:1225
 msgid "Remove Group"
 msgstr "గ్రూపును తొలగించండి."
 
-#  *< api_version
+# *< api_version
 #  *< type
 #  *< ui_requirement
 #  *< flags
 #  *< dependencies
 #  *< priority
 #  *< id
-#: ../pidgin/gtkdialogs.c:1214
-#, fuzzy
+#: ../pidgin/gtkdialogs.c:1228
 msgid "_Remove Group"
-msgstr "గ్రూపును తొలగించండి."
-
-#: ../pidgin/gtkdialogs.c:1247
-#, c-format
-msgid ""
-"You are about to remove %s from your buddy list.  Do you want to continue?"
+msgstr "_గ్రూపును తొలగించు"
+
+#: ../pidgin/gtkdialogs.c:1261
+#, c-format
+msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "మీ మిత్రుల లిస్టునుండి %s ను  తొలగించదల్చుకున్నారు. కొనసాగించదల్చుకున్నారా? "
 
-#: ../pidgin/gtkdialogs.c:1250
+#: ../pidgin/gtkdialogs.c:1264
 msgid "Remove Buddy"
 msgstr "మిత్రుని తొలగించండి."
 
-#  *< api_version
+# *< api_version
 #  *< type
 #  *< ui_requirement
 #  *< flags
 #  *< dependencies
 #  *< priority
 #  *< id
-#: ../pidgin/gtkdialogs.c:1253
+#: ../pidgin/gtkdialogs.c:1267
 msgid "_Remove Buddy"
 msgstr "మిత్రుని _తొలగించుము "
 
-#: ../pidgin/gtkdialogs.c:1274
-#, c-format
-msgid ""
-"You are about to remove the chat %s from your buddy list.  Do you want to "
-"continue?"
+#: ../pidgin/gtkdialogs.c:1288
+#, c-format
+msgid "You are about to remove the chat %s from your buddy list.  Do you want to continue?"
 msgstr "మీ మిత్రుల లిస్టునుండి %s సంభాషణను తొలగించదల్చుకున్నారు. కొనసాగించదల్చుకున్నారా? "
 
-#  *< api_version
+# *< api_version
 #  *< type
 #  *< ui_requirement
 #  *< flags
 #  *< dependencies
 #  *< priority
 #  *< id
-#: ../pidgin/gtkdialogs.c:1277
+#: ../pidgin/gtkdialogs.c:1291
 msgid "Remove Chat"
 msgstr "సంభాషణను తొలగించుము."
 
-#  *< api_version
+# *< api_version
 #  *< type
 #  *< ui_requirement
 #  *< flags
 #  *< dependencies
 #  *< priority
 #  *< id
-#: ../pidgin/gtkdialogs.c:1280
-#, fuzzy
+#: ../pidgin/gtkdialogs.c:1294
 msgid "_Remove Chat"
-msgstr "సంభాషణను తొలగించుము."
-
-#: ../pidgin/gtkdocklet.c:150
-#, fuzzy
+msgstr "_సంభాషణను తొలగించు"
+
+#: ../pidgin/gtkdocklet.c:152
 msgid "Right-click for more unread messages...\n"
-msgstr "ఇంకా ఆప్షన్లను చూపుము."
-
-#: ../pidgin/gtkdocklet.c:435
-#, fuzzy
+msgstr "రీడ్ చేయని మరిన్ని సందేశాల కోసం కుడి వైపు క్లిక్ చేయండి-...\n"
+
+#: ../pidgin/gtkdocklet.c:533
 msgid "Change Status"
-msgstr "అడ్రసును మార్చండి:"
-
-#  Buddy List
-#: ../pidgin/gtkdocklet.c:487
-#, fuzzy
+msgstr "స్థితిని మార్చండి"
+
+# Buddy List
+#: ../pidgin/gtkdocklet.c:680
 msgid "Show Buddy List"
-msgstr "మిత్రుల లిస్ట్ "
-
-#: ../pidgin/gtkdocklet.c:513
+msgstr "మిత్రుల జాబితా చూపించు "
+
+#: ../pidgin/gtkdocklet.c:706
 msgid "New Message..."
 msgstr "కొత్త సందేశం... "
 
-#: ../pidgin/gtkdocklet.c:528
+#: ../pidgin/gtkdocklet.c:721
 msgid "Mute Sounds"
 msgstr "మూగ శబ్దాలు "
 
-#: ../pidgin/gtkdocklet.c:535
-#, fuzzy
-msgid "Blink on new message"
-msgstr "కొత్త సందేశం... "
-
-#: ../pidgin/gtkdocklet.c:542
+#: ../pidgin/gtkdocklet.c:728
+#, fuzzy
+msgid "Blink on New Message"
+msgstr "కొత్త సందేశం వచ్చినప్పుడు బ్లింక్ చేయండి"
+
+# TODO: need a submenu to change status, this needs to "link"
+# * to the status in the buddy list gtkstatusbox
+#: ../pidgin/gtkdocklet.c:738
 msgid "Quit"
 msgstr "వదిలేయండి"
 
 #: ../pidgin/gtkft.c:154
-#, fuzzy
 msgid "Not started"
-msgstr "సపోర్టు లేదు. "
+msgstr "ప్రారంభం కాలేదు"
 
 #: ../pidgin/gtkft.c:274
 msgid "<b>Receiving As:</b>"
@@ -15973,19 +16128,19 @@
 msgstr "ఫైలు ఓపెన్ చేయుచున్నప్పుడు పొరపాటు సంభవించింది. "
 
 #: ../pidgin/gtkft.c:540
-#, fuzzy, c-format
+#, c-format
 msgid "Error launching %s: %s"
 msgstr "<b>%s</b> లాంచ్ చేయడంలో పొరపాటు.: %s"
 
 #: ../pidgin/gtkft.c:549
-#, fuzzy, c-format
+#, c-format
 msgid "Error running %s"
-msgstr "%s సంభాషణలో పాల్గొనుటలో పొరపాటు."
+msgstr "%s నడపడంలో లోపం"
 
 #: ../pidgin/gtkft.c:550
 #, c-format
 msgid "Process returned error code %d"
-msgstr ""
+msgstr "లోపం కోడ్ %d ను ప్రక్రియ తిప్పి పంపింది "
 
 #: ../pidgin/gtkft.c:697
 msgid "Filename:"
@@ -16009,70 +16164,68 @@
 
 #: ../pidgin/gtkft.c:784
 msgid "Close this window when all transfers _finish"
-msgstr ""
+msgstr "బదిలీలన్నీ  _పూర్తయ్యాక ఈ విండోను మూసివేయండి"
 
 #: ../pidgin/gtkft.c:794
-#, fuzzy
 msgid "C_lear finished transfers"
-msgstr "_సమాప్తం చేసిన ట్రాన్స్‌ఫర్లను తీసివేయండి."
+msgstr "పూర్తయిన బదిలీలను క్లియర్_ చేయండి"
 
 #. "Download Details" arrow
 #: ../pidgin/gtkft.c:803
-#, fuzzy
 msgid "File transfer _details"
-msgstr "ట్రాన్స్‌ఫర్‌ డీటైల్స్‌ను చూపించుము."
-
+msgstr "ఫైల్ బదిలీ _వివరాలు"
+
+# Pause button
 #. Pause button
-#: ../pidgin/gtkft.c:833 ../pidgin/pidginstock.c:95
+#: ../pidgin/gtkft.c:833
+#: ../pidgin/pidginstock.c:95
 msgid "_Pause"
 msgstr "_ఆగుము "
 
+# Resume button
 #. Resume button
 #: ../pidgin/gtkft.c:843
 msgid "_Resume"
 msgstr "_పునఃప్రారంభించండి."
 
-#: ../pidgin/gtkimhtml.c:816
-#, fuzzy
+#: ../pidgin/gtkimhtml.c:815
 msgid "Paste as Plain _Text"
-msgstr "టెక్‌స్ట్‌గా పేస్ట్ చేయుము"
-
-#: ../pidgin/gtkimhtml.c:833 ../pidgin/gtkimhtmltoolbar.c:1194
-#, fuzzy
+msgstr "సాధారణ _టెక్స్ట గా పేస్ట్ చేయండి"
+
+#: ../pidgin/gtkimhtml.c:832
+#: ../pidgin/gtkimhtmltoolbar.c:1199
 msgid "_Reset formatting"
-msgstr "_ఫార్మాటింగ్‌ను రద్దుచేయండి."
-
-#: ../pidgin/gtkimhtml.c:1373
+msgstr "_ఫార్మాటింగ్ ను తిరిగి సెట్ చేయండి"
+
+#: ../pidgin/gtkimhtml.c:1359
 msgid "Hyperlink color"
 msgstr "హైపర్‌లింక్ కలర్ "
 
-#: ../pidgin/gtkimhtml.c:1374
+#: ../pidgin/gtkimhtml.c:1360
 msgid "Color to draw hyperlinks."
 msgstr "హైపర్‌లింక్‌ను లాగడానికి కలర్ "
 
-#: ../pidgin/gtkimhtml.c:1377
-#, fuzzy
+#: ../pidgin/gtkimhtml.c:1363
 msgid "Hyperlink prelight color"
-msgstr "హైపర్‌లింక్ కలర్ "
-
-#: ../pidgin/gtkimhtml.c:1378
-#, fuzzy
+msgstr "హైపర్ లింక్ ప్రీలైట్ కలర్"
+
+#: ../pidgin/gtkimhtml.c:1364
 msgid "Color to draw hyperlinks when mouse is over them."
-msgstr "హైపర్‌లింక్‌ను లాగడానికి కలర్ "
-
-#: ../pidgin/gtkimhtml.c:1598
+msgstr "మౌస్ హైపర్ లింక్ లపై ఉన్నప్పుడు వాటిని చిత్రించడానికి రంగు."
+
+#: ../pidgin/gtkimhtml.c:1581
 msgid "_Copy E-Mail Address"
 msgstr "_ఇ-మెయిల్ అడ్రసును కాపీ చేయండి. "
 
-#: ../pidgin/gtkimhtml.c:1610
+#: ../pidgin/gtkimhtml.c:1593
 msgid "_Open Link in Browser"
 msgstr "_బ్రౌజర్‌లో లింక్‌ను ఓపెన్ చేయండి. "
 
-#: ../pidgin/gtkimhtml.c:1620
+#: ../pidgin/gtkimhtml.c:1603
 msgid "_Copy Link Location"
 msgstr "_లింక్ లొకేషన్‌ను కాపీ చేయండి. "
 
-#: ../pidgin/gtkimhtml.c:3369
+#: ../pidgin/gtkimhtml.c:3353
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -16082,7 +16235,7 @@
 "\n"
 "Defaulting to PNG."
 
-#: ../pidgin/gtkimhtml.c:3372
+#: ../pidgin/gtkimhtml.c:3356
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -16092,7 +16245,7 @@
 "\n"
 "Defaulting to PNG."
 
-#: ../pidgin/gtkimhtml.c:3401
+#: ../pidgin/gtkimhtml.c:3385
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -16103,7 +16256,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3404
+#: ../pidgin/gtkimhtml.c:3388
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -16114,12 +16267,12 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3482 ../pidgin/gtkimhtml.c:3494
+#: ../pidgin/gtkimhtml.c:3466
+#: ../pidgin/gtkimhtml.c:3478
 msgid "Save Image"
 msgstr "సచిత్రమును సేవ్ చేయుము."
 
-#: ../pidgin/gtkimhtml.c:3522
-#, c-format
+#: ../pidgin/gtkimhtml.c:3506
 msgid "_Save Image..."
 msgstr "_సచిత్రమును సేవ్ చేయుము."
 
@@ -16127,298 +16280,289 @@
 msgid "Select Font"
 msgstr "ఫాంట్‌ను సెలక్ట్ చేయుము."
 
-#: ../pidgin/gtkimhtmltoolbar.c:242
+#: ../pidgin/gtkimhtmltoolbar.c:244
 msgid "Select Text Color"
 msgstr "టెక్‌స్ట్ కలర్‌ను సెలక్ట్ చేయుము."
 
-#: ../pidgin/gtkimhtmltoolbar.c:321
+#: ../pidgin/gtkimhtmltoolbar.c:323
 msgid "Select Background Color"
 msgstr "నేపధ్యపు రంగును సెలక్ట్ చేయుము."
 
-#: ../pidgin/gtkimhtmltoolbar.c:410
+#: ../pidgin/gtkimhtmltoolbar.c:412
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:418
+#: ../pidgin/gtkimhtmltoolbar.c:420
 msgid "_Description"
 msgstr "_వర్ణన "
 
-#: ../pidgin/gtkimhtmltoolbar.c:421
-msgid ""
-"Please enter the URL and description of the link that you want to insert. "
-"The description is optional."
+#: ../pidgin/gtkimhtmltoolbar.c:423
+msgid "Please enter the URL and description of the link that you want to insert. The description is optional."
 msgstr "మీరు చేర్చదల్చుకున్న URL మరియు లింక్ వర్ణనను ఎంటర్ చేయండి. వర్ణన ఆప్షనల్ మాత్రమే. "
 
-#: ../pidgin/gtkimhtmltoolbar.c:425
+#: ../pidgin/gtkimhtmltoolbar.c:427
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "మీరు చేర్చదల్చుకున్న లింక్‌యొక్క URL ను ఎంటర్ చేయండి. "
 
-#: ../pidgin/gtkimhtmltoolbar.c:430 ../pidgin/gtkimhtmltoolbar.c:1102
+#: ../pidgin/gtkimhtmltoolbar.c:432
+#: ../pidgin/gtkimhtmltoolbar.c:1106
 msgid "Insert Link"
 msgstr "లింకును చేర్చండి."
 
-#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtkimhtmltoolbar.c:1262
+#: ../pidgin/gtkimhtmltoolbar.c:436
+#: ../pidgin/gtkimhtmltoolbar.c:1267
 msgid "_Insert"
 msgstr "_చేర్చండి."
 
-#: ../pidgin/gtkimhtmltoolbar.c:514
+#: ../pidgin/gtkimhtmltoolbar.c:516
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "సచిత్రమును స్టోర్ చేయడంలో వైఫల్యం: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:540 ../pidgin/gtkimhtmltoolbar.c:550
+#: ../pidgin/gtkimhtmltoolbar.c:542
+#: ../pidgin/gtkimhtmltoolbar.c:552
 msgid "Insert Image"
 msgstr "సచిత్రమును చేర్చుము. "
 
-#: ../pidgin/gtkimhtmltoolbar.c:761
+#: ../pidgin/gtkimhtmltoolbar.c:765
 msgid "This theme has no available smileys."
 msgstr "ఈ కథకు smileys లభించుటలేదు."
 
+# show everything
 #. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:778
+#: ../pidgin/gtkimhtmltoolbar.c:782
 msgid "Smile!"
 msgstr "చిరునవ్వు!"
 
-#  And now for the buttons
-#: ../pidgin/gtkimhtmltoolbar.c:846 ../pidgin/gtkimhtmltoolbar.c:1219
+#: ../pidgin/gtkimhtmltoolbar.c:850
+#: ../pidgin/gtkimhtmltoolbar.c:1224
 #, fuzzy
 msgid "_Font"
-msgstr "_ఖాతా "
-
-#: ../pidgin/gtkimhtmltoolbar.c:1054
-#, fuzzy
+msgstr "ఫాంట్ లు"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1058
 msgid "Group Items"
-msgstr "గ్రూపు పేరు "
-
-#: ../pidgin/gtkimhtmltoolbar.c:1054
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1058
 msgid "Ungroup Items"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1088 ../pidgin/plugins/convcolors.c:287
+#: ../pidgin/gtkimhtmltoolbar.c:1092
+#: ../pidgin/plugins/convcolors.c:287
 msgid "Bold"
 msgstr "బోల్డ్ "
 
-#: ../pidgin/gtkimhtmltoolbar.c:1089 ../pidgin/plugins/convcolors.c:294
+#: ../pidgin/gtkimhtmltoolbar.c:1093
+#: ../pidgin/plugins/convcolors.c:294
 msgid "Italic"
 msgstr "ఇటాలిక్ అక్షరాలు "
 
-#: ../pidgin/gtkimhtmltoolbar.c:1090 ../pidgin/plugins/convcolors.c:301
+#: ../pidgin/gtkimhtmltoolbar.c:1094
+#: ../pidgin/plugins/convcolors.c:301
 msgid "Underline"
 msgstr "అండర్‌లైన్ "
 
-#: ../pidgin/gtkimhtmltoolbar.c:1091
+#: ../pidgin/gtkimhtmltoolbar.c:1095
 msgid "Strikethrough"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1093
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:1097
 msgid "Increase Font Size"
-msgstr "ఫాంట్ సైజులను ఉపేక్షించుము."
-
-#: ../pidgin/gtkimhtmltoolbar.c:1094
+msgstr ""
+
+#: ../pidgin/gtkimhtmltoolbar.c:1098
 msgid "Decrease Font Size"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1096
+#: ../pidgin/gtkimhtmltoolbar.c:1100
+#, fuzzy
 msgid "Font Face"
 msgstr "ఫాంట్ ఫేస్ "
 
-#: ../pidgin/gtkimhtmltoolbar.c:1097
+#: ../pidgin/gtkimhtmltoolbar.c:1101
 #, fuzzy
 msgid "Background Color"
 msgstr "నేపధ్య ఫాంట్ కలర్ "
 
-#: ../pidgin/gtkimhtmltoolbar.c:1098
+#: ../pidgin/gtkimhtmltoolbar.c:1102
 #, fuzzy
 msgid "Foreground Color"
 msgstr "ఉపరితల ఫాంట్ కలర్ "
 
-#: ../pidgin/gtkimhtmltoolbar.c:1100
+#: ../pidgin/gtkimhtmltoolbar.c:1104
 #, fuzzy
 msgid "Reset Formatting"
-msgstr "డిఫాల్ట్ (ఉపేక్షిత) ఫార్మాటింగ్ "
-
-#: ../pidgin/gtkimhtmltoolbar.c:1103
+msgstr "ఫార్మాటింగ్ ను తిరిగి సెట్ చేయండి"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1107
 #, fuzzy
 msgid "Insert IM Image"
 msgstr "సచిత్రమును చేర్చుము. "
 
-#: ../pidgin/gtkimhtmltoolbar.c:1104
+#: ../pidgin/gtkimhtmltoolbar.c:1108
 #, fuzzy
 msgid "Insert Smiley"
 msgstr "స్మైలీని చేర్చండి."
 
-#: ../pidgin/gtkimhtmltoolbar.c:1179
+#: ../pidgin/gtkimhtmltoolbar.c:1184
 #, fuzzy
 msgid "<b>_Bold</b>"
 msgstr "<b>_పాస్‌వర్డ్:</b>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1180
+#: ../pidgin/gtkimhtmltoolbar.c:1185
 #, fuzzy
 msgid "<i>_Italic</i>"
 msgstr " <i>(ircop)</i>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1181
+#: ../pidgin/gtkimhtmltoolbar.c:1186
 #, fuzzy
 msgid "<u>_Underline</u>"
 msgstr "అండర్‌లైన్ "
 
-#: ../pidgin/gtkimhtmltoolbar.c:1182
+#: ../pidgin/gtkimhtmltoolbar.c:1187
 msgid "<span strikethrough='true'>Strikethrough</span>"
 msgstr ""
 
-#: ../pidgin/gtkimhtmltoolbar.c:1183
+#: ../pidgin/gtkimhtmltoolbar.c:1188
 #, fuzzy
 msgid "<span size='larger'>_Larger</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">गेम v%s</span>"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1185
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">చిత్రమును సేవ్ చేయడంలో పొరపాటు!</span>\n"
+"\n"
+"%s"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1190
 #, fuzzy
 msgid "_Normal"
 msgstr "నార్మల్ "
 
-#: ../pidgin/gtkimhtmltoolbar.c:1187
+#: ../pidgin/gtkimhtmltoolbar.c:1192
 msgid "<span size='smaller'>_Smaller</span>"
 msgstr ""
 
 #. If we want to show the formatting for the following items, we would
 #. * need to update them when formatting changes. The above items don't need
 #. * no updating nor nothin'
-#: ../pidgin/gtkimhtmltoolbar.c:1191
+#: ../pidgin/gtkimhtmltoolbar.c:1196
 #, fuzzy
 msgid "_Font face"
 msgstr "ఫాంట్ ఫేస్ "
 
-#: ../pidgin/gtkimhtmltoolbar.c:1192
+#: ../pidgin/gtkimhtmltoolbar.c:1197
 #, fuzzy
 msgid "Foreground _color"
 msgstr "ఉపరితల ఫాంట్ కలర్ "
 
-#: ../pidgin/gtkimhtmltoolbar.c:1193
+#: ../pidgin/gtkimhtmltoolbar.c:1198
 #, fuzzy
 msgid "Bac_kground color"
 msgstr "నేపధ్య ఫాంట్ కలర్ "
 
-#: ../pidgin/gtkimhtmltoolbar.c:1270
-#, fuzzy
-msgid "_Smiley"
-msgstr "చిరునవ్వు!"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1276
+#: ../pidgin/gtkimhtmltoolbar.c:1275
 #, fuzzy
 msgid "_Image"
 msgstr "సచిత్రమును సేవ్ చేయుము."
 
-#: ../pidgin/gtkimhtmltoolbar.c:1282
+#: ../pidgin/gtkimhtmltoolbar.c:1281
 #, fuzzy
 msgid "_Link"
-msgstr "_జాయిన్ అగు"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1288
+msgstr "_లాగ్ ఇన్ "
+
+#: ../pidgin/gtkimhtmltoolbar.c:1287
 msgid "_Horizontal rule"
 msgstr ""
 
+# show everything
+#: ../pidgin/gtkimhtmltoolbar.c:1309
+#, fuzzy
+msgid "_Smile!"
+msgstr "చిరునవ్వు!"
+
 #: ../pidgin/gtklog.c:293
 #, c-format
-msgid ""
-"Are you sure you want to permanently delete the log of the conversation with "
-"%s which started at %s?"
-msgstr ""
+msgid "Are you sure you want to permanently delete the log of the conversation with %s which started at %s?"
+msgstr "%s తో %s వద్ద ప్రారంభమైన సంభాషణ లాగ్ ను శాశ్వతంగా తొలగించదలచుకున్నారా ?"
 
 #: ../pidgin/gtklog.c:304
 #, c-format
-msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
-msgstr ""
+msgid "Are you sure you want to permanently delete the log of the conversation in %s which started at %s?"
+msgstr "%s లో %s వద్ద ప్రారంభమైన సంభాషణ లాగ్ ను శాశ్వతంగా తొలగించదలచుకున్నారా ?"
 
 #: ../pidgin/gtklog.c:309
-#, fuzzy, c-format
-msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
-msgstr "బయటకు పంపేసిన సందేశాలను మీరు నిజంగా \"%s\" తీసివేయదల్చుకున్నారా ?"
+#, c-format
+msgid "Are you sure you want to permanently delete the system log which started at %s?"
+msgstr "%s వద్ద ప్రారంభమైన సిస్టమ్ లాగ్ ను మీరు శాశ్వతంగా తొలగించాలనుకుంటున్నారా   ?"
 
 #: ../pidgin/gtklog.c:453
-#, fuzzy, c-format
+#, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">చిత్రమును సేవ్ చేయడంలో పొరపాటు!</span>\n"
-"\n"
-"%s"
+msgstr "<స్పాన్ పరిమాణం='పెద్దది' బరువు='బోల్డ్'>  %s</స్పాన్> పై %s లో సంభాషణ"
 
 #: ../pidgin/gtklog.c:456
-#, fuzzy, c-format
+#, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">చిత్రమును సేవ్ చేయడంలో పొరపాటు!</span>\n"
-"\n"
-"%s"
+msgstr "<స్పాన్ పరిమాణం='పెద్దది' బరువు='బోల్డ్'>  %s</స్పాన్> పై %s తో సంభాషణ"
 
 #: ../pidgin/gtklog.c:503
 msgid "%B %Y"
-msgstr ""
+msgstr "%B %Y"
 
 #: ../pidgin/gtklog.c:550
-msgid ""
-"System events will only be logged if the \"Log all status changes to system "
-"log\" preference is enabled."
-msgstr ""
+msgid "System events will only be logged if the \"Log all status changes to system log\" preference is enabled."
+msgstr "\"లాగ్ ఆల్ స్థాయి సిస్టమ్ లాగ్ కు మార్పు\" అనే ప్రాధాన్యాన్ని క్రియాశీలం చేసినప్పుడు మాత్రమే సిస్టమ్ ఈవెంట్లు లాగ్ అవుతాయి. "
 
 #: ../pidgin/gtklog.c:554
-msgid ""
-"Instant messages will only be logged if the \"Log all instant messages\" "
-"preference is enabled."
-msgstr ""
+msgid "Instant messages will only be logged if the \"Log all instant messages\" preference is enabled."
+msgstr "\"Log all instant messages\""
 
 #: ../pidgin/gtklog.c:557
-msgid ""
-"Chats will only be logged if the \"Log all chats\" preference is enabled."
-msgstr ""
+msgid "Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgstr "\"అన్ని సంభాషణలను లాగ్ చేయు\" అనే ప్రాధాన్యాన్ని క్రియాశీలం చేసినప్పుడే సంభాషణలు లాగ్ అవుతాయి."
 
 #: ../pidgin/gtklog.c:561
 msgid "No logs were found"
-msgstr ""
+msgstr "లాగ్ లు ఏవీ కన్పించలేదు"
 
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
 #: ../pidgin/gtklog.c:576
 msgid "_Browse logs folder"
-msgstr ""
+msgstr "లాగ్ ల ఫోల్టర్ ను బ్రౌజ్_ చేయండి"
 
 #: ../pidgin/gtklog.c:640
-#, fuzzy
 msgid "Total log size:"
-msgstr "లాగ్ సైజ్ వలన "
-
-#  Conversations
-#: ../pidgin/gtklog.c:709
-#, fuzzy, c-format
+msgstr "మొత్తం లాగ్ పరిమాణం:"
+
+# Conversations
+#: ../pidgin/gtklog.c:714
+#, c-format
 msgid "Conversations in %s"
 msgstr "%s తో సంభాషణలు "
 
-#  Conversations
-#: ../pidgin/gtklog.c:717 ../pidgin/gtklog.c:779
+# Conversations
+#: ../pidgin/gtklog.c:722
+#: ../pidgin/gtklog.c:793
 #, c-format
 msgid "Conversations with %s"
 msgstr "%s తో సంభాషణలు "
 
-#  *< api_version
+# *< api_version
 #  *< type
 #  *< ui_requirement
 #  *< flags
 #  *< dependencies
 #  *< priority
 #  *< id
-#: ../pidgin/gtklog.c:804
+#: ../pidgin/gtklog.c:823
 msgid "System Log"
 msgstr "సిస్టం లాగ్"
 
-#: ../pidgin/gtkmain.c:386
-#, fuzzy, c-format
+#: ../pidgin/gtkmain.c:398
+#, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s. ఇంకా వివరములకు `%s -h' ప్రయత్నించండి.\n"
 
-#: ../pidgin/gtkmain.c:388
+#: ../pidgin/gtkmain.c:400
 #, c-format
 msgid ""
 "%s %s\n"
@@ -16431,13 +16575,24 @@
 "  -n, --nologin       don't automatically login\n"
 "  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
 "                      account(s) to use, separated by commas)\n"
+"  --display=DISPLAY   X display to use\n"
 "  -v, --version       display the current version and exit\n"
 msgstr ""
-
-#: ../pidgin/gtkmain.c:512
-#, c-format
-msgid ""
-"%s has segfaulted and attempted to dump a core file.\n"
+"%s %s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -h, --help          display this help and exit\n"
+"  -n, --nologin       don't automatically login\n"
+"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
+"                      account(s) to use, separated by commas)\n"
+"  -v, --version       display the current version and exit\n"
+
+#: ../pidgin/gtkmain.c:528
+#, c-format
+msgid ""
+"%s %s 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"
@@ -16455,76 +16610,103 @@
 "on other protocols is at\n"
 "%swiki/DeveloperPages\n"
 msgstr ""
+"%s 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 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"
+"and post the backtrace from the core file.  If you do not know\n"
+"how to get the backtrace, please read the instructions at\n"
+"%sgdb.php\n"
+"\n"
+"If you need further assistance, please IM either SeanEgn or \n"
+"LSchiere (via AIM).  Contact information for Sean and Luke \n"
+"on other protocols is at\n"
+"%scontactinfo.php\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:699 ../pidgin/pidgin.h:51
+#: ../pidgin/gtkmain.c:718
+#: ../pidgin/pidgin.h:51
 #, fuzzy
 msgid "Pidgin"
 msgstr "పేజింగ్ "
 
-#: ../pidgin/gtknotify.c:349
-#, fuzzy
+#: ../pidgin/gtknotify.c:350
 msgid "Open All Messages"
-msgstr "సందేశాన్ని పంపండి. "
-
-#: ../pidgin/gtknotify.c:402
-#, fuzzy
+msgstr "అన్ని సందేశాలను తెరవండి"
+
+#: ../pidgin/gtknotify.c:403
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">మీకు జాబు వచ్చింది!</span>\n"
+"<span weight=\"bold\" size=\"larger\">మీకు మెయిల్ వచ్చింది!</span>\n"
 "\n"
 "%s"
 
-#: ../pidgin/gtknotify.c:540
+# Descriptive label
+#: ../pidgin/gtknotify.c:546
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s has %d new message."
 msgstr[1] "%s के %d लिए नये संदेश हैं।"
 
-#: ../pidgin/gtknotify.c:564
-#, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../pidgin/gtknotify.c:989
-#, fuzzy, c-format
+#: ../pidgin/gtknotify.c:570
+#, c-format
+msgid "<b>%d new e-mail.</b>"
+msgid_plural "<b>%d new e-mails.</b>"
+msgstr[0] "<b>ప్లగ్ ఇన్ వివరాలు</b>"
+msgstr[1] "<b>ప్లగ్ ఇన్ వివరాలు</b>"
+
+#: ../pidgin/gtknotify.c:998
+#, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "బ్రౌజర్ కమాండ్‌కు <b>%s</b> విలువలేదు."
 
-#: ../pidgin/gtknotify.c:991 ../pidgin/gtknotify.c:1003
-#: ../pidgin/gtknotify.c:1016 ../pidgin/gtknotify.c:1144
+#: ../pidgin/gtknotify.c:1000
+#: ../pidgin/gtknotify.c:1012
+#: ../pidgin/gtknotify.c:1025
+#: ../pidgin/gtknotify.c:1153
 msgid "Unable to open URL"
 msgstr "URLను ఓపెన్ చేయలేదు."
 
-#: ../pidgin/gtknotify.c:1001 ../pidgin/gtknotify.c:1014
-#, fuzzy, c-format
+#: ../pidgin/gtknotify.c:1010
+#: ../pidgin/gtknotify.c:1023
+#, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "<b>%s</b> లాంచ్ చేయడంలో పొరపాటు.: %s"
 
-#: ../pidgin/gtknotify.c:1145
-msgid ""
-"The 'Manual' browser command has been chosen, but no command has been set."
+#: ../pidgin/gtknotify.c:1154
+msgid "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "'మాన్యుయల్' బ్రౌజర్ కమాండ్‌ను ఎంచుకున్నారు, కాని కమాండ్‌ను సెట్ చేయలేదు."
 
 #: ../pidgin/gtkplugin.c:265
 msgid "The following plugins will be unloaded."
-msgstr ""
+msgstr "ఈ కింది ప్లగ్ ఇన్ లను అన్ లోడ్ అవుతాయి."
 
 #: ../pidgin/gtkplugin.c:284
 msgid "Multiple plugins will be unloaded."
-msgstr ""
+msgstr "అనేక ప్లగ్ ఇన్ లు అన్ లోడ్ అవుతాయి."
 
 #: ../pidgin/gtkplugin.c:288
-#, fuzzy
 msgid "Unload Plugins"
-msgstr "ప్లగ్‌ఇన్స్ "
-
-#: ../pidgin/gtkplugin.c:400
-#, fuzzy, c-format
+msgstr "ప్లగిన్లను అన్ లోడ్ చేయండి"
+
+#: ../pidgin/gtkplugin.c:308
+#, fuzzy
+msgid "Could not unload plugin"
+msgstr "పబ్లిక్ కీని లోడ్ చేయుట సాధ్యమగుటలేదు. "
+
+#: ../pidgin/gtkplugin.c:309
+msgid "The plugin could not be unloaded now, but will be disabled at the next startup."
+msgstr ""
+
+#: ../pidgin/gtkplugin.c:417
+#, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
 "<span weight=\"bold\">Website:</span>\t\t%s\n"
@@ -16536,135 +16718,122 @@
 "<span weight=\"bold\">वेब साईट site:</span>\t\t%s\n"
 "<span weight=\"bold\">फा़इल-नाम:</span>\t%s"
 
-#: ../pidgin/gtkplugin.c:410
+#: ../pidgin/gtkplugin.c:427
 #, c-format
 msgid ""
 "%s\n"
 "<span foreground=\"#ff0000\" weight=\"bold\">Error: %s\n"
 "Check the plugin website for an update.</span>"
 msgstr ""
-
-#: ../pidgin/gtkplugin.c:536
-#, fuzzy
+"%s\n"
+"<స్పాన్ కార్యక్షేత్రం=\"#ff0000\" బరువు=\"బోల్డ్\">లోపం: %s\n"
+"నవీకరణ</స్పాన్> కోసం ప్లగ్ ఇన్ వెబ్ సైట్ ను తనిఖీ చేయండి."
+
+#: ../pidgin/gtkplugin.c:562
 msgid "Configure Pl_ugin"
-msgstr "Configure Room"
-
-#: ../pidgin/gtkplugin.c:599
+msgstr "ప్లగ్ _ఇన్ ను కన్ఫిగర్ చేయండి"
+
+#: ../pidgin/gtkplugin.c:625
 msgid "<b>Plugin Details</b>"
-msgstr ""
+msgstr "<b>ప్లగ్ ఇన్ వివరాలు</b>"
 
 #: ../pidgin/gtkpounce.c:157
 msgid "Select a file"
 msgstr "ఫైలును సెలక్ట్ చేయుము."
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:532
-#, fuzzy
+#: ../pidgin/gtkpounce.c:547
 msgid "Pounce on Whom"
-msgstr "ఎవర్ని దూకించాలి"
-
-#: ../pidgin/gtkpounce.c:559
+msgstr "ఎవరిమీద దూసుకురావాలి"
+
+#: ../pidgin/gtkpounce.c:574
 msgid "_Buddy name:"
 msgstr "_మిత్రుని పేరు:"
 
-#: ../pidgin/gtkpounce.c:593
-#, fuzzy
+#: ../pidgin/gtkpounce.c:608
 msgid "Si_gns on"
-msgstr "సైన్ ఆన్ "
-
-#: ../pidgin/gtkpounce.c:595
-#, fuzzy
+msgstr "సైన్స్ _ఆన్ "
+
+#: ../pidgin/gtkpounce.c:610
 msgid "Signs o_ff"
-msgstr "సైన్ ఆఫ్ "
-
-#: ../pidgin/gtkpounce.c:597
-#, fuzzy
+msgstr "సైన్_ ఆఫ్"
+
+#: ../pidgin/gtkpounce.c:612
 msgid "Goes a_way"
-msgstr "మిత్రుడు _దూరం వెళ్లిపోయినాడు. "
-
-#: ../pidgin/gtkpounce.c:599
-#, fuzzy
+msgstr "దూరంగా _వెళ్ళారు"
+
+#: ../pidgin/gtkpounce.c:614
 msgid "Ret_urns from away"
-msgstr "_దూరంనుండి తిరిగిరండి "
-
-#: ../pidgin/gtkpounce.c:601
-#, fuzzy
+msgstr "_దూరంనుంచి తిరిగిరాక "
+
+#: ../pidgin/gtkpounce.c:616
 msgid "Becomes _idle"
-msgstr "%s సోమరిగా తయారైనారు."
-
-#: ../pidgin/gtkpounce.c:603
-#, fuzzy
+msgstr "_ఖాళీగా అయ్యారు"
+
+#: ../pidgin/gtkpounce.c:618
 msgid "Is no longer i_dle"
-msgstr "ఇప్పుడు %s సోమరిగా లేరు."
-
-#: ../pidgin/gtkpounce.c:605
-#, fuzzy
+msgstr "ఇప్పుడు _ఖాళీగా లేరు"
+
+#: ../pidgin/gtkpounce.c:620
 msgid "Starts _typing"
-msgstr "మిత్రుడు _టైపుచేయడం మొదలుపెట్టాడు"
-
-#: ../pidgin/gtkpounce.c:607
+msgstr "_టైపు చేయడం ప్రారంభించారు"
+
+#: ../pidgin/gtkpounce.c:622
 msgid "P_auses while typing"
-msgstr ""
-
-#  Buddy List trans options
-#: ../pidgin/gtkpounce.c:609
-#, fuzzy
+msgstr " _టైపుచేస్తూ ఆగారు"
+
+#: ../pidgin/gtkpounce.c:624
 msgid "Stops t_yping"
-msgstr "మిత్రుడు _టైపుచేయడం ఆపుచేశాడు "
-
-#: ../pidgin/gtkpounce.c:611
-#, fuzzy
+msgstr "_టైపుచేయడం ఆపారు"
+
+#: ../pidgin/gtkpounce.c:626
 msgid "Sends a _message"
-msgstr "సందేశమును పంపుము"
-
-#: ../pidgin/gtkpounce.c:654
-#, fuzzy
+msgstr "ఒక _సందేశం పంపారు"
+
+#: ../pidgin/gtkpounce.c:669
 msgid "Ope_n an IM window"
-msgstr "ఒక సత్వరసందేశ విండోను ఓపెన్ చేయుము "
-
-#: ../pidgin/gtkpounce.c:656
-#, fuzzy
+msgstr "ఒక IM  విండోను _ప్రారంభించు "
+
+#: ../pidgin/gtkpounce.c:671
 msgid "_Pop up a notification"
-msgstr "_Popup notification"
-
-#: ../pidgin/gtkpounce.c:658
+msgstr "_నోటిఫికేషన్ ను పాప్ చేయవచ్చు"
+
+#: ../pidgin/gtkpounce.c:673
 msgid "Send a _message"
 msgstr "సందేశమును పంపుము"
 
-#: ../pidgin/gtkpounce.c:660
+#: ../pidgin/gtkpounce.c:675
 msgid "E_xecute a command"
 msgstr "కమాండ్‌ను నెరవేర్చుము."
 
-#: ../pidgin/gtkpounce.c:662
+#: ../pidgin/gtkpounce.c:677
 msgid "P_lay a sound"
 msgstr "శబ్దమును పలికించుము. "
 
-#: ../pidgin/gtkpounce.c:668
-#, fuzzy
+#: ../pidgin/gtkpounce.c:683
 msgid "Brows_e..."
-msgstr "బ్రౌజ్..."
-
-#: ../pidgin/gtkpounce.c:670
-#, fuzzy
+msgstr "_బ్రౌజ్..."
+
+#: ../pidgin/gtkpounce.c:685
 msgid "Br_owse..."
-msgstr "బ్రౌజ్..."
-
-#: ../pidgin/gtkpounce.c:671
+msgstr "_బ్రౌజ్..."
+
+#: ../pidgin/gtkpounce.c:686
 msgid "Pre_view"
 msgstr "సమీక్ష "
 
-#: ../pidgin/gtkpounce.c:798
+#: ../pidgin/gtkpounce.c:818
+#, fuzzy
 msgid "P_ounce only when my status is not Available"
-msgstr ""
-
-#: ../pidgin/gtkpounce.c:803
+msgstr "నా స్థాయి అందుబాటులో లేనప్పుడు మాత్రమే దూసుకు రండి_"
+
+#: ../pidgin/gtkpounce.c:823
 msgid "_Recurring"
-msgstr ""
-
-#: ../pidgin/gtkpounce.c:1246
-#, fuzzy
+msgstr "రికరింగ్"
+
+#: ../pidgin/gtkpounce.c:1266
 msgid "Pounce Target"
-msgstr "ఎప్పుడు దూకాలి"
+msgstr "లక్ష్యంవైపు దూసుకురండి"
 
 #: ../pidgin/gtkprefs.c:386
 #: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
@@ -16674,301 +16843,320 @@
 
 #: ../pidgin/gtkprefs.c:517
 msgid "Smiley theme failed to unpack."
-msgstr ""
+msgstr "స్మైలీ థీమ్ వెల్లడిలో వైఫల్యం. "
 
 #: ../pidgin/gtkprefs.c:644
 msgid "Install Theme"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:697
-msgid ""
-"Select a smiley theme that you would like to use from the list below. New "
-"themes can be installed by dragging and dropping them onto the theme list."
-msgstr ""
-"ఈ క్రింది లిస్టునుండి మీ కిష్టమైన కథను సెలక్ట్ చేయండి. ఇప్పుడు కథలను లాగి లిస్టులో చేర్చవచ్చును."
-
-#: ../pidgin/gtkprefs.c:732
+#: ../pidgin/gtkprefs.c:698
+msgid "Select a smiley theme that you would like to use from the list below. New themes can be installed by dragging and dropping them onto the theme list."
+msgstr "ఈ క్రింది లిస్టునుండి మీ కిష్టమైన కథను సెలక్ట్ చేయండి. ఇప్పుడు కథలను లాగి లిస్టులో చేర్చవచ్చును."
+
+#: ../pidgin/gtkprefs.c:733
 msgid "Icon"
 msgstr "ఐకన్ "
 
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-#: ../pidgin/gtkprefs.c:894
-msgid "System Tray Icon"
-msgstr "System Tray Icon"
-
-#  *< api_version
+# *< api_version
 #  *< type
 #  *< ui_requirement
 #  *< flags
 #  *< dependencies
 #  *< priority
 #  *< id
+# *< type
+# *< ui_requirement
+# *< flags
+# *< dependencies
+# *< priority
+# *< id
 #: ../pidgin/gtkprefs.c:895
-#, fuzzy
+msgid "System Tray Icon"
+msgstr "System Tray Icon"
+
+#: ../pidgin/gtkprefs.c:896
 msgid "_Show system tray icon:"
-msgstr "System Tray Icon"
+msgstr "_సిస్టమ్ ట్రే ఐకాన్ ను చూపించు:"
 
 #: ../pidgin/gtkprefs.c:899
-#, fuzzy
 msgid "On unread messages"
-msgstr "సందేశమును పంపుము"
-
-#  IM Convo trans options
-#: ../pidgin/gtkprefs.c:904
-#, fuzzy
+msgstr "చదవని సందేశాల పై"
+
+#: ../pidgin/gtkprefs.c:905
 msgid "Conversation Window Hiding"
-msgstr "IM Conversation Windows"
-
-#  Conversations
-#: ../pidgin/gtkprefs.c:905
-#, fuzzy
+msgstr "సంభాషణ విండో దాచబడుతోంది"
+
+#: ../pidgin/gtkprefs.c:906
 msgid "_Hide new IM conversations:"
-msgstr "సంభాషణను క్లోజ్ చేయుము "
-
-#: ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1944
+msgstr "కొత్త IM సంభాషణలను: దాచు _"
+
+#: ../pidgin/gtkprefs.c:909
+#: ../pidgin/gtkprefs.c:2045
 msgid "When away"
 msgstr "దూరంగా ఉన్నప్పుడు "
 
 #. All the tab options!
-#: ../pidgin/gtkprefs.c:916
+#: ../pidgin/gtkprefs.c:917
 msgid "Tabs"
-msgstr ""
-
-#: ../pidgin/gtkprefs.c:918
+msgstr "టాబ్ లు"
+
+#: ../pidgin/gtkprefs.c:919
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "సత్వర విండోలను మరియు సంభాషణలను _టాబ్డ్ విండోస్‌లో చూపించుము. "
 
-#: ../pidgin/gtkprefs.c:932
+#: ../pidgin/gtkprefs.c:933
 msgid "Show close b_utton on tabs"
 msgstr "టాబ్స్‌పై క్లోజ్ బటన్‌ను చూపించుము."
 
-#: ../pidgin/gtkprefs.c:935
-#, fuzzy
+#: ../pidgin/gtkprefs.c:936
 msgid "_Placement:"
-msgstr "ExtPlacement"
-
-#: ../pidgin/gtkprefs.c:937
+msgstr "_స్థానం:"
+
+#: ../pidgin/gtkprefs.c:938
 msgid "Top"
 msgstr "పైన "
 
-#: ../pidgin/gtkprefs.c:938
+#: ../pidgin/gtkprefs.c:939
 msgid "Bottom"
 msgstr "అడుగున"
 
-#: ../pidgin/gtkprefs.c:939
+#: ../pidgin/gtkprefs.c:940
 msgid "Left"
 msgstr "ఎడమ "
 
-#: ../pidgin/gtkprefs.c:940
+#: ../pidgin/gtkprefs.c:941
 msgid "Right"
 msgstr "కుడి "
 
-#: ../pidgin/gtkprefs.c:942
-msgid "Left Vertical"
-msgstr ""
-
 #: ../pidgin/gtkprefs.c:943
+msgid "Left Vertical"
+msgstr "ఎడమవైపు నిలువుగా"
+
+#: ../pidgin/gtkprefs.c:944
 msgid "Right Vertical"
-msgstr ""
-
-#  Conversations
-#: ../pidgin/gtkprefs.c:950
-#, fuzzy
+msgstr "కుడువైపు నిలువుగా"
+
+#: ../pidgin/gtkprefs.c:951
 msgid "N_ew conversations:"
-msgstr "సంభాషణను క్లోజ్ చేయుము "
-
-#: ../pidgin/gtkprefs.c:995
-#, fuzzy
+msgstr "కొత్త_సంభాషణలు:"
+
+#: ../pidgin/gtkprefs.c:997
 msgid "Show _formatting on incoming messages"
-msgstr "_ఫార్మాటింగ్ టూల్‌బార్‌ను చూపించుము."
-
-#: ../pidgin/gtkprefs.c:998
+msgstr "వస్తున్న సందేశాలపై ఫార్మాటింగ్ _ ను చూపించు"
+
+#: ../pidgin/gtkprefs.c:999
+msgid "Close IMs immediately when the tab is closed"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1002
 #, fuzzy
 msgid "Show _detailed information"
-msgstr "ప్రొఫైల్ సమాచారం "
-
-#: ../pidgin/gtkprefs.c:1000
+msgstr "లాగ్ ఇన్ సమాచారాన్ని చూపించు"
+
+#: ../pidgin/gtkprefs.c:1004
 msgid "Enable buddy ic_on animation"
 msgstr "మిత్రుని ఐకన్ యానిమేషన్‌ను ఎనేబుల్ చేయుము. "
 
-#: ../pidgin/gtkprefs.c:1007
+#: ../pidgin/gtkprefs.c:1011
 msgid "_Notify buddies that you are typing to them"
 msgstr "మీ మిత్రులకు టైప్ చేస్తున్నట్లు వారికి _సూచించండి. "
 
-#: ../pidgin/gtkprefs.c:1010
-#, fuzzy
-msgid "Highlight _misspelled words"
-msgstr "తప్పుగా రాసిన పదములను హైలైట్ చేయుము."
-
 #: ../pidgin/gtkprefs.c:1014
+msgid "Highlight _misspelled words"
+msgstr "తప్పుగా రాసిన పదాలను హైలైట్ చేయి"
+
+#: ../pidgin/gtkprefs.c:1018
 msgid "Use smooth-scrolling"
-msgstr ""
-
-#: ../pidgin/gtkprefs.c:1017
-#, fuzzy
+msgstr "స్మూత్-స్క్రోలింగ్ ను ఉపయోగించు"
+
+#: ../pidgin/gtkprefs.c:1021
 msgid "F_lash window when IMs are received"
-msgstr "సందేశములను స్వీకరించినప్పుడు విండోను _Flash చేయుము."
-
-#  IM Convo trans options
-#: ../pidgin/gtkprefs.c:1019
+msgstr " IM లు అందుకొన్నప్పుడు విండోను ఫ్లాష్ _ చేయు"
+
+#: ../pidgin/gtkprefs.c:1023
 #, fuzzy
 msgid "Minimi_ze new conversation windows"
-msgstr "IM Conversation Windows"
-
-#: ../pidgin/gtkprefs.c:1023
+msgstr "సంభాషణ విండోను లేవనెత్తు"
+
+#: ../pidgin/gtkprefs.c:1027
 #, fuzzy
 msgid "Font"
-msgstr "ఫాంట్ ఫేస్ "
-
-#: ../pidgin/gtkprefs.c:1025
+msgstr "ఫాంట్ లు"
+
+#: ../pidgin/gtkprefs.c:1029
 msgid "Use document font from _theme"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1027
+#: ../pidgin/gtkprefs.c:1031
 msgid "Use font from _theme"
 msgstr ""
 
-#  Conversations
-#: ../pidgin/gtkprefs.c:1029
+#: ../pidgin/gtkprefs.c:1033
 #, fuzzy
 msgid "Conversation _font:"
-msgstr "సంభాషణలు "
-
-#: ../pidgin/gtkprefs.c:1043
+msgstr "సంభాషణ ఎంట్రీ"
+
+#: ../pidgin/gtkprefs.c:1047
 msgid "Default Formatting"
 msgstr "డిఫాల్ట్ (ఉపేక్షిత) ఫార్మాటింగ్ "
 
-#: ../pidgin/gtkprefs.c:1062
-#, fuzzy
-msgid ""
-"This is how your outgoing message text will appear when you use protocols "
-"that support formatting."
+#: ../pidgin/gtkprefs.c:1066
+#, fuzzy
+msgid "This is how your outgoing message text will appear when you use protocols that support formatting."
 msgstr "ఫార్మాటింగ్‌ను సపోర్టుచేసే ప్రొటోకాల్స్‌లో మీరు పంపే సందేశం ఇలా కనిపిస్తుంది. :)"
 
-#: ../pidgin/gtkprefs.c:1128
-#, fuzzy
+#: ../pidgin/gtkprefs.c:1126
+msgid "Cannot start proxy configuration program."
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1138
+#, fuzzy
+msgid "Cannot start browser configuration program."
+msgstr "వినియోగదారుని సమాచారం తీసుకొనివచ్చుటకు వీలుపడదు. "
+
+#: ../pidgin/gtkprefs.c:1158
 msgid "ST_UN server:"
-msgstr "_సెర్వర్:"
-
-#: ../pidgin/gtkprefs.c:1140
+msgstr "ST_UN సర్వర్:"
+
+#: ../pidgin/gtkprefs.c:1170
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
-msgstr ""
-
-#: ../pidgin/gtkprefs.c:1144
+msgstr "<స్పాన్ స్టైల్=\"ఇటాలిక్\">ఉదాహరణ: stunserver.org</span>"
+
+#: ../pidgin/gtkprefs.c:1174
 #, fuzzy
 msgid "_Autodetect IP address"
 msgstr "_ఆటోడిటెక్ట్ IP అడ్రస్  "
 
-#: ../pidgin/gtkprefs.c:1153
+#: ../pidgin/gtkprefs.c:1183
 msgid "Public _IP:"
 msgstr "పబ్లిక్ _IP:"
 
-#: ../pidgin/gtkprefs.c:1182
+#: ../pidgin/gtkprefs.c:1214
 msgid "Ports"
 msgstr "పోర్ట్స్ "
 
-#: ../pidgin/gtkprefs.c:1185
+#: ../pidgin/gtkprefs.c:1217
 msgid "_Manually specify range of ports to listen on"
 msgstr "వినుటకు పోర్టుల శ్రేణిని _మాన్యుయల్‌గా నోటిఫై చేయండి."
 
-#: ../pidgin/gtkprefs.c:1188
-#, fuzzy
+#: ../pidgin/gtkprefs.c:1220
 msgid "_Start port:"
-msgstr "_పోర్టును ప్రారంభించండి:"
-
-#: ../pidgin/gtkprefs.c:1195
-#, fuzzy
+msgstr "_పోర్ట్ ను ప్రారంభించండి:"
+
+#: ../pidgin/gtkprefs.c:1227
 msgid "_End port:"
-msgstr "_పోర్టును సమాప్తి చేయండి:"
-
-#: ../pidgin/gtkprefs.c:1203
+msgstr "_పోర్ట్ ను ముగించండి:"
+
+#: ../pidgin/gtkprefs.c:1235
+#, fuzzy
+msgid "Proxy Server &amp; Browser"
+msgstr "ప్రాక్సీ సర్వర్ "
+
+#: ../pidgin/gtkprefs.c:1243
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1251
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1256
+msgid ""
+"Proxy & Browser preferences are configured\n"
+"in GNOME Preferences"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1263
+#, fuzzy
+msgid "Configure _Proxy"
+msgstr "_కన్ఫిగర్ రూమ్"
+
+#: ../pidgin/gtkprefs.c:1268
+#, fuzzy
+msgid "Configure _Browser"
+msgstr "_కన్ఫిగర్ రూమ్"
+
+#: ../pidgin/gtkprefs.c:1274
 msgid "Proxy Server"
-msgstr "ప్రాక్సీ సెర్వర్ "
-
-#: ../pidgin/gtkprefs.c:1207
+msgstr "ప్రాక్సీ సర్వర్ "
+
+#: ../pidgin/gtkprefs.c:1279
 msgid "No proxy"
 msgstr "ప్రాక్సీ లేదు "
 
-#: ../pidgin/gtkprefs.c:1263
+#: ../pidgin/gtkprefs.c:1335
 msgid "_User:"
 msgstr "_వినియోగదారుడు:"
 
-#: ../pidgin/gtkprefs.c:1328
+#: ../pidgin/gtkprefs.c:1423
 msgid "Seamonkey"
-msgstr ""
-
-#: ../pidgin/gtkprefs.c:1329
+msgstr "సీమంకీ"
+
+#: ../pidgin/gtkprefs.c:1424
 msgid "Opera"
-msgstr "ఆపెరా "
-
-#: ../pidgin/gtkprefs.c:1330
+msgstr "ఒపెరా "
+
+#: ../pidgin/gtkprefs.c:1425
 msgid "Netscape"
 msgstr "నెట్‌స్కేప్ "
 
-#: ../pidgin/gtkprefs.c:1331
+#: ../pidgin/gtkprefs.c:1426
 msgid "Mozilla"
 msgstr "మొజిల్లా "
 
-#: ../pidgin/gtkprefs.c:1332
+#: ../pidgin/gtkprefs.c:1427
 msgid "Konqueror"
 msgstr "కాంకరర్ "
 
-#: ../pidgin/gtkprefs.c:1333
-#, fuzzy
+#: ../pidgin/gtkprefs.c:1428
 msgid "GNOME Default"
-msgstr "గ్నోమ్ డిఫాల్ట్ "
-
-#: ../pidgin/gtkprefs.c:1334
+msgstr "GNOME డిఫాల్ట్"
+
+#: ../pidgin/gtkprefs.c:1429
 msgid "Galeon"
 msgstr "గాలియన్ "
 
-#: ../pidgin/gtkprefs.c:1335
+#: ../pidgin/gtkprefs.c:1430
 msgid "Firefox"
 msgstr "ఫైర్‌ఫాక్స్ "
 
-#: ../pidgin/gtkprefs.c:1336
+#: ../pidgin/gtkprefs.c:1431
 msgid "Firebird"
 msgstr "ఫైర్‌బర్డ్"
 
-#: ../pidgin/gtkprefs.c:1337
+#: ../pidgin/gtkprefs.c:1432
 msgid "Epiphany"
 msgstr "ఎపిఫానీ "
 
-#: ../pidgin/gtkprefs.c:1346
+#: ../pidgin/gtkprefs.c:1441
 msgid "Manual"
 msgstr "మాన్యుయల్ "
 
-#: ../pidgin/gtkprefs.c:1399
+#: ../pidgin/gtkprefs.c:1494
 msgid "Browser Selection"
 msgstr "బ్రౌజర్ సెలక్షన్ "
 
-#: ../pidgin/gtkprefs.c:1403
+#: ../pidgin/gtkprefs.c:1498
 msgid "_Browser:"
 msgstr "_బ్రౌజర్:"
 
-#: ../pidgin/gtkprefs.c:1411
+#: ../pidgin/gtkprefs.c:1506
 msgid "_Open link in:"
-msgstr "_లింక్‌ను ఓపెన్ చేయండి:"
-
-#: ../pidgin/gtkprefs.c:1413
+msgstr ": లో _లింక్‌ను ఓపెన్ చేయండి"
+
+#: ../pidgin/gtkprefs.c:1508
 msgid "Browser default"
 msgstr "బ్రౌజర్ డిఫాల్ట్ "
 
-#: ../pidgin/gtkprefs.c:1414
+#: ../pidgin/gtkprefs.c:1509
 msgid "Existing window"
 msgstr "అస్తిత్వంలోవున్న విండో "
 
-#: ../pidgin/gtkprefs.c:1416
+#: ../pidgin/gtkprefs.c:1511
 msgid "New tab"
 msgstr "కొత్త టాబ్ "
 
-#: ../pidgin/gtkprefs.c:1430
+#: ../pidgin/gtkprefs.c:1525
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -16977,72 +17165,66 @@
 "_మాన్యుయల్:\n"
 "(%s యూఆర్ఎల్ కోసం)"
 
-#: ../pidgin/gtkprefs.c:1470
+#: ../pidgin/gtkprefs.c:1566
 #, fuzzy
 msgid "Log _format:"
 msgstr "Log _ఫార్మాట్:"
 
-#: ../pidgin/gtkprefs.c:1475
-#, fuzzy
+#: ../pidgin/gtkprefs.c:1571
 msgid "Log all _instant messages"
-msgstr "అన్ని సత్వర సందేశములను _లాగ్ చేయండి."
-
-#: ../pidgin/gtkprefs.c:1477
+msgstr "అన్ని _తక్షణ సందేశాలను లాగ్ చేయు "
+
+#: ../pidgin/gtkprefs.c:1573
 msgid "Log all c_hats"
 msgstr "చార్టుల నన్నింటిని లాగ్ చేయండి."
 
-#: ../pidgin/gtkprefs.c:1479
+#: ../pidgin/gtkprefs.c:1575
 msgid "Log all _status changes to system log"
-msgstr ""
-
-#: ../pidgin/gtkprefs.c:1625
+msgstr "అన్ని _స్థాయి మార్పులను సిస్టం లాగ్ కు లాగ్ చేయు"
+
+#: ../pidgin/gtkprefs.c:1725
 msgid "Sound Selection"
 msgstr "సౌండ్ సెలక్షన్ "
 
-#: ../pidgin/gtkprefs.c:1635
-#, fuzzy, c-format
+#: ../pidgin/gtkprefs.c:1735
 msgid "Quietest"
-msgstr "వదిలేయండి"
-
-#: ../pidgin/gtkprefs.c:1637
-#, fuzzy, c-format
+msgstr "అతి నిదానం"
+
+#: ../pidgin/gtkprefs.c:1737
 msgid "Quieter"
-msgstr "వదిలేయండి"
-
-#: ../pidgin/gtkprefs.c:1639
-#, fuzzy, c-format
+msgstr "నిదానం"
+
+# TODO: need a submenu to change status, this needs to "link"
+# * to the status in the buddy list gtkstatusbox
+#: ../pidgin/gtkprefs.c:1739
 msgid "Quiet"
-msgstr "వదిలేయండి"
-
-#: ../pidgin/gtkprefs.c:1643
-#, fuzzy, c-format
+msgstr "వైదొలగండి"
+
+#: ../pidgin/gtkprefs.c:1743
 msgid "Loud"
-msgstr "లోడ్ చేయుము."
-
-#: ../pidgin/gtkprefs.c:1645
-#, fuzzy, c-format
+msgstr "బిగ్గరగా"
+
+#: ../pidgin/gtkprefs.c:1745
 msgid "Louder"
-msgstr "గంట"
-
-#: ../pidgin/gtkprefs.c:1647
-#, fuzzy, c-format
+msgstr "బిగ్గరగా"
+
+#: ../pidgin/gtkprefs.c:1747
 msgid "Loudest"
-msgstr "శబ్దాలు "
-
-#: ../pidgin/gtkprefs.c:1713
+msgstr "చాలా బిగ్గరగా"
+
+#: ../pidgin/gtkprefs.c:1813
 msgid "_Method:"
 msgstr "_పద్ధతి:"
 
-#: ../pidgin/gtkprefs.c:1715
+#: ../pidgin/gtkprefs.c:1815
 msgid "Console beep"
 msgstr "కన్సోల్ బీప్ "
 
-#: ../pidgin/gtkprefs.c:1722
-#, fuzzy
+#: ../pidgin/gtkprefs.c:1822
 msgid "No sounds"
-msgstr "శబ్దాలు "
-
-#: ../pidgin/gtkprefs.c:1730
+msgstr "ఎలాంటి శబ్ధాలు లేవు"
+
+#: ../pidgin/gtkprefs.c:1830
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -17051,424 +17233,413 @@
 "ధ్వని కమాండ్:\n"
 "(%s ఫైల్ పేరుకోసం)"
 
-#  Remove on focus button
-#: ../pidgin/gtkprefs.c:1757
+# Remove on focus button
+#: ../pidgin/gtkprefs.c:1857
 msgid "Sounds when conversation has _focus"
-msgstr "సంభాషణ _కేంద్రీకృతమైనప్పుడు ధ్వనించును."
-
-#: ../pidgin/gtkprefs.c:1759
-#, fuzzy
+msgstr "సంభాషణ _కేంద్రీకృతమైనప్పుడు ధ్వనిస్తుంది"
+
+#: ../pidgin/gtkprefs.c:1859
 msgid "Enable sounds:"
-msgstr "విఫలమైనది "
-
-#: ../pidgin/gtkprefs.c:1770
+msgstr "శబ్ధాలకు వీలుకల్పించు:"
+
+#: ../pidgin/gtkprefs.c:1870
 msgid "Volume:"
-msgstr ""
-
-#: ../pidgin/gtkprefs.c:1850
+msgstr "సముదాయం మొత్తం:"
+
+#: ../pidgin/gtkprefs.c:1950
 msgid "Play"
-msgstr "మోగించు "
-
-#: ../pidgin/gtkprefs.c:1927
-#, fuzzy
+msgstr "ప్లే చేయి"
+
+#: ../pidgin/gtkprefs.c:2028
 msgid "_Report idle time:"
-msgstr "సోమరి _సమయములను చూపించుము. "
-
-#: ../pidgin/gtkprefs.c:1932
+msgstr "ఖాళీ సమయాన్ని నివేదించు_:"
+
+#: ../pidgin/gtkprefs.c:2033
 msgid "Based on keyboard or mouse use"
-msgstr ""
-
-#  *< api_version
+msgstr "కీబోర్డ్ లేదా మౌస్ ను ఉపయోగాన్ని అనుసరించి"
+
+# *< api_version
 #  *< type
 #  *< ui_requirement
 #  *< flags
 #  *< dependencies
 #  *< priority
 #  *< id
-#: ../pidgin/gtkprefs.c:1941
+#: ../pidgin/gtkprefs.c:2042
 msgid "_Auto-reply:"
 msgstr "_ఆటో-రిప్లై:"
 
-#: ../pidgin/gtkprefs.c:1945
-#, fuzzy
+#: ../pidgin/gtkprefs.c:2046
 msgid "When both away and idle"
-msgstr "దూరంగానూ, సోమరిగానూ ఉన్నప్పుడు"
+msgstr "ఇద్దరూ దూరంగా లేదా ఖాళీగా ఉన్నప్పుడు"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1951
+#: ../pidgin/gtkprefs.c:2052
 msgid "Auto-away"
 msgstr "స్వతఃదూరం"
 
-#: ../pidgin/gtkprefs.c:1953
-#, fuzzy
+#: ../pidgin/gtkprefs.c:2054
 msgid "Change status when _idle"
-msgstr "_సోమరిగా నున్నప్పుడు దూరంగా ఉండుము."
-
-#: ../pidgin/gtkprefs.c:1957
+msgstr "_ఖాళీగా ఉన్నప్పుడు స్థాయిని మార్చు"
+
+#: ../pidgin/gtkprefs.c:2058
 #, fuzzy
 msgid "_Minutes before becoming idle:"
-msgstr "_దూరంగా పోవడానికి ముందుగా:"
-
-#: ../pidgin/gtkprefs.c:1965
-#, fuzzy
+msgstr "స్థాయిమార్చడానికి _నిమిషాల ముందు:"
+
+#: ../pidgin/gtkprefs.c:2066
 msgid "Change _status to:"
-msgstr "అడ్రసును మార్చండి:"
+msgstr " _స్థాయిని కు మార్చు:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1986
+#: ../pidgin/gtkprefs.c:2087
 msgid "Status at Startup"
-msgstr ""
-
-#: ../pidgin/gtkprefs.c:1988
+msgstr "ప్రారంభంలో స్థాయి"
+
+#: ../pidgin/gtkprefs.c:2089
 msgid "Use status from last _exit at startup"
-msgstr ""
-
-#: ../pidgin/gtkprefs.c:1994
+msgstr "ప్రారంభంలో _చివరిసారి వదిలినప్పటి నుంచి స్థాయిని ఉపయోగించు"
+
+#: ../pidgin/gtkprefs.c:2095
 msgid "Status to a_pply at startup:"
-msgstr ""
-
-#: ../pidgin/gtkprefs.c:2032
+msgstr "ప్రారంభంలో _ఉపయోగించడానికి స్థాయి:"
+
+#: ../pidgin/gtkprefs.c:2134
 msgid "Interface"
 msgstr "ఇంటర్‌ఫేస్ "
 
-#: ../pidgin/gtkprefs.c:2034
+#: ../pidgin/gtkprefs.c:2136
 msgid "Smiley Themes"
 msgstr "స్మైలీ కథలు "
 
-#: ../pidgin/gtkprefs.c:2041
+#: ../pidgin/gtkprefs.c:2143
 msgid "Browser"
 msgstr "బ్రౌజర్ "
 
-#: ../pidgin/gtkprefs.c:2045
-#, fuzzy
+#: ../pidgin/gtkprefs.c:2147
 msgid "Status / Idle"
-msgstr "దూరం / సోమరి"
+msgstr "స్థాయి / ఖాళీ"
 
 #: ../pidgin/gtkprivacy.c:80
 msgid "Allow all users to contact me"
-msgstr "వినియోగదారులందరు నన్ను సంప్రదించుటకు అనుమతించుము."
+msgstr "వినియోగదారులందరూ నన్ను సంప్రదించుటకు అనుమతించు"
 
 #: ../pidgin/gtkprivacy.c:81
 msgid "Allow only the users on my buddy list"
-msgstr "నా మిత్రుల లిస్టులో ఉన్నవారిని మాత్రమే అనుమతించుము. "
+msgstr "నా మిత్రుల జాబితాలో ఉన్నవారిని మాత్రమే అనుమతించు"
 
 #: ../pidgin/gtkprivacy.c:82
 msgid "Allow only the users below"
-msgstr "ఈ క్రిందివారిని మాత్రమే అనుమతించుము. "
+msgstr "ఈ క్రిందివారిని మాత్రమే అనుమతించుము"
 
 #: ../pidgin/gtkprivacy.c:83
 msgid "Block all users"
-msgstr "వినియోగదారు లందరినీ ఆపుము "
+msgstr "వినియోగదారులందరినీ ఆపండి"
 
 #: ../pidgin/gtkprivacy.c:84
 msgid "Block only the users below"
-msgstr "ఈ క్రింది వినియోగదారులను మాత్రమే ఆపుము. "
-
-#: ../pidgin/gtkprivacy.c:370
+msgstr "ఈ క్రింది వినియోగదారులను మాత్రమే ఆపండి"
+
+#: ../pidgin/gtkprivacy.c:372
 msgid "Privacy"
 msgstr "రహస్యం"
 
-#: ../pidgin/gtkprivacy.c:382
+#: ../pidgin/gtkprivacy.c:384
 msgid "Changes to privacy settings take effect immediately."
 msgstr "రహస్య సెట్టింగులకు చేసిన మార్పులు వెంటనే అమల్లోకి వస్తాయి."
 
+# "Set privacy for:" label
 #. "Set privacy for:" label
-#: ../pidgin/gtkprivacy.c:394
+#: ../pidgin/gtkprivacy.c:396
 msgid "Set privacy for:"
-msgstr "కి రహస్య సెట్టింగును సెట్ చేయండి:"
-
-#: ../pidgin/gtkprivacy.c:557 ../pidgin/gtkprivacy.c:574
+msgstr ": కి రహస్య సెట్టింగును సెట్ చేయండి"
+
+#: ../pidgin/gtkprivacy.c:559
+#: ../pidgin/gtkprivacy.c:576
 msgid "Permit User"
 msgstr "వినియోగదారుని అనుమతించండి "
 
-#: ../pidgin/gtkprivacy.c:558
+#: ../pidgin/gtkprivacy.c:560
 msgid "Type a user you permit to contact you."
 msgstr "మిమ్మల్ని సంప్రదించడానికి అనుమతించిన వినియోగదారుని పేరును టైప్ చేయండి."
 
-#: ../pidgin/gtkprivacy.c:559
+#: ../pidgin/gtkprivacy.c:561
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "మిమ్మల్ని సంప్రదించాలని మీరు కోరుకునే మిత్రుని పేరును ఎంటర్ చేయండి."
 
-#: ../pidgin/gtkprivacy.c:562 ../pidgin/gtkprivacy.c:578
-#, fuzzy
+#: ../pidgin/gtkprivacy.c:564
+#: ../pidgin/gtkprivacy.c:580
 msgid "_Permit"
-msgstr "అనుమతి "
-
-#: ../pidgin/gtkprivacy.c:568
+msgstr "_అనుమతించు "
+
+#: ../pidgin/gtkprivacy.c:570
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "%s మిమ్మల్ని సంప్రదించడానికి అనుమతిస్తున్నారా?"
 
-#: ../pidgin/gtkprivacy.c:570
+#: ../pidgin/gtkprivacy.c:572
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "%s మిమ్మల్ని సంప్రదించడానికి నిజంగానే అనుమతిస్తున్నారా?"
 
-#: ../pidgin/gtkprivacy.c:599 ../pidgin/gtkprivacy.c:613
+#: ../pidgin/gtkprivacy.c:601
+#: ../pidgin/gtkprivacy.c:615
 msgid "Block User"
 msgstr "వినియోగదారుని ఆపుము."
 
-#: ../pidgin/gtkprivacy.c:600
+#: ../pidgin/gtkprivacy.c:602
 msgid "Type a user to block."
 msgstr "ఆపు చేయాలనుకున్న వినియోగదారుని  పేరును ఆపుము. "
 
-#: ../pidgin/gtkprivacy.c:601
+#: ../pidgin/gtkprivacy.c:603
 msgid "Please enter the name of the user you wish to block."
-msgstr "మీరు ఆపుచేయదల్చుకున్న వినియోగదారుని పేరును ఎంటర్ చేయండి."
-
-#: ../pidgin/gtkprivacy.c:609
+msgstr "మీరు ఆపుచేయదల్చుకున్న వినియోగదారుని పేరును నమోదు చేయండి."
+
+#: ../pidgin/gtkprivacy.c:611
 #, c-format
 msgid "Block %s?"
 msgstr "%sని ఆపాలా?"
 
-#: ../pidgin/gtkprivacy.c:611
+#: ../pidgin/gtkprivacy.c:613
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "%sను మీరు నిజంగానే ఆపాలనుకుంటున్నారా?"
 
-#: ../pidgin/gtkrequest.c:272
+#: ../pidgin/gtkrequest.c:322
 msgid "Apply"
-msgstr "అమలుపరచుము"
-
-#: ../pidgin/gtkrequest.c:1507
+msgstr "అమలుపరచు"
+
+#: ../pidgin/gtkrequest.c:1651
 msgid "That file already exists"
-msgstr "ఫైలు అస్తిత్వంలో ఉంది. "
-
-#: ../pidgin/gtkrequest.c:1508
+msgstr "ఫైలు అస్తిత్వంలో ఉంది"
+
+#: ../pidgin/gtkrequest.c:1652
 msgid "Would you like to overwrite it?"
 msgstr "ఓవర్ రైట్ చేయదల్చుకున్నారా?"
 
-#: ../pidgin/gtkrequest.c:1511
+#: ../pidgin/gtkrequest.c:1655
 msgid "Overwrite"
-msgstr ""
-
-#: ../pidgin/gtkrequest.c:1512
+msgstr "ఉన్నదానిపై కొత్తది వచ్చి చేరు"
+
+#: ../pidgin/gtkrequest.c:1656
 msgid "Choose New Name"
-msgstr ""
-
-#: ../pidgin/gtkrequest.c:1650 ../pidgin/gtkrequest.c:1664
-#, fuzzy
+msgstr "కొత్త పేరును ఎంపికచేయు"
+
+#: ../pidgin/gtkrequest.c:1797
+#: ../pidgin/gtkrequest.c:1811
 msgid "Select Folder..."
-msgstr "టెక్‌స్ట్ కలర్‌ను సెలక్ట్ చేయుము."
+msgstr "ఫోల్డర్ ను ఎంపికచేయు..."
 
 #. Create the window.
-#: ../pidgin/gtkroomlist.c:375
+#: ../pidgin/gtkroomlist.c:518
+#: ../pidgin/gtkroomlist.c:688
 msgid "Room List"
-msgstr "గది లిస్ట్ "
-
+msgstr "రూమ్ జాబితా"
+
+# list button
 #. list button
-#: ../pidgin/gtkroomlist.c:443
+#: ../pidgin/gtkroomlist.c:756
 msgid "_Get List"
-msgstr "_లిస్టును తీసుకురమ్ము "
+msgstr "_జాబితాను పొందండి"
 
 #. add button
-#: ../pidgin/gtkroomlist.c:451
-#, fuzzy
+#: ../pidgin/gtkroomlist.c:764
 msgid "_Add Chat"
-msgstr "సంభాషణ చేర్చండి."
+msgstr "_సంభాషణ చేర్చు"
 
 #: ../pidgin/gtksavedstatuses.c:337
-#, fuzzy
 msgid "Are you sure you want to delete the selected saved statuses?"
-msgstr "మీరు %sను తప్పకుండా తొలగించదల్చుకున్నారా?"
+msgstr "ఎంపిక చేసిన సేవ్ అయిన స్థాయులను తొలగించదలచుకున్నారా?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:620 ../pidgin/gtksavedstatuses.c:1266
-#, fuzzy
+#: ../pidgin/gtksavedstatuses.c:620
+#: ../pidgin/gtksavedstatuses.c:1273
 msgid "_Use"
-msgstr "_ఉపయోగించుము,"
+msgstr "_ఉపయోగించు"
 
 #: ../pidgin/gtksavedstatuses.c:780
 msgid "Title already in use.  You must choose a unique title."
-msgstr ""
-
-#: ../pidgin/gtksavedstatuses.c:970
-#, fuzzy
+msgstr "శీర్షిక ఇప్పటికే ఉపయోగంలో ఉంది. ప్రత్యేకమైన శీర్షికను మీరు ఎంపిక చేసుకోవాల్సి ఉంటుంది. "
+
+#: ../pidgin/gtksavedstatuses.c:976
 msgid "Different"
-msgstr "శాఖ "
-
-#: ../pidgin/gtksavedstatuses.c:1159
-#, fuzzy
+msgstr "భిన్నమైనది"
+
+#: ../pidgin/gtksavedstatuses.c:1165
 msgid "_Title:"
-msgstr "టైటిల్ "
-
-#  Autostart
-#: ../pidgin/gtksavedstatuses.c:1178 ../pidgin/gtksavedstatuses.c:1497
-#, fuzzy
+msgstr "_శీర్షిక:"
+
+# Autostart
+#: ../pidgin/gtksavedstatuses.c:1184
+#: ../pidgin/gtksavedstatuses.c:1505
 msgid "_Status:"
-msgstr "స్టాటస్ :"
+msgstr "_స్థాయి :"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1210
+#: ../pidgin/gtksavedstatuses.c:1217
 msgid "Use a _different status for some accounts"
-msgstr ""
+msgstr "అవే అకౌంట్ల కోసం_ భిన్న స్థాయిలను ఉపయోగించు"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1274
+#: ../pidgin/gtksavedstatuses.c:1281
 msgid "Sa_ve & Use"
-msgstr "సేవ్ చేయుము & ఉపయోగించుము"
-
-#: ../pidgin/gtksavedstatuses.c:1480
-#, fuzzy, c-format
+msgstr "సేవ్ చేసి, ఉపయోగించు"
+
+#: ../pidgin/gtksavedstatuses.c:1488
+#, c-format
 msgid "Status for %s"
-msgstr "స్టాటస్: %s"
+msgstr "%s కోసం స్థాయి "
 
 #: ../pidgin/gtkstatusbox.c:664
-#, fuzzy
 msgid "Waiting for network connection"
-msgstr "ట్రాన్స్‌ఫర్ అగుటకు ప్రతీక్షించుచున్నది."
-
-#: ../pidgin/gtkutils.c:632
+msgstr "నెట్ వర్క్ కనెక్షన్ కోసం ఎదురుచూపు"
+
+#: ../pidgin/gtkstatusbox.c:1072
+#, fuzzy
+msgid "New status..."
+msgstr "కొత్త సందేశం... "
+
+#: ../pidgin/gtkstatusbox.c:1073
+#, fuzzy
+msgid "Saved statuses..."
+msgstr "సేవ్ చేసిన స్థాయులు"
+
+#: ../pidgin/gtkutils.c:634
+#, fuzzy
 msgid "Google Talk"
-msgstr ""
-
-#: ../pidgin/gtkutils.c:1399 ../pidgin/gtkutils.c:1422
-#, fuzzy, c-format
+msgstr "Toggle Tag"
+
+#: ../pidgin/gtkutils.c:1401
+#: ../pidgin/gtkutils.c:1424
+#, c-format
 msgid "The following error has occurred loading %s: %s"
-msgstr "అజ్ఞాత సైనాన్ పొరపాటు సంభవించింది: %s."
-
-#: ../pidgin/gtkutils.c:1402 ../pidgin/gtkutils.c:1424
-#, fuzzy
+msgstr "%s: %s ను లోడ్ చేస్తున్నప్పుడు ఈ కింది పొరపాట్లు జరిగాయి"
+
+#: ../pidgin/gtkutils.c:1404
+#: ../pidgin/gtkutils.c:1426
 msgid "Failed to load image"
-msgstr "సచిత్రమును స్టోర్ చేయడంలో వైఫల్యం: %s\n"
-
-#: ../pidgin/gtkutils.c:1498
-#, fuzzy, c-format
+msgstr "చిత్రాన్ని లోడ్ చేయడంలో వైఫల్యం"
+
+#: ../pidgin/gtkutils.c:1500
+#, c-format
 msgid "Cannot send folder %s."
-msgstr "ఫైలును పంపుట సాధ్యం కాదు. "
-
-#: ../pidgin/gtkutils.c:1499
-#, c-format
-msgid ""
-"%s cannot transfer a folder. You will need to send the files within "
-"individually."
-msgstr ""
-
-#: ../pidgin/gtkutils.c:1531 ../pidgin/gtkutils.c:1543
-#: ../pidgin/gtkutils.c:1550
-#, fuzzy
+msgstr "ఫోల్డర్ %s ను పంపజాలదు."
+
+#: ../pidgin/gtkutils.c:1501
+#, c-format
+msgid "%s cannot transfer a folder. You will need to send the files within individually."
+msgstr "%s ఫోల్డర్ ను బదిలీ చేయజాలదు. వ్యక్తిగత పరిధిలో మీరు ఫైళ్ళు పంపాల్సి ఉంటుంది"
+
+#: ../pidgin/gtkutils.c:1535
+#: ../pidgin/gtkutils.c:1547
+#: ../pidgin/gtkutils.c:1554
 msgid "You have dragged an image"
-msgstr "మీరు పనికిరాని వినియోగదారుని పేరును ఎంటర్ చేసినారు. "
-
-#: ../pidgin/gtkutils.c:1532
-msgid ""
-"You can send this image as a file transfer, embed it into this message, or "
-"use it as the buddy icon for this user."
-msgstr ""
-
-#: ../pidgin/gtkutils.c:1538 ../pidgin/gtkutils.c:1558
-#, fuzzy
+msgstr "మీరు చిత్రాన్ని తెచ్చివేశారు"
+
+#: ../pidgin/gtkutils.c:1536
+msgid "You can send this image as a file transfer, embed it into this message, or use it as the buddy icon for this user."
+msgstr "మీరు ఈ చిత్రాన్ని ఫైలు బదిలీగా పంపవచ్చు, ఈ సందేశంలో పొందుపరచవచ్చు లేదా ఈ వినియోగదారు కోసం మిత్రుని ఐకాన్ గా ఉపయోగించవచ్చు."
+
+#: ../pidgin/gtkutils.c:1542
+#: ../pidgin/gtkutils.c:1562
 msgid "Set as buddy icon"
-msgstr "మిత్రుల _ఐకన్లను ప్రదర్శించుము."
-
-#: ../pidgin/gtkutils.c:1539 ../pidgin/gtkutils.c:1559
-#, fuzzy
+msgstr "మిత్రుని ఐకాన్ గా సెట్ చేయు"
+
+#: ../pidgin/gtkutils.c:1543
+#: ../pidgin/gtkutils.c:1563
 msgid "Send image file"
-msgstr "సందేశమును పంపుము "
-
-#: ../pidgin/gtkutils.c:1540 ../pidgin/gtkutils.c:1559
-#, fuzzy
-msgid "Insert in message"
-msgstr "సచిత్రమును చేర్చండి."
+msgstr "చిత్రం ఫైలును పంపు"
 
 #: ../pidgin/gtkutils.c:1544
-#, fuzzy
+#: ../pidgin/gtkutils.c:1563
+msgid "Insert in message"
+msgstr "సందేశంలో పొందుపరచు"
+
+#: ../pidgin/gtkutils.c:1548
 msgid "Would you like to set it as the buddy icon for this user?"
-msgstr "మీరు సంభాషణలో పాల్గొనదల్చుకున్నారా?"
-
-#: ../pidgin/gtkutils.c:1551
-#, fuzzy
-msgid ""
-"You can send this image as a file transfer, or use it as the buddy icon for "
-"this user."
-msgstr "మీరు సంభాషణలో పాల్గొనదల్చుకున్నారా?"
-
-#: ../pidgin/gtkutils.c:1552
-msgid ""
-"You can insert this image into this message, or use it as the buddy icon for "
-"this user"
-msgstr ""
-
+msgstr "మీరు దీన్ని ఈ వినియోగదారు కోసం మిత్రుని ఐకాన్ గా సెట్ చేయ దలిచారా?"
+
+#: ../pidgin/gtkutils.c:1555
+#, fuzzy
+msgid "You can send this image as a file transfer, or use it as the buddy icon for this user."
+msgstr "మీరు ఈ చిత్రాన్ని ఫైలు బదిలీగా పంపవచ్చు, ఈ సందేశంలో పొందుపరచవచ్చు లేదా ఈ వినియోగదారు కోసం మిత్రుని ఐకాన్ గా ఉపయోగించవచ్చు."
+
+#: ../pidgin/gtkutils.c:1556
+msgid "You can insert this image into this message, or use it as the buddy icon for this user"
+msgstr "మీరు ఈ చిత్రాన్ని ఈ సందేశంలో పొందుపరచవచ్చు లేదా ఈ వినియోగదారు కోసం దీన్ని మిత్రుని ఐకాన్ గా ఉపయోగించ వచ్చు"
+
+# I don't know if we really want to do anything here.  Most of the desktop item types are crap like
+# * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
+# * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
+# * Probably not.  I'll just give an error and return.
+# The original patch sent the icon used by the launcher.  That's probably wrong
 #. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
 #. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1610
-#, fuzzy
+#: ../pidgin/gtkutils.c:1615
 msgid "Cannot send launcher"
-msgstr "ఫైలును పంపుట సాధ్యం కాదు. "
-
-#: ../pidgin/gtkutils.c:1610
-msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
-msgstr ""
-
-#: ../pidgin/gtkutils.c:2345
+msgstr "లాంచర్ ను పంపజాలదు"
+
+#: ../pidgin/gtkutils.c:1615
+msgid "You dragged a desktop launcher. Most likely you wanted to send whatever this launcher points to instead of this launcher itself."
+msgstr "మీరు డెస్క్ టాప్ లాంచర్ ను తెచ్చివేశారు. స్వయంగా ఈ లాంచర్ ను పంపేబదులు లాంచర్ దేన్ని సూచిస్తే దాన్నిపంపాలని మీరు భావిస్తున్నట్టుంది."
+
+#: ../pidgin/gtkutils.c:2350
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
 "<b>File size:</b> %s\n"
 "<b>Image size:</b> %dx%d"
 msgstr ""
-"<b>फा़इल:</b> %s\n"
-"<b>फा़इल आकार:</b> %s\n"
-"<b>छवि आकार:</b> %dx%d"
-
-#: ../pidgin/gtkutils.c:2641
+"<b>ఫైల్:</b> %s\n"
+"<b>ఫైల్ పరిమాణం:</b> %s\n"
+"<b>చిత్ర పరిమాణం:</b> %dx%d"
+
+#: ../pidgin/gtkutils.c:2646
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
-msgstr ""
-
-# #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
-# gnome-session/gsm-client-row.c:43
-# #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
-# gnome-session/gsm-client-row.c:43
-#: ../pidgin/gtkutils.c:2643
-#, fuzzy
+msgstr "'%s' ఫైలు %s కు చాలా పెద్దగా ఉంది. దయచేసి చిన్నచిత్రం కోసం ప్రయత్నించండి.\n"
+
+#: ../pidgin/gtkutils.c:2648
 msgid "Icon Error"
-msgstr "అజ్ఞాత పొరపాటు. "
-
-#: ../pidgin/gtkutils.c:2644
-#, fuzzy
+msgstr "ఐకాన్ లోపం"
+
+#: ../pidgin/gtkutils.c:2649
 msgid "Could not set icon"
-msgstr "పంపలేకపోయింది."
-
-#: ../pidgin/gtkutils.c:2744
-#, fuzzy, c-format
+msgstr "ఐకాన్ ను సెట్ చేయలేదు"
+
+#: ../pidgin/gtkutils.c:2749
+#, c-format
 msgid "Failed to open file '%s': %s"
-msgstr "సచిత్రమును స్టోర్ చేయడంలో వైఫల్యం: %s\n"
-
-#: ../pidgin/gtkutils.c:2793
-#, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr ""
-
-#: ../pidgin/gtkwhiteboard.c:754 ../pidgin/gtkwhiteboard.c:773
-#, fuzzy
+msgstr "ఫైలు '%s': %s ను తెరవడంలో వైఫల్యం"
+
+#: ../pidgin/gtkutils.c:2798
+#, c-format
+msgid "Failed to load image '%s': reason not known, probably a corrupt image file"
+msgstr "చిత్రం '%s': ను లోడ్ చేయడంలో వైఫల్యం కారణం తెలియదు, బహుశా చిత్రంఫైలు కరప్ట్ అయిఉండవచ్చు"
+
+#: ../pidgin/gtkwhiteboard.c:754
+#: ../pidgin/gtkwhiteboard.c:773
 msgid "Save File"
-msgstr "ఫైలును సేవ్ చేయుము..."
+msgstr "ఫైలును సేవ్ చేయి"
 
 #: ../pidgin/gtkwhiteboard.c:861
-#, fuzzy
 msgid "Select color"
-msgstr "టెక్‌స్ట్ కలర్‌ను సెలక్ట్ చేయుము."
+msgstr "రంగును ఎంపికచేయు"
 
 #: ../pidgin/pidginstock.c:87
 msgid "_Alias"
-msgstr "_ఉపనామం"
+msgstr "_మారుపేరు"
 
 #: ../pidgin/pidginstock.c:89
-#, fuzzy
 msgid "Close _tabs"
-msgstr "క్లోజ్ "
+msgstr "_టాబ్స్ మూసివేయు"
 
 #: ../pidgin/pidginstock.c:91
-#, fuzzy
 msgid "_Get Info"
-msgstr "సమాచారం తీసుకురండి."
+msgstr "_సమాచారం పొందండి"
 
 #: ../pidgin/pidginstock.c:92
 msgid "_Invite"
@@ -17476,15 +17647,16 @@
 
 #: ../pidgin/pidginstock.c:93
 msgid "_Modify"
-msgstr "_మార్పుచేర్పులు చేయు"
+msgstr "_సవరించు"
 
 #: ../pidgin/pidginstock.c:94
 msgid "_Open Mail"
 msgstr "_మెయిల్‌ను ఓపెన్ చేయుము"
 
 #: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2
+#, fuzzy
 msgid "Pidgin smileys"
-msgstr ""
+msgstr "పిడ్గ్విన్ అవకాశాలు"
 
 #: ../pidgin/pixmaps/emotes/none/none.theme.in.h:1
 msgid "Penguin Pimps"
@@ -17497,43 +17669,43 @@
 #: ../pidgin/pixmaps/emotes/none/none.theme.in.h:3
 #, fuzzy
 msgid "none"
-msgstr "ఎవరైనా "
-
-#: ../pidgin/plugins/cap/cap.c:450
-#, fuzzy
+msgstr "(ఏమీ లేదు)"
+
+#: ../pidgin/plugins/cap/cap.c:451
 msgid "Display Statistics"
-msgstr "సమయం ముగిసిన నోటీసులను ప్రదర్శించుము."
-
-#: ../pidgin/plugins/cap/cap.c:462 ../pidgin/plugins/cap/cap.c:465
-#, fuzzy
+msgstr "గణాంకాలను ప్రదర్శించు"
+
+#: ../pidgin/plugins/cap/cap.c:464
+#: ../pidgin/plugins/cap/cap.c:467
 msgid "Response Probability:"
-msgstr " కోల్పోయిన బాధ్యతలు "
-
-#: ../pidgin/plugins/cap/cap.c:811
-#, fuzzy
+msgstr "స్పందించే అవకాశాలు:"
+
+#: ../pidgin/plugins/cap/cap.c:813
 msgid "Statistics Configuration"
-msgstr "ట్రే ఐకన్ కన్ఫిగరేషన్ "
+msgstr "గణాంకాల కన్ఫిగరేషన్"
 
 #. msg_difference spinner
-#: ../pidgin/plugins/cap/cap.c:814
+#: ../pidgin/plugins/cap/cap.c:816
 msgid "Maximum response timeout:"
-msgstr ""
-
-#: ../pidgin/plugins/cap/cap.c:817 ../pidgin/plugins/cap/cap.c:824
-#: ../pidgin/plugins/cap/cap.c:831 ../pidgin/plugins/timestamp.c:150
+msgstr "స్పందించడానికి కావల్సిన గరిష్ఠ సమయం:"
+
+#: ../pidgin/plugins/cap/cap.c:819
+#: ../pidgin/plugins/cap/cap.c:826
+#: ../pidgin/plugins/cap/cap.c:833
+#: ../pidgin/plugins/timestamp.c:150
 #, fuzzy
 msgid "minutes"
 msgstr "నిమిషాలు "
 
 #. last_seen spinner
-#: ../pidgin/plugins/cap/cap.c:821
+#: ../pidgin/plugins/cap/cap.c:823
 msgid "Maximum last-seen difference:"
-msgstr ""
+msgstr "క్రితంసారి- కనబడిన గరిష్ఠ తేడా:"
 
 #. threshold spinner
-#: ../pidgin/plugins/cap/cap.c:828
+#: ../pidgin/plugins/cap/cap.c:830
 msgid "Threshold:"
-msgstr ""
+msgstr "సింహద్వారం:"
 
 #. *< type
 #. *< ui_requirement
@@ -17541,180 +17713,162 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/cap/cap.c:936
+#: ../pidgin/plugins/cap/cap.c:938
 msgid "Contact Availability Prediction"
-msgstr ""
+msgstr "అవైలబిలిటి ప్రెడిక్షన్  పై కాంటాక్టు చేయు"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/cap/cap.c:938
+#: ../pidgin/plugins/cap/cap.c:940
 msgid "Contact Availability Prediction plugin."
-msgstr ""
+msgstr "అవైలబిలిటి ప్రెడిక్షన్ ప్లగ్ ఇన్  పై కాంటాక్టు చేయు"
 
 #. *  summary
-#: ../pidgin/plugins/cap/cap.c:939
-msgid ""
-"The contact availability plugin (cap) is used to display statistical "
-"information about buddies in a users contact list."
-msgstr ""
+#: ../pidgin/plugins/cap/cap.c:941
+msgid "The contact availability plugin (cap) is used to display statistical information about buddies in a users contact list."
+msgstr "వినియోగదారు కాంటాక్టు జాబితాలోని మిత్రులకు సంబంధించి గణాంక సమాచారాన్ని చూపడానికి కాంటాక్టు అవైలబిలిటీ ప్లగ్ ఇన్ (క్యాప్) ని ఉపయోగిస్తారు."
 
 #: ../pidgin/plugins/contact_priority.c:61
-#, fuzzy
 msgid "Buddy is idle"
-msgstr "మిత్రుడు సోమరిపోతు : "
+msgstr "మిత్రుడు ఖాళీగా ఉన్నాడు "
 
 #: ../pidgin/plugins/contact_priority.c:62
-#, fuzzy
 msgid "Buddy is away"
-msgstr "మిత్రుడు వెళ్లిపోయినాడు:"
+msgstr "మిత్రుడు దూరంగా ఉన్నాడు"
 
 #: ../pidgin/plugins/contact_priority.c:63
-#, fuzzy
 msgid "Buddy is \"extended\" away"
-msgstr "మిత్రుడు వెళ్లిపోయినాడు:"
+msgstr "మిత్రుడు \"విస్తరించాడు\" మరింతగా"
 
 #. Not used yet.
 #: ../pidgin/plugins/contact_priority.c:66
-#, fuzzy
 msgid "Buddy is mobile"
-msgstr "మిత్రుడు సోమరిపోతు : "
+msgstr "మిత్రుడు మొబైల్ లో ఉన్నారు"
 
 #: ../pidgin/plugins/contact_priority.c:68
-#, fuzzy
 msgid "Buddy is offline"
-msgstr "మిత్రుడు ఆఫ్‌లైన్‌లో ఉన్నాడు:"
+msgstr "మిత్రుడు ఆఫ్‌లైన్‌లో ఉన్నాడు"
 
 #: ../pidgin/plugins/contact_priority.c:90
 msgid "Point values to use when..."
 msgstr "అప్పుడు పాయింట్ విలువలను ఉపయోగించాలి ... "
 
 #: ../pidgin/plugins/contact_priority.c:118
-msgid ""
-"The buddy with the <i>largest score</i> is the buddy who will have priority "
-"in the contact.\n"
-msgstr ""
+msgid "The buddy with the <i>largest score</i> is the buddy who will have priority in the contact.\n"
+msgstr "<i>అత్యధిక స్కోరు</i> కలిగి ఉన్న మిత్రుడే కాంటాక్టు లో ప్రాధాన్యం కలిగి ఉండే మిత్రుడు.\n"
 
 #: ../pidgin/plugins/contact_priority.c:125
 msgid "Use last buddy when scores are equal"
-msgstr ""
+msgstr "స్కోర్లు సమానంగా ఉన్నప్పుడు చివరిగా ఉన్న మిత్రుణ్ని ఉపయోగించు"
 
 #: ../pidgin/plugins/contact_priority.c:130
-#, fuzzy
 msgid "Point values to use for account..."
-msgstr "లెక్కకోసం పాయింట్ విలువలను ఉపయోగించాలి ..."
-
-#  *< api_version
+msgstr "అకౌంటు కోసం ఉపయోగించడానికి పాయింటు విలువలు..."
+
+# *< api_version
 #  *< type
 #  *< ui_requirement
 #  *< flags
 #  *< dependencies
 #  *< priority
 #  *< id
+# *< type
+# *< ui_requirement
+# *< flags
+# *< dependencies
+# *< priority
+# *< id
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/contact_priority.c:187
+#: ../pidgin/plugins/contact_priority.c:188
 msgid "Contact Priority"
 msgstr "మున్ముందుగా సంప్రదించాలి."
 
-#  *< name
+# *< name
 #  *< version
 #  *< summary
+# *< version
+# *< summary
 #. *< name
 #. *< version
 #. *< summary
-#: ../pidgin/plugins/contact_priority.c:190
-msgid ""
-"Allows for controlling the values associated with different buddy states."
-msgstr "భిన్నమైన స్నేహ పరిస్థితులకు తగిన విలువలను ఆపాదించి నియంత్రించును."
-
-#  *< description
+#: ../pidgin/plugins/contact_priority.c:191
+msgid "Allows for controlling the values associated with different buddy states."
+msgstr "భిన్నమైన స్నేహ పరిస్థితులకు తగిన విలువలను ఆపాదించి నియంత్రిస్తుంది."
+
+# *< description
 #. *< description
-#: ../pidgin/plugins/contact_priority.c:192
-msgid ""
-"Allows for changing the point values of idle/away/offline states for buddies "
-"in contact priority computations."
-msgstr ""
-"స్నేహాల్లో హెచ్చుతగ్గులుండును. ఈ విలువలు సోమరి/దూరపు/ఆఫ్‌లైన్ పరిస్థితులపై ఆధారపడి  మారుటకు "
-"అనుమతించును. "
-
-#  Conversations
+#: ../pidgin/plugins/contact_priority.c:193
+msgid "Allows for changing the point values of idle/away/offline states for buddies in contact priority computations."
+msgstr "స్నేహాల్లో హెచ్చుతగ్గులుండును. ఈ విలువలు ఖాళీగా/దూరపు/ఆఫ్‌లైన్ పరిస్థితులపై ఆధారపడి  మారుటకు అనుమతిస్తుంది. "
+
 #: ../pidgin/plugins/convcolors.c:23
-#, fuzzy
 msgid "Conversation Colors"
-msgstr "/సంభాషణ/_ముగించుము"
-
-#  IM Convo trans options
-#: ../pidgin/plugins/convcolors.c:25 ../pidgin/plugins/convcolors.c:26
-#, fuzzy
+msgstr "సంభాషణ రంగులు"
+
+#: ../pidgin/plugins/convcolors.c:25
+#: ../pidgin/plugins/convcolors.c:26
 msgid "Customize colors in the conversation window"
-msgstr "IM Conversation Windows"
+msgstr "సంభాషణ విండోలో రంగులను వాడు"
 
 #: ../pidgin/plugins/convcolors.c:82
-#, fuzzy
 msgid "Error Messages"
-msgstr "పొరపాటు సందేశం అణచివేయబడింది."
+msgstr "తప్పుడు సందేశాలు"
 
 #: ../pidgin/plugins/convcolors.c:83
-#, fuzzy
 msgid "Highlighted Messages"
-msgstr "సందేశాన్ని పంపండి. "
+msgstr "హైలైట్ చేసిన సందేశాలు"
 
 #: ../pidgin/plugins/convcolors.c:84
-#, fuzzy
 msgid "System Messages"
-msgstr "సందేశాన్ని పంపండి. "
+msgstr "సిస్టమ్ సందేశాలు"
 
 #: ../pidgin/plugins/convcolors.c:85
-#, fuzzy
 msgid "Sent Messages"
-msgstr "సందేశాన్ని పంపండి. "
+msgstr "సందేశాలను పంపించు "
 
 #: ../pidgin/plugins/convcolors.c:86
-#, fuzzy
 msgid "Received Messages"
-msgstr "సందేశాన్ని పంపండి. "
-
-#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:251
-#, fuzzy, c-format
+msgstr "అందుకున్న సందేశాలు"
+
+#: ../pidgin/plugins/convcolors.c:210
+#: ../pidgin/plugins/pidginrc.c:245
+#, c-format
 msgid "Select Color for %s"
-msgstr "టెక్‌స్ట్ కలర్‌ను సెలక్ట్ చేయుము."
+msgstr "%s కోసం రంగును ఎంపిక చేయు"
 
 #: ../pidgin/plugins/convcolors.c:310
-#, fuzzy
 msgid "Ignore incoming format"
-msgstr "కలర్స్‌ను ఉపేక్షించుము. "
+msgstr "వస్తున్న ఫార్మాట్ ను విస్మరించు"
 
 #: ../pidgin/plugins/convcolors.c:311
-#, fuzzy
 msgid "Apply in Chats"
-msgstr "కాలక్షేపరాయుని ఉపనామం "
+msgstr "సంభాషణల్లో ఉపయోగించు"
 
 #: ../pidgin/plugins/convcolors.c:312
 msgid "Apply in IMs"
-msgstr ""
-
-#  Conversations
+msgstr "IM లలో ఉపయోగించు"
+
+# Conversations
 #: ../pidgin/plugins/extplacement.c:80
 msgid "By conversation count"
 msgstr "సంభాషణ లెక్కతో "
 
-#  Conversations
+# Conversations
 #: ../pidgin/plugins/extplacement.c:101
 msgid "Conversation Placement"
 msgstr "సంభాషణ ప్లేస్‌మెంట్ "
 
 #. Translators: "New conversations" should match the text in the preferences dialog and "By conversation count" should be the same text used above
 #: ../pidgin/plugins/extplacement.c:105
-msgid ""
-"Note: The preference for \"New conversations\" must be set to \"By "
-"conversation count\"."
-msgstr ""
-
-#  IM Convo trans options
+msgid "Note: The preference for \"New conversations\" must be set to \"By conversation count\"."
+msgstr ""
+
+# IM Convo trans options
 #: ../pidgin/plugins/extplacement.c:111
 msgid "Number of conversations per window"
 msgstr "ప్రతి విండోలో సంభాషణల సంఖ్య "
@@ -17723,6 +17877,12 @@
 msgid "Separate IM and Chat windows when placing by number"
 msgstr "నెంబరును వేస్తున్నప్పుడు IM మరియు Chat విండోలను విడదీయుము "
 
+# *< type
+# *< ui_requirement
+# *< flags
+# *< dependencies
+# *< priority
+# *< id
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -17733,21 +17893,23 @@
 msgid "ExtPlacement"
 msgstr "ExtPlacement"
 
+# *< name
+# *< version
 #. *< name
 #. *< version
 #: ../pidgin/plugins/extplacement.c:148
 msgid "Extra conversation placement options."
 msgstr "అధిక సంభాషణల స్థాపనకు వెసులుబాట్లు"
 
+# *< summary
+# *  description
 #. *< summary
 #. *  description
 #: ../pidgin/plugins/extplacement.c:150
-msgid ""
-"Restrict the number of conversations per windows, optionally separating IMs "
-"and Chats"
-msgstr "ప్రతి విండోకు సంభాషణల సంఖ్యను నియంత్రించుము, ఆప్షనల్‌గా IMs మరియు Chatsను విడదీయుము."
-
-#  Configuration frame
+msgid "Restrict the number of conversations per windows, optionally separating IMs and Chats"
+msgstr "ప్రతి విండోకు సంభాషణల సంఖ్యను నియంత్రించు, ఆప్షనల్‌గా IMs మరియు Chatsను విడదీయవచ్చు."
+
+# Configuration frame
 #. Configuration frame
 #: ../pidgin/plugins/gestures/gestures.c:235
 msgid "Mouse Gestures Configuration"
@@ -17759,21 +17921,27 @@
 
 #: ../pidgin/plugins/gestures/gestures.c:247
 msgid "Right mouse button"
-msgstr "కుడి మౌస్ బటన్ "
-
-#  "Visual gesture display" checkbox
+msgstr "మౌస్ కుడివైపు బటన్ "
+
+# "Visual gesture display" checkbox
 #. "Visual gesture display" checkbox
 #: ../pidgin/plugins/gestures/gestures.c:259
 msgid "_Visual gesture display"
-msgstr "_దృశ్య సంకేతముల ప్రదర్శన"
-
-#  *< api_version
+msgstr "_దృశ్య సంకేతాల ప్రదర్శన"
+
+# *< api_version
 #  *< type
 #  *< ui_requirement
 #  *< flags
 #  *< dependencies
 #  *< priority
 #  *< id
+# *< type
+# *< ui_requirement
+# *< flags
+# *< dependencies
+# *< priority
+# *< id
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -17784,9 +17952,11 @@
 msgid "Mouse Gestures"
 msgstr "మౌస్ సంజ్ఞలు"
 
-#  *< name
+# *< name
 #  *< version
 #  *  summary
+# *< version
+# *  summary
 #. *< name
 #. *< version
 #. *  summary
@@ -17794,7 +17964,7 @@
 msgid "Provides support for mouse gestures"
 msgstr "మౌస్ సంజ్ఞలకు సపోర్టును కలిగించును."
 
-#  *  description
+# *  description
 #. *  description
 #: ../pidgin/plugins/gestures/gestures.c:300
 msgid ""
@@ -17816,6 +17986,7 @@
 msgid "Instant Messaging"
 msgstr "సత్వర సంభాషణ "
 
+# Add the label.
 #. Add the label.
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:457
 msgid "Select a person from your address book below, or add a new person."
@@ -17826,6 +17997,7 @@
 msgid "Group:"
 msgstr "గ్రూప్:"
 
+# "New Person" button
 #. "New Person" button
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:576
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:467
@@ -17833,26 +18005,24 @@
 msgid "New Person"
 msgstr "కొత్త వ్యక్తి "
 
+# "Select Buddy" button
 #. "Select Buddy" button
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:593
 msgid "Select Buddy"
 msgstr "మిత్రుని ఎంపిక చేయండి "
 
+# Add the label.
 #. Add the label.
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:343
-msgid ""
-"Select a person from your address book to add this buddy to, or create a new "
-"person."
-msgstr ""
-"ఈ మిత్రుని కూడా చేర్చడానికి మీ అడ్రస్ బుక్‌లో ఒక వ్యక్తిని సెలక్ట్ చేయండి, లేదా ఒక నూతన వ్యక్తిపేరును "
-"సృష్టించండి."
+msgid "Select a person from your address book to add this buddy to, or create a new person."
+msgstr "ఈ మిత్రుని కూడా చేర్చడానికి మీ అడ్రస్ బుక్‌లో ఒక వ్యక్తిని సెలక్ట్ చేయండి, లేదా ఒక నూతన వ్యక్తిపేరును సృష్టించండి."
 
 #. Add the expander
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:431
-#, fuzzy
 msgid "User _details"
-msgstr "వినియోగదారుని వివరములు దాయుము. "
-
+msgstr "వినియోగదారు _ వివరాలు"
+
+# "Associate Buddy" button
 #. "Associate Buddy" button
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:484
 msgid "_Associate Buddy"
@@ -17860,37 +18030,43 @@
 
 #: ../pidgin/plugins/gevolution/gevolution.c:240
 #: ../pidgin/plugins/gevolution/gevolution.c:246
-#, fuzzy
 msgid "Unable to send e-mail"
-msgstr "సందేశాన్ని పంపడం కష్టం."
+msgstr "ఇ-మెయిల్ పంపలేక పోతోంది"
 
 #: ../pidgin/plugins/gevolution/gevolution.c:241
 msgid "The evolution executable was not found in the PATH."
-msgstr ""
+msgstr "PATH లో ఎవల్యూషన్ ఎగ్జిక్యూటేబుల్ కనబడలేదు."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:247
 msgid "An e-mail address was not found for this buddy."
-msgstr ""
+msgstr "ఈ మిత్రుడికి సంబంధించి ఇ-మెయిల్ అడ్రస్ కనబడలేదు. "
 
 #: ../pidgin/plugins/gevolution/gevolution.c:273
 msgid "Add to Address Book"
 msgstr "అడ్రస్ బుక్‌కు చేర్చండి."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:285
-#, fuzzy
 msgid "Send E-Mail"
-msgstr "ఇ-మెయిల్ "
-
+msgstr "ఇ-మెయిల్ పంపించు"
+
+# Configuration frame
 #. Configuration frame
 #: ../pidgin/plugins/gevolution/gevolution.c:412
 msgid "Evolution Integration Configuration"
-msgstr "ఎవొలూషన్ ఇంటెగ్రేషన్ కన్ఫిగరేషన్ "
-
+msgstr "ఇవల్యూషన్ ఇంటిగ్రేషన్ కన్ఫిగరేషన్ "
+
+# Label
 #. Label
 #: ../pidgin/plugins/gevolution/gevolution.c:415
 msgid "Select all accounts that buddies should be auto-added to."
-msgstr "తమంతట తాముగా చేరాలనుకునే మిత్రుల ఖాతాలను సెలక్ట్ చేయండి. "
-
+msgstr "తమంతట తాముగా చేరాలనుకునే మిత్రుల అకౌంటులను సెలక్ట్ చేయండి. "
+
+# *< type
+# *< ui_requirement
+# *< flags
+# *< dependencies
+# *< priority
+# *< id
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -17907,22 +18083,22 @@
 #. *  description
 #: ../pidgin/plugins/gevolution/gevolution.c:530
 #: ../pidgin/plugins/gevolution/gevolution.c:532
-#, fuzzy
 msgid "Provides integration with Evolution."
-msgstr "క్సిమియన్ వికాసంతో (Ximian Evolution) సమగ్రతను ఏర్పరచును."
+msgstr "ఎవల్యూషన్ తో సమ్మిళితం కావడానికి వీలు కల్పిస్తుంది."
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:262
 msgid "Please enter the person's information below."
-msgstr "ఈ క్రింద వ్యక్తి సమాచారాన్ని ఎంటర్ చేయండి. "
+msgstr "ఈ క్రింద వ్యక్తి సమాచారాన్ని నమోదు చేయండి. "
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:266
 msgid "Please enter the buddy's screen name and account type below."
-msgstr "దయచేసి ఈ క్రింద మిత్రుని స్క్రీన్‌పేరు మరియు ఖాతాటైప్‌ను ఎంటర్ చేయండి."
+msgstr "దయచేసి ఈ క్రింద మిత్రుని స్క్రీన్‌పేరు మరియు అకౌంటుటైప్‌ను నమోదు చేయండి."
 
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:286
 msgid "Account type:"
-msgstr "ఎకౌంట్ టైప్:"
-
+msgstr "అకౌంట్ టైప్:"
+
+# Optional Information section
 #. Optional Information section
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:309
 msgid "Optional information:"
@@ -17940,7 +18116,7 @@
 msgid "E-mail:"
 msgstr "ఇ-మెయిల్:"
 
-#  *< api_version
+# *< api_version
 #  *< type
 #  *< ui_requirement
 #  *< flags
@@ -17957,7 +18133,7 @@
 msgid "GTK Signals Test"
 msgstr "GTK సిగ్నల్స్ టెస్ట్"
 
-#  *< name
+# *< name
 #  *< version
 #  *  summary
 #. *< name
@@ -17970,7 +18146,7 @@
 msgstr "అన్ని ui signals సక్రమంగా పనిచేస్తున్నాయా లేదా తెలుసుకొనుటకు పరీక్ష."
 
 #: ../pidgin/plugins/gtkbuddynote.c:36
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "<b>Buddy Note</b>: %s"
@@ -17978,17 +18154,23 @@
 "\n"
 "<b>సోమరి:</b>"
 
-#: ../pidgin/plugins/history.c:188
+#: ../pidgin/plugins/history.c:195
 msgid "History"
 msgstr "ఇతిహాసం "
 
-#  *< api_version
+# *< api_version
 #  *< type
 #  *< ui_requirement
 #  *< flags
 #  *< dependencies
 #  *< priority
 #  *< id
+# *< type
+# *< ui_requirement
+# *< flags
+# *< dependencies
+# *< priority
+# *< id
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -17997,18 +18179,22 @@
 #. *< id
 #: ../pidgin/plugins/iconaway.c:82
 msgid "Iconify on Away"
-msgstr "దూరం కావడంతో ఐకన్‌ను ఏర్పరచుము."
-
-#  *< name
+msgstr "దూరంగాపోయినపుడు ఐకన్‌ను ఏర్పరచు."
+
+# *< name
 #  *< version
 #  *  summary
+# *< version
+# *  summary
+# *  description
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/iconaway.c:85 ../pidgin/plugins/iconaway.c:87
+#: ../pidgin/plugins/iconaway.c:85
+#: ../pidgin/plugins/iconaway.c:87
 msgid "Iconifies the buddy list and your conversations when you go away."
-msgstr "మీరు దూరంగా పోయినప్పుడు మీ సంభాషణలను, మీ మిత్రుల లిస్టును ఐకన్లుగా మార్చును."
+msgstr "మీరు దూరంగా పోయినప్పుడు మీ సంభాషణలను, మీ మిత్రుల లిస్టును ఐకన్లుగా మార్చుతుంది."
 
 #: ../pidgin/plugins/mailchk.c:160
 msgid "Mail Checker"
@@ -18023,69 +18209,64 @@
 msgstr "మీకు కొత్తగా జాబు వస్తే అది ఒక చిన్న బాక్స్‌గా మీ మిత్రుల లిస్టులో కనిపిస్తుంది. "
 
 #: ../pidgin/plugins/markerline.c:23
-#, fuzzy
 msgid "Markerline"
-msgstr "అండర్‌లైన్ "
-
-#: ../pidgin/plugins/markerline.c:25 ../pidgin/plugins/markerline.c:26
+msgstr "మార్కర్ లైన్"
+
+#: ../pidgin/plugins/markerline.c:25
+#: ../pidgin/plugins/markerline.c:26
 msgid "Draw a line to indicate new messages in a conversation."
-msgstr ""
+msgstr "సంభాషణలో కొత్త సందేశాలను సూచించడానికి గీత గీయు."
 
 #: ../pidgin/plugins/markerline.c:246
 msgid "Draw Markerline in "
-msgstr ""
-
-#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:682
+msgstr "మార్కర్ లైన్ గీయు"
+
+#: ../pidgin/plugins/markerline.c:250
+#: ../pidgin/plugins/notify.c:682
 msgid "_IM windows"
 msgstr "_IM విండోస్ "
 
-#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:689
+#: ../pidgin/plugins/markerline.c:254
+#: ../pidgin/plugins/notify.c:689
 msgid "C_hat windows"
 msgstr "విండోస్‌లో సంభాషించండి."
 
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:44
-msgid ""
-"A music messaging session has been requested. Please click the MM icon to "
-"accept."
-msgstr ""
+msgid "A music messaging session has been requested. Please click the MM icon to accept."
+msgstr "మ్యూజిక్ సందేశాల సెషన్ కోసం అభ్యర్థన అందింది, అంగీకరించడానికి దయచేసి MM ఐకాన్ ను క్లిక్ చేయండి."
 
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:45
 msgid "Music messaging session confirmed."
-msgstr ""
+msgstr "మ్యూజిక్ సందేశాల సెషన్ ను ధ్రువీకరంచడం జరిగింది."
 
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:430
-#, fuzzy
 msgid "Music Messaging"
-msgstr "సత్వర సంభాషణ "
+msgstr "మ్యూజిక్ సందేశాలు"
 
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:431
 msgid "There was a conflict in running the command:"
-msgstr ""
+msgstr "ఈ కమాండ్ :ను ఉపయోగించడంలో అవరోధం"
 
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:539
-#, fuzzy
 msgid "Error Running Editor"
-msgstr "%s సంభాషణలో పాల్గొనుటలో పొరపాటు."
+msgstr "ఎడిటర్ ను రన్ చేయడంలో పొరపాటు"
 
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:540
-#, fuzzy
 msgid "The following error has occurred:"
-msgstr "అజ్ఞాత సైనాన్ పొరపాటు సంభవించింది: %s."
-
-#  Configuration frame
+msgstr "ఈ కింది పొరపాటు జరిగింది:"
+
 #. Configuration frame
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:639
-#, fuzzy
 msgid "Music Messaging Configuration"
-msgstr "మౌస్ సంజ్ఞల కన్ఫిగరేషన్. "
+msgstr "మ్యూజిక్ సందేశాల కన్ఫిగరేషన్"
 
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:643
 msgid "Score Editor Path"
-msgstr ""
+msgstr "స్కోర్ ఎడిటర్ పాథ్"
 
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:644
 msgid "_Apply"
-msgstr "_ఎప్లై. "
+msgstr "_అప్లై. "
 
 #. *< type
 #. *< ui_requirement
@@ -18097,16 +18278,14 @@
 #. *< version
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:685
 msgid "Music Messaging Plugin for collaborative composition."
-msgstr ""
+msgstr "సంయుక్త స్వరకల్పన కోసం మ్యూజిక్ సందేశాల ప్లగ్ ఇన్. "
 
 #. *  summary
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:687
-msgid ""
-"The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
-msgstr ""
-
-#  ---------- "Notify For" ----------
+msgid "The Music Messaging Plugin allows a number of users to simultaneously work on a piece of music by editting a common score in real-time."
+msgstr "వాస్తవిక సమయంలో ఉమ్మడి స్కోరును ఎడిట్ చేయడం ద్వారా ఒక సంగీతాంశం పై ఒకేసారి అనేకమంది వినియోగదారులు పనిచేయడానికి మ్యూజిక్ సందేశాల ప్లగ్ ఇన్ వీలుకల్పిస్తుంది."
+
+# ---------- "Notify For" ----------
 #. ---------- "Notify For" ----------
 #: ../pidgin/plugins/notify.c:678
 msgid "Notify For"
@@ -18114,13 +18293,13 @@
 
 #: ../pidgin/plugins/notify.c:697
 msgid "\t_Only when someone says your screen name"
-msgstr ""
+msgstr "మీ స్క్రీన్ పేరును ఎవరైనా చెప్పినప్పుడు \t_ మాత్రమే"
 
 #: ../pidgin/plugins/notify.c:707
 msgid "_Focused windows"
 msgstr "_కేంద్రీకృత విండోలు "
 
-#  ---------- "Notification Methods" ----------
+# ---------- "Notification Methods" ----------
 #. ---------- "Notification Methods" ----------
 #: ../pidgin/plugins/notify.c:715
 msgid "Notification Methods"
@@ -18128,70 +18307,72 @@
 
 #: ../pidgin/plugins/notify.c:722
 msgid "Prepend _string into window title:"
-msgstr "విండో టైటిల్‌లో _string ను ప్రీపెండ్ చేయుము :"
-
-#  Count method button
+msgstr "విండో టైటిల్‌లో _string ను ప్రీపెండ్ చేయండి :"
+
+# Count method button
 #. Count method button
 #: ../pidgin/plugins/notify.c:741
 msgid "Insert c_ount of new messages into window title"
-msgstr "విండో టైటిల్‌లో కొత్త సందేశముల సంఖ్యను చేర్చుము."
-
-#  Count method button
+msgstr "విండో టైటిల్‌లో కొత్త సందేశముల సంఖ్యను చేర్చు."
+
 #. Count xprop method button
 #: ../pidgin/plugins/notify.c:750
-#, fuzzy
 msgid "Insert count of new message into _X property"
-msgstr "విండో టైటిల్‌లో కొత్త సందేశముల సంఖ్యను చేర్చుము."
-
-#  Urgent method button
+msgstr "_X ప్రాపర్టీలోకి కొత్త సందేశపు గణకాన్ని పొందుపరచండి  "
+
+# Urgent method button
 #. Urgent method button
 #: ../pidgin/plugins/notify.c:758
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "విండో మేనేజర్‌కు \"_అర్జంట్\" సందేశాన్ని చూపుము."
 
-#  IM Convo trans options
 #. Raise window method button
 #: ../pidgin/plugins/notify.c:767
-#, fuzzy
 msgid "R_aise conversation window"
-msgstr "IM Conversation Windows"
-
-#  ---------- "Notification Removals" ----------
+msgstr "సంభాషణ విండోను లేవనెత్తు"
+
+# ---------- "Notification Removals" ----------
 #. ---------- "Notification Removals" ----------
 #: ../pidgin/plugins/notify.c:775
 msgid "Notification Removal"
-msgstr "సూచన రద్దుచేయుట"
-
-#  Remove on focus button
+msgstr "సూచనను తీసివేయడం"
+
+# Remove on focus button
 #. Remove on focus button
 #: ../pidgin/plugins/notify.c:780
 msgid "Remove when conversation window _gains focus"
-msgstr "సంభాషణ విండో కేంద్రీకరణ _పొందినప్పుడు రద్దుచేయుము."
-
-#  Remove on click button
+msgstr "సంభాషణ విండో కేంద్రీకరణ _పొందినప్పుడు తీసివేయి."
+
+# Remove on click button
 #. Remove on click button
 #: ../pidgin/plugins/notify.c:787
 msgid "Remove when conversation window _receives click"
-msgstr "సంభాషణ విండో క్లిక్‌ను _స్వీకరించినప్పుడు రద్దుచేయుము. "
-
-#  Remove on type button
+msgstr "సంభాషణ విండో క్లిక్‌ను _స్వీకరించినప్పుడు తీసివేయి."
+
+# Remove on type button
 #. Remove on type button
 #: ../pidgin/plugins/notify.c:795
 msgid "Remove when _typing in conversation window"
-msgstr "సంభాషణ విండోలో _టైప్ చేసినప్పుడు రద్దుచేయుము. "
-
-#  Remove on message send button
+msgstr "సంభాషణ విండోలో _టైప్ చేసినప్పుడు తీసివేయి."
+
+# Remove on message send button
 #. Remove on message send button
 #: ../pidgin/plugins/notify.c:803
 msgid "Remove when a _message gets sent"
-msgstr "_సందేశాన్ని పంపినప్పుడు రద్దుచేయుము. "
-
-#  Remove on conversation switch button
+msgstr "_సందేశాన్ని పంపిన తర్వాత సందేశాన్ని తీసివేయి. "
+
+# Remove on conversation switch button
 #. Remove on conversation switch button
 #: ../pidgin/plugins/notify.c:812
 msgid "Remove on switch to conversation ta_b"
 msgstr "సంభాషణ టాబ్‌కు మారడాన్ని రద్దుచేయండి."
 
+# *< type
+# *< ui_requirement
+# *< flags
+# *< dependencies
+# *< priority
+# *< id
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -18202,24 +18383,34 @@
 msgid "Message Notification"
 msgstr "సందేశ సూచన. "
 
-#  *< name
+# *< name
 #  *< version
 #  *  summary
+# *< version
+# *  summary
+# *  description
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:910 ../pidgin/plugins/notify.c:912
+#: ../pidgin/plugins/notify.c:910
+#: ../pidgin/plugins/notify.c:912
 msgid "Provides a variety of ways of notifying you of unread messages."
-msgstr "చదవని సందేశాలను సూచించుటకు మీకు అనేక పద్ధతులు అందుబాటులో ఉన్నాయి."
-
-#  *< api_version
+msgstr "చదవని సందేశాలను సూచిండానికి మీకు అనేక పద్ధతుల అందుబాటు."
+
+# *< api_version
 #  *< type
 #  *< ui_requirement
 #  *< flags
 #  *< dependencies
 #  *< priority
 #  *< id
+# *< type
+# *< ui_requirement
+# *< flags
+# *< dependencies
+# *< priority
+# *< id
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -18227,13 +18418,14 @@
 #. *< priority
 #. *< id
 #: ../pidgin/plugins/pidgininc.c:91
-#, fuzzy
 msgid "Pidgin Demonstration Plugin"
-msgstr "గెయిమ్ ప్రదర్శనకు ప్లగ్‌ఇన్"
-
-#  *< name
+msgstr "Pidgin Demonstration Plugin "
+
+# *< name
 #  *< version
 #  *  summary
+# *< version
+# *  summary
 #. *< name
 #. *< version
 #. *  summary
@@ -18241,7 +18433,7 @@
 msgid "An example plugin that does stuff - see the description."
 msgstr "ప్లగ్‌ఇన్‌కు ఇదొక సజీవ ఉదాహరణ - దీని వివరణను చూడండి."
 
-#  *  description
+# *  description
 #. *  description
 #: ../pidgin/plugins/pidgininc.c:96
 msgid ""
@@ -18253,15 +18445,15 @@
 "ఈ ప్లగ్‌ఇన్ మీకు బాగా పనిచేస్తుంది:\n"
 "మీరు లాగిన్ చేయడంతోనే ఈ - ప్రోగ్రామును ఎవరు రాశారో మీకు చెబుతుంది. \n"
 "- లోపలకు వచ్చే ప్రతి శబ్దాన్నీ వెనక్కు పంపుతుంది.\n"
-"- ప్రజలు ఖాతా ప్రారంభించగానే మీ లిస్టులో ప్రజలకు సందేశం పంపుతుంది "
+"- ప్రజలు అకౌంటు ప్రారంభించగానే మీ లిస్టులో ప్రజలకు సందేశం పంపుతుంది "
 
 #: ../pidgin/plugins/pidginrc.c:41
 msgid "Cursor Color"
-msgstr ""
+msgstr "కర్సర్ రంగు"
 
 #: ../pidgin/plugins/pidginrc.c:42
 msgid "Secondary Cursor Color"
-msgstr ""
+msgstr "సెకండరీ కర్సర్ రంగు"
 
 #: ../pidgin/plugins/pidginrc.c:43
 #, fuzzy
@@ -18270,59 +18462,40 @@
 
 #: ../pidgin/plugins/pidginrc.c:54
 msgid "GtkTreeView Horizontal Separation"
-msgstr ""
-
-#  Conversations
-#: ../pidgin/plugins/pidginrc.c:73
-#, fuzzy
+msgstr "Gtkట్రీవ్యూ అడ్డంగా విభజించి చూపించు"
+
+#: ../pidgin/plugins/pidginrc.c:69
 msgid "Conversation Entry"
-msgstr "సంభాషణలు "
-
-#  Conversations
-#: ../pidgin/plugins/pidginrc.c:74
-#, fuzzy
-msgid "Conversation History"
-msgstr "సంభాషణలు "
-
-#: ../pidgin/plugins/pidginrc.c:75
-#, fuzzy
-msgid "Log Viewer"
-msgstr "లాగిన్ సెర్వర్ "
-
-#: ../pidgin/plugins/pidginrc.c:76
-#, fuzzy
+msgstr "సంభాషణ ఎంట్రీ"
+
+#: ../pidgin/plugins/pidginrc.c:70
 msgid "Request Dialog"
-msgstr "అస్పష్ట అభ్యర్థన. "
-
-#  ---------- "Notify For" ----------
-#: ../pidgin/plugins/pidginrc.c:77
-#, fuzzy
+msgstr "అభ్యర్థనా డైలాగ్"
+
+#: ../pidgin/plugins/pidginrc.c:71
 msgid "Notify Dialog"
-msgstr "కోసం సూచించండి"
-
-#: ../pidgin/plugins/pidginrc.c:253
-#, fuzzy
+msgstr "నోటిఫై డైలాగ్"
+
+#: ../pidgin/plugins/pidginrc.c:247
 msgid "Select Color"
-msgstr "టెక్‌స్ట్ కలర్‌ను సెలక్ట్ చేయుము."
-
-#: ../pidgin/plugins/pidginrc.c:300
-#, fuzzy, c-format
+msgstr "రంగును ఎంపికచేయు"
+
+#: ../pidgin/plugins/pidginrc.c:294
 msgid "Select Interface Font"
-msgstr "ఫాంట్‌ను సెలక్ట్ చేయుము."
-
-#: ../pidgin/plugins/pidginrc.c:303
-#, fuzzy, c-format
+msgstr "ఇంటర్ ఫేస్ ఫాంట్ ను ఎంపికచేయు"
+
+#: ../pidgin/plugins/pidginrc.c:297
+#, c-format
 msgid "Select Font for %s"
-msgstr "ఫాంట్‌ను సెలక్ట్ చేయుము."
-
-#: ../pidgin/plugins/pidginrc.c:371
-#, fuzzy
+msgstr "%s కోసం ఫాంట్ ను ఎంపికచేయు"
+
+#: ../pidgin/plugins/pidginrc.c:365
 msgid "GTK+ Interface Font"
-msgstr "ఇంటర్‌ఫేస్ ఆప్షన్లు "
-
-#: ../pidgin/plugins/pidginrc.c:391
+msgstr "GTK+ ఇంటర్ ఫేస్ ఫాంట్"
+
+#: ../pidgin/plugins/pidginrc.c:385
 msgid "GTK+ Text Shortcut Theme"
-msgstr ""
+msgstr "GTK+ టెక్స్ట షార్ట్ కట్ థీమ్"
 
 #.
 #. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
@@ -18344,41 +18517,17 @@
 #. widget_bool_widgets[i]);
 #. }
 #.
-#: ../pidgin/plugins/pidginrc.c:428
-#, fuzzy
+#: ../pidgin/plugins/pidginrc.c:422
 msgid "Interface colors"
-msgstr "కలర్స్‌ను ఉపేక్షించుము. "
-
-#: ../pidgin/plugins/pidginrc.c:452
+msgstr "ఇంటర్ ఫేస్ రంగులు"
+
+#: ../pidgin/plugins/pidginrc.c:446
 msgid "Widget Sizes"
-msgstr ""
-
-#  And now for the buttons
-#: ../pidgin/plugins/pidginrc.c:473
-#, fuzzy
+msgstr "విడ్ జెట్ పరిమాణాలు"
+
+#: ../pidgin/plugins/pidginrc.c:467
 msgid "Fonts"
-msgstr "ఖాతాలు"
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-#: ../pidgin/plugins/pidginrc.c:497
-#, fuzzy
-msgid "Gtkrc File Tools"
-msgstr "గెయిమ్ ఫైల్ నియంత్రణ"
-
-#: ../pidgin/plugins/pidginrc.c:502
-#, c-format
-msgid "Write settings to %s%sgtkrc-2.0"
-msgstr ""
-
-#: ../pidgin/plugins/pidginrc.c:511
-msgid "Re-read gtkrc files"
-msgstr ""
+msgstr "ఫాంట్ లు"
 
 #  *< api_version
 #  *< type
@@ -18387,51 +18536,65 @@
 #  *< dependencies
 #  *< priority
 #  *< id
-#: ../pidgin/plugins/pidginrc.c:544
-#, fuzzy
-msgid "Pidgin GTK+ Theme Control"
+#: ../pidgin/plugins/pidginrc.c:491
+#, fuzzy
+msgid "Gtkrc File Tools"
 msgstr "గెయిమ్ ఫైల్ నియంత్రణ"
 
-#: ../pidgin/plugins/pidginrc.c:546 ../pidgin/plugins/pidginrc.c:547
+#: ../pidgin/plugins/pidginrc.c:496
+#, c-format
+msgid "Write settings to %s%sgtkrc-2.0"
+msgstr "%s%sgtkrc-2.0 కు రైట్ సెట్టింగులు"
+
+#: ../pidgin/plugins/pidginrc.c:505
+msgid "Re-read gtkrc files"
+msgstr "gtkrc ఫైళ్లను తిరిగి రీడ్ చేయు"
+
+#: ../pidgin/plugins/pidginrc.c:543
+msgid "Pidgin GTK+ Theme Control"
+msgstr "పిడ్గిన్ GTK+ థీమ్ కంట్రోల్"
+
+#: ../pidgin/plugins/pidginrc.c:545
+#: ../pidgin/plugins/pidginrc.c:546
 msgid "Provides access to commonly used gtkrc settings."
-msgstr ""
+msgstr "సాధారణంగా ఉపయోగించే gtkrc సెట్టింగులను అందుబాటులోకి తెస్తుంది."
 
 #: ../pidgin/plugins/raw.c:175
 msgid "Raw"
-msgstr "అసంపూర్ణ "
+msgstr "Raw"
 
 #: ../pidgin/plugins/raw.c:177
 msgid "Lets you send raw input to text-based protocols."
-msgstr ""
-"టెక్‌స్ట్ ఆధారిత ప్రొటోకాల్స్‌కు ముడి సరుకు (raw input)ను పంపుటకు మీకు అవకాశము కలిగించును."
+msgstr "మీరు టెక్‌స్ట్ ఆధారిత ప్రొటోకాల్స్‌కు ముడి సరుకు (raw input)ను పంపుటకు అవకాశాన్నిస్తుంది."
 
 #: ../pidgin/plugins/raw.c:178
 #, fuzzy
-msgid ""
-"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
-"'Enter' in the entry box to send. Watch the debug window."
-msgstr ""
-"టెక్‌స్ట్‌పై ఆధారపడిన ప్రోటోకాల్స్ (Jabber, MSN, IRC, TOC) కు అసంపూర్ణ ఇన్‌పుట్‌ను పంపుటకు "
-"అవకాశమిచ్చును. "
+msgid "Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit 'Enter' in the entry box to send. Watch the debug window."
+msgstr "టెక్‌స్ట్‌పై ఆధారపడిన ప్రోటోకాల్స్ (Jabber, MSN, IRC, TOC) కు అసంపూర్ణ ఇన్‌పుట్‌ను పంపించడానికి అవకాశమిస్తుంది. "
 
 #: ../pidgin/plugins/relnot.c:71
-#, fuzzy, c-format
-msgid ""
-"You are using %s version %s.  The current version is %s.  You can get it "
-"from <a href=\"%s\">%s</a><hr>"
-msgstr "మీరు గెయిమ్ %s వెర్షన్‌ అనువాదాన్ని ఉపయోగిస్తున్నారు. వర్తమాన వెర్షన్ %s.<hr>"
+#, c-format
+msgid "You are using %s version %s.  The current version is %s.  You can get it from <a href=\"%s\">%s</a><hr>"
+msgstr "మీరు %s వెర్షన్‌ అనువాదాన్ని ఉపయోగిస్తున్నారు. ప్రస్తుత వెర్షన్ %s.<hr>"
 
 #: ../pidgin/plugins/relnot.c:79
-#, fuzzy, c-format
+#, c-format
 msgid "<b>ChangeLog:</b><br>%s"
 msgstr ""
 "<b>లాగ్‌మార్పు:</b>\n"
 "%s<br><br>"
 
-#: ../pidgin/plugins/relnot.c:84 ../pidgin/plugins/relnot.c:85
+#: ../pidgin/plugins/relnot.c:84
+#: ../pidgin/plugins/relnot.c:85
 msgid "New Version Available"
-msgstr "కొత్త వెర్షన్ లభించినది."
-
+msgstr "కొత్త వెర్షన్ అందుబాటులోఉంది."
+
+# *< type
+# *< ui_requirement
+# *< flags
+# *< dependencies
+# *< priority
+# *< id
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -18440,29 +18603,31 @@
 #. *< id
 #: ../pidgin/plugins/relnot.c:143
 msgid "Release Notification"
-msgstr "నోటిఫికేషన్ విడుదల చేయుము. "
-
+msgstr "నోటిఫికేషన్ జారీ చేయండి."
+
+# *< name
+# *< version
+# *  summary
 #. *< name
 #. *< version
 #. *  summary
 #: ../pidgin/plugins/relnot.c:146
 msgid "Checks periodically for new releases."
-msgstr "కొత్తవాటి కొరకు నియత కాలాల్లో చెక్ చేయును."
-
+msgstr "కొత్తవాటి కొరకు నియత కాలాల్లో చెక్ చేస్తుంది."
+
+# *  description
 #. *  description
 #: ../pidgin/plugins/relnot.c:148
-msgid ""
-"Checks periodically for new releases and notifies the user with the "
-"ChangeLog."
-msgstr "కొత్తవాటి కొరకు నియత కాలాల్లో చెక్ చేయును మరియు వినియోగదారునికి లాగ్‌మార్పును  సూచించును."
+msgid "Checks periodically for new releases and notifies the user with the ChangeLog."
+msgstr "కొత్తవాటి కొరకు నియత కాలాల్లో చెక్ చేస్తుంది అలాగే వినియోగదారునికి లాగ్‌మార్పును  సూచింస్తుంది."
 
 #: ../pidgin/plugins/spellchk.c:1962
 msgid "Duplicate Correction"
-msgstr ""
+msgstr "డూప్లికేట్ కరక్షన్"
 
 #: ../pidgin/plugins/spellchk.c:1963
 msgid "The specified word already exists in the correction list."
-msgstr ""
+msgstr "నిర్దిష్టపదం ఇప్పటికే కరెక్షన్ జాబితాలో ఉంది."
 
 #: ../pidgin/plugins/spellchk.c:2177
 msgid "Text Replacements"
@@ -18474,15 +18639,15 @@
 
 #: ../pidgin/plugins/spellchk.c:2214
 msgid "You send"
-msgstr "పంపండి"
+msgstr "మీరు పంపండి"
 
 #: ../pidgin/plugins/spellchk.c:2228
 msgid "Whole words only"
-msgstr ""
+msgstr "పూర్తి పదాలు మాత్రమే"
 
 #: ../pidgin/plugins/spellchk.c:2240
 msgid "Case sensitive"
-msgstr ""
+msgstr "మీరు ఎంటర్ చేసినట్టుగానే"
 
 #: ../pidgin/plugins/spellchk.c:2266
 msgid "Add a new text replacement"
@@ -18499,55 +18664,71 @@
 #. Created here so it can be passed to whole_words_button_toggled.
 #: ../pidgin/plugins/spellchk.c:2311
 msgid "_Exact case match (uncheck for automatic case handling)"
-msgstr ""
+msgstr "_కచ్చితమైన సరిపోలిక (ఆటోమేటిక్ కేస్ హ్యాండ్లింగ్ ల కోసం చూడవద్దు)"
 
 #: ../pidgin/plugins/spellchk.c:2313
 msgid "Only replace _whole words"
-msgstr ""
+msgstr "_పూర్తి పదాలను మాత్రమే రీప్లేస్ చేయండి"
 
 #: ../pidgin/plugins/spellchk.c:2338
-#, fuzzy
 msgid "General Text Replacement Options"
-msgstr "టెక్స్‌ట్ రీప్లేస్‌మెంట్స్ "
+msgstr "సాధారణ టెక్స్ట్ రీప్లేస్మెంట్ అవకాశాలు"
 
 #: ../pidgin/plugins/spellchk.c:2339
 msgid "Enable replacement of last word on send"
-msgstr ""
-
-#: ../pidgin/plugins/spellchk.c:2370
+msgstr "పంపినప్పటి చివరి పదం రీప్లేస్మెంట్ మాత్రమే సాధ్యపరుస్తుంది"
+
+#: ../pidgin/plugins/spellchk.c:2372
 msgid "Text replacement"
 msgstr "టెక్‌స్ట్ రీప్లేస్‌మెంట్ "
 
-#: ../pidgin/plugins/spellchk.c:2372 ../pidgin/plugins/spellchk.c:2373
+#: ../pidgin/plugins/spellchk.c:2374
+#: ../pidgin/plugins/spellchk.c:2375
 msgid "Replaces text in outgoing messages according to user-defined rules."
-msgstr "బయటకు పంపే సందేశాల్లో వినియోగదారుడు నిర్వచించిన నియమాల ననుసరించి టెక్‌స్ట్ రీప్లేస్ అగును. "
-
+msgstr "బయటకు పంపే సందేశాల్లో వినియోగదారుడు నిర్వచించిన నియమాలను అనుసరించి టెక్‌స్ట్ రీప్లేస్ అగును."
+
+# *< type
+# *< ui_requirement
+# *< flags
+# *< dependencies
+# *< priority
+# *< id
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/ticker/ticker.c:74 ../pidgin/plugins/ticker/ticker.c:354
+#: ../pidgin/plugins/ticker/ticker.c:74
+#: ../pidgin/plugins/ticker/ticker.c:356
 msgid "Buddy Ticker"
 msgstr "మిత్రుని టికర్ "
 
-#  *< name
+# *< name
 #  *< version
 #  *  summary
+# *< version
+# *  summary
+# *  description
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/ticker/ticker.c:357 ../pidgin/plugins/ticker/ticker.c:359
+#: ../pidgin/plugins/ticker/ticker.c:359
+#: ../pidgin/plugins/ticker/ticker.c:361
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "మిత్రుల లిస్ట్ సమతల స్క్రోలింగ్ వెర్షన్."
 
 #: ../pidgin/plugins/timestamp.c:137
-#, fuzzy
 msgid "Display Timestamps Every"
-msgstr "iChat టైమ్‌స్టాంప్. "
-
+msgstr "ప్రతి టైమ్ స్టాంపులను చూపించండి"
+
+# *< type
+# *< ui_requirement
+# *< flags
+# *< dependencies
+# *< priority
+# *< id
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -18562,54 +18743,45 @@
 #. *< version
 #. *  summary
 #: ../pidgin/plugins/timestamp.c:205
-#, fuzzy
 msgid "Display iChat-style timestamps"
-msgstr "iChat టైమ్‌స్టాంప్. "
-
-#  *< name
-#  *< version
-#  *  summary
+msgstr "ఐచాట్-స్టైల్ టైమ్ స్టాంపులను చూపించండి"
+
 #. *  description
 #: ../pidgin/plugins/timestamp.c:207
-#, fuzzy
 msgid "Display iChat-style timestamps every N minutes."
-msgstr "ప్రతి N నిమిషముల సంభాషణలకు iChat-style టైమ్‌స్టాంపులను చేర్చండి. "
+msgstr "ఐచాట్-స్టైల్ టైమ్ స్టాంపులను ప్రతి N నిముషాలకు చూపించండి."
 
 #: ../pidgin/plugins/timestamp_format.c:23
 msgid "Timestamp Format Options"
-msgstr ""
+msgstr "టైమ్ స్టాంప్ ఫార్మాట్ అవకాశాలు"
 
 #: ../pidgin/plugins/timestamp_format.c:26
-#, c-format
+#, fuzzy
 msgid "_Force 24-hour time format"
-msgstr ""
+msgstr "_ఫోర్స్ (సాంప్రదాయిక %s) 24-గంటల ఫార్మాట్"
 
 #: ../pidgin/plugins/timestamp_format.c:33
-#, fuzzy
 msgid "Show dates in..."
-msgstr "ఇంకా ఆప్షన్లను చూపుము."
-
-#  Conversations
+msgstr "...లో తేదీలను చూపించు"
+
+# Conversations
 #: ../pidgin/plugins/timestamp_format.c:38
-#, fuzzy
 msgid "Co_nversations:"
-msgstr "సంభాషణలు "
+msgstr "_సంభాషణలు: "
 
 #: ../pidgin/plugins/timestamp_format.c:40
 #: ../pidgin/plugins/timestamp_format.c:49
-#, fuzzy
 msgid "For delayed messages"
-msgstr "కొత్త సుదూర సందేశం "
+msgstr "ఆలస్యమైన సందేశాలకోసం"
 
 #: ../pidgin/plugins/timestamp_format.c:41
 #: ../pidgin/plugins/timestamp_format.c:50
 msgid "For delayed messages and in chats"
-msgstr ""
+msgstr "ఆలస్యమైన సందేశాలకోసం మరియు చాట్ కోసం "
 
 #: ../pidgin/plugins/timestamp_format.c:47
-#, fuzzy
 msgid "_Message Logs:"
-msgstr "సందేశముల లాగ్స్ "
+msgstr "_సందేశాల లాగ్స్: "
 
 #. *< type
 #. *< ui_requirement
@@ -18619,21 +18791,19 @@
 #. *< id
 #: ../pidgin/plugins/timestamp_format.c:151
 msgid "Message Timestamp Formats"
-msgstr ""
+msgstr "సందేశపు టైంస్టాంప్ ఫార్మాట్లు"
 
 #. *< name
 #. *< version
 #. *  summary
 #: ../pidgin/plugins/timestamp_format.c:154
 msgid "Customizes the message timestamp formats."
-msgstr ""
+msgstr "సందేశపు టైంస్టాంప్ ఫార్మాట్లను వినియోగదారునికి అనుకూలంగా మారుస్తుంది."
 
 #. *  description
 #: ../pidgin/plugins/timestamp_format.c:156
-msgid ""
-"This plugin allows the user to customize conversation and logging message "
-"timestamp formats."
-msgstr ""
+msgid "This plugin allows the user to customize conversation and logging message timestamp formats."
+msgstr "సంభాషణలను, లాగింగ్ సందేశపు టైంస్టాంపు ఫార్మాట్లను సంభాషణలను వినియోగదారునికి అనుకూలంగా మార్చడానికి ఈ ప్లగ్ ఇన్ వీలుకల్పిస్తుంది."
 
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:175
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:598
@@ -18641,7 +18811,7 @@
 msgid "Opacity:"
 msgstr "అపారదర్శకత:"
 
-#  IM Convo trans options
+# IM Convo trans options
 #. IM Convo trans options
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:562
 msgid "IM Conversation Windows"
@@ -18656,31 +18826,34 @@
 msgstr "IM విండోలో స్లైడర్ బార్‌ను _చూపుము."
 
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:584
-#, fuzzy
 msgid "Remove IM window transparency on focus"
-msgstr "_IM విండో పారదర్శకత "
+msgstr "ఫోకస్ కాబడినప్పుడు పారదర్శక IM విండోను తీసివేయండి"
 
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:587
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:635
-#, fuzzy
 msgid "Always on top"
-msgstr "సంప్రదించినవారి ఉపనామం ..."
-
-#  Buddy List trans options
+msgstr "ఎప్పుడూ పైన ఉండేట్లుగా"
+
+# Buddy List trans options
 #. Buddy List trans options
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:619
 msgid "Buddy List Window"
-msgstr "విండోలో మిత్రుల లిస్ట్ "
+msgstr "మిత్రుల లిస్ట్ విండో"
 
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:620
 msgid "_Buddy List window transparency"
-msgstr "విండో ట్రాన్స్‌ఫరెన్సీలో _మిత్రుల లిస్టు."
+msgstr "విండో ట్రాన్స్‌పరెన్సీలో _మిత్రుల లిస్టు."
 
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:633
-#, fuzzy
 msgid "Remove Buddy List window transparency on focus"
-msgstr "విండో ట్రాన్స్‌ఫరెన్సీలో _మిత్రుల లిస్టు."
-
+msgstr "ఫోకస్ లో ఉన్నప్పుడు మిత్రుల జాబితా విండో ట్రాన్స్పరెన్సీని తొలగించండి"
+
+# *< type
+# *< ui_requirement
+# *< flags
+# *< dependencies
+# *< priority
+# *< id
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -18691,6 +18864,9 @@
 msgid "Transparency"
 msgstr "పారదర్శకత "
 
+# *< name
+# *< version
+# *  summary
 #. *< name
 #. *< version
 #. *  summary
@@ -18698,73 +18874,66 @@
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "మిత్రుల లిస్ట్ మరియు సంభాషణలకు వేరియబుల్ పారదర్శకత "
 
-#  *< name
-#  *< version
-#  *  summary
 #. *  description
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:698
-#, fuzzy
-msgid ""
-"This plugin enables variable alpha transparency on conversation windows and "
-"the buddy list.\n"
+msgid ""
+"This plugin enables variable alpha transparency on conversation windows and the buddy list.\n"
 "\n"
 "* Note: This plugin requires Win2000 or greater."
-msgstr "సంభాషణల విండోస్ మీద మరియు మిత్రుల లిస్టుమీద ఈ ప్లగ్ వేరియబుల్ ఆల్ఫా ట్రాన్స్‌ఫరెన్సీని కలిగిస్తుంది."
+msgstr ""
+"సంభాషణల విండోలు మరియు మిత్రుల జాబితాలపైన విభిన్నమైన ఆల్ఫా ట్రాన్స్పరెన్సీకి ఈ ప్లగ్ ఇన్ వీలు కల్పిస్తుంది.\n"
+"\n"
+"* గమనిక: ఈ ప్లగ్ ఇన్ కు Win2000 లేదా ఆ తర్వాతది అవసరం."
 
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:303
 msgid "GTK+ Runtime Version"
 msgstr "GTK+ రన్‌టైమ్ వెర్షన్ "
 
-#  Autostart
+# Autostart
 #. Autostart
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:311
 msgid "Startup"
 msgstr "ప్రారంభం "
 
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:312
-#, fuzzy, c-format
+#, c-format
 msgid "_Start %s on Windows startup"
-msgstr "_విండోస్ స్టార్టప్‌లో గెయిమ్‌ను ప్రారంభించండి."
+msgstr "_విండోస్ స్టార్టప్‌తో %s ప్రారంభించండి."
 
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:327
 msgid "_Dockable Buddy List"
-msgstr "_కనిపించు మిత్రుల లిస్టు"
-
-#  Blist On Top
+msgstr "_కనిపించే మిత్రుల లిస్టు"
+
 #. Blist On Top
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:331
-#, fuzzy
 msgid "_Keep Buddy List window on top:"
-msgstr "_నియంత్రించిన మిత్రుల లిస్టును పైభాగాన ఉంచుము."
+msgstr "_మిత్రుల జాబితా విండోను ఎప్పుడూ పైనే ఉండేట్టుగా:"
 
 #. XXX: Did this ever work?
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:336
 msgid "Only when docked"
-msgstr ""
+msgstr "డాక్ కాబడినప్పుడు మాత్రమే"
 
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:341
-#, fuzzy
 msgid "_Flash window when chat messages are received"
-msgstr "సందేశములను స్వీకరించినప్పుడు విండోను _Flash చేయుము."
+msgstr "_చాట్ సందేశాలు మీకు చేరినప్పుడు విండోను ఫ్లాష్ చేయండి"
 
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:371
 #, fuzzy
 msgid "Windows Pidgin Options"
-msgstr "ఆప్షన్లను లాగిన్ చేయండి. "
+msgstr "పిడ్గ్విన్ అవకాశాలు"
 
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:373
-#, fuzzy
 msgid "Options specific to Pidgin for Windows."
-msgstr "విండోస్ గెయిమ్‌కు నిర్దిష్టమైన ఆప్షన్లు."
+msgstr "విండోస్ కోసం పిడ్గ్విన్ కు ప్రత్యేకమైన అవకాశాలు."
 
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:374
-msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
-msgstr ""
-
-#: ../pidgin/plugins/xmppconsole.c:667
+msgid "Provides options specific to Pidgin for Windows , such as buddy list docking."
+msgstr "మిత్రుల జాబితా డాకింగ్ తరహాలో విండోస్ కోసం పిడ్గ్విన్ కు ప్రత్యేకమైన అవకాశాలు కల్పిస్తుంది."
+
+#: ../pidgin/plugins/xmppconsole.c:670
 msgid "<font color='#777777'>Logged out.</font>"
-msgstr ""
+msgstr "<ఫాంట్ రంగు='#777777'>లాగ్అవుటైన.</ఫాంట్>"
 
 #. *< type
 #. *< ui_requirement
@@ -18772,1714 +18941,43 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/xmppconsole.c:746 ../pidgin/plugins/xmppconsole.c:841
-#: ../pidgin/plugins/xmppconsole.c:860
+#: ../pidgin/plugins/xmppconsole.c:749
+#: ../pidgin/plugins/xmppconsole.c:844
+#: ../pidgin/plugins/xmppconsole.c:863
 msgid "XMPP Console"
-msgstr ""
-
-#  And now for the buttons
-#: ../pidgin/plugins/xmppconsole.c:753
-#, fuzzy
+msgstr "XMPP కన్సోల్"
+
+# And now for the buttons
+# Set up stuff for the account box
+#: ../pidgin/plugins/xmppconsole.c:756
 msgid "Account: "
-msgstr "ఖాతా:"
-
-#: ../pidgin/plugins/xmppconsole.c:780
+msgstr "అకౌంటు:"
+
+#: ../pidgin/plugins/xmppconsole.c:783
 msgid "<font color='#777777'>Not connected to XMPP</font>"
-msgstr ""
-
-#: ../pidgin/plugins/xmppconsole.c:790
+msgstr "<ఫాంట్ రంగు='#777777'>XMPPకి అనుసంధానం కాలేదు</ఫాంట్>"
+
+#: ../pidgin/plugins/xmppconsole.c:793
 msgid "Insert an <iq/> stanza."
-msgstr ""
-
-#: ../pidgin/plugins/xmppconsole.c:799
+msgstr "<iq/>స్టాంజాను పొందు పరచు."
+
+#: ../pidgin/plugins/xmppconsole.c:802
 msgid "Insert a <presence/> stanza."
-msgstr ""
-
-#: ../pidgin/plugins/xmppconsole.c:808
-#, fuzzy
+msgstr "<presence/> స్టాంజాను పొందు పరచు."
+
+#: ../pidgin/plugins/xmppconsole.c:811
 msgid "Insert a <message/> stanza."
-msgstr "సచిత్రమును చేర్చండి."
+msgstr "<message/>స్టాంజాను పొందు పరచు."
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/xmppconsole.c:863
+#: ../pidgin/plugins/xmppconsole.c:866
 msgid "Send and receive raw XMPP stanzas."
-msgstr ""
+msgstr "కొత్త raw XMPP స్టాంజాలను పంపించు లేదా అందుకోండి."
 
 #. *  description
-#: ../pidgin/plugins/xmppconsole.c:865
+#: ../pidgin/plugins/xmppconsole.c:868
 msgid "This plugin is useful for debbuging XMPP servers or clients."
-msgstr ""
-
-#, fuzzy
-#~ msgid "Offline buddies"
-#~ msgstr "సోమరి మిత్రులను కాంతిహీనులను చేయుము."
-
-#, fuzzy
-#~ msgid "Sort"
-#~ msgstr "పోర్ట్ "
-
-#, fuzzy
-#~ msgid "By Status"
-#~ msgstr "వస్తుస్థితి (స్టాటస్) చేత "
-
-#, fuzzy
-#~ msgid "By Log Size"
-#~ msgstr "లాగ్ సైజ్ వలన "
-
-#, fuzzy
-#~ msgid "Unable to connect to contact server"
-#~ msgstr "సెర్వర్‌కు కనెక్ట్‌చేయలేని స్థితి. "
-
-#, fuzzy
-#~ msgid "Unable to retrieve MSN Address Book"
-#~ msgstr "మిత్రుల లిస్టును పొందుట సాధ్యంకాదు."
-
-#, fuzzy
-#~ msgid "Current media"
-#~ msgstr "ప్రస్తుతం ఆన్‌లో ఉన్నది."
-
-#, fuzzy
-#~ msgid "Windows Live Messenger Protocol Plugin"
-#~ msgstr "Novell GroupWise Messenger Protocol Plugin"
-
-#, fuzzy
-#~ msgid "Windows Live ID authentication Failed"
-#~ msgstr "సామాన్య ప్రమాణీకరణ వైఫల్యం!"
-
-#, fuzzy
-#~ msgid "%s just sent you a Nudge!"
-#~ msgstr "%s మీకు ఒక ఫైలును పంపించా లనుకుంటున్నాడు."
-
-# #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
-# gnome-session/gsm-client-row.c:43
-# #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
-# gnome-session/gsm-client-row.c:43
-#, fuzzy
-#~ msgid "Unknown error (%d)"
-#~ msgstr "తెలియని పొరపాటు."
-
-#, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "సెర్వర్‌కు కనెక్ట్‌చేయలేని స్థితి. "
-
-#, fuzzy
-#~ msgid "%s (%s) changed status from %s to %s"
-#~ msgstr "%s విషయాన్ని %sకు మార్చాడు "
-
-#, fuzzy
-#~ msgid "%s (%s) is now %s"
-#~ msgstr "%s కొత్తపేరు %s."
-
-#, fuzzy
-#~ msgid "%s (%s) is no longer %s"
-#~ msgstr "ఇప్పుడు %s  దూరంలో లేరు/దు."
-
-#, fuzzy
-#~ msgid "_Merge"
-#~ msgstr "_సందేశం:"
-
-#, fuzzy
-#~ msgid "_Send File..."
-#~ msgstr "_ఫైలును పంపుము. "
-
-#, fuzzy
-#~ msgid "Add Buddy _Pounce..."
-#~ msgstr "Buddy _Pounceను చేర్చండి."
-
-#, fuzzy
-#~ msgid "Hide when offline"
-#~ msgstr "మీరు ఆఫ్‌లైన్‌లో ఉన్నప్పుడు అనుమతి లేదు."
-
-#, fuzzy
-#~ msgid "Show when offline"
-#~ msgstr "మీరు ఆఫ్‌లైన్‌లో ఉన్నప్పుడు అనుమతి లేదు."
-
-#, fuzzy
-#~ msgid "Add _Buddy..."
-#~ msgstr "మిత్రుని చేర్చుము "
-
-#, fuzzy
-#~ msgid "Add C_hat..."
-#~ msgstr "సంభాషణ చేర్చండి."
-
-#, fuzzy
-#~ msgid "Persistent"
-#~ msgstr "అనుమతి "
-
-#  And now for the buttons
-#, fuzzy
-#~ msgid "/Accounts/Manage"
-#~ msgstr "ఖాతాలు"
-
-#  And now for the buttons
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "ఖాతా:"
-
-#, fuzzy
-#~ msgid "S_end To"
-#~ msgstr "_పేరుతో పంపుము"
-
-#~ msgid "Hide Disconnect Errors"
-#~ msgstr "డిస్‌కనెక్షన్ చేయడంలో పొరపాట్లను దాచిపెట్టుము."
-
-#~ msgid "Hide Login Errors"
-#~ msgstr "లాగిన్ పొరపాట్లను దాచిపెట్టుము."
-
-#~ msgid "Hide Reconnecting Dialog"
-#~ msgstr "दोबारा कनक्शन डयलॉग छिपाओ"
-
-#  *< name
-#  *< version
-#  *  summary
-#~ msgid "When you are kicked offline, this reconnects you."
-#~ msgstr "మిమ్మల్ని లైనునుండి బయటకు త్రోసివేసినప్పుడు, ఇది మిమ్మల్ని రీకనెక్ట్ చేస్తుంది."
-
-#~ msgid "Use last matching buddy"
-#~ msgstr "చివరగా మాచ్ అయే మిత్రుని ఉపయోగించుము."
-
-#  Explanation
-#, fuzzy
-#~ msgid ""
-#~ "The buddy with the lowest score is the buddy who will have priority in "
-#~ "the contact.\n"
-#~ "The default values (offline = 4, away = 2, and idle = 1) will use what "
-#~ "used to be\n"
-#~ "the built-in order: active, idle, away, away + idle, offline."
-#~ msgstr ""
-#~ "అతి తక్కువ స్కోర్ పొందిన మిత్రుడు సంప్రదింపులకు మొట్టమొదటగా సంప్రదించే అర్హతను పొందుతాడు.\n"
-#~ "(ఉపేక్ష విలువలు ఆఫ్‌లైన్ = 4,దూరం = 2, మరియు సోమరి= 1)\n"
-#~ " will use what used to be the built-in order active->idle->away->away"
-#~ "+idle->offline."
-
-#  *  DEFINES, MACROS & DATA TYPES
-#~ msgid "Gaim"
-#~ msgstr "గెయిమ్"
-
-#~ msgid "Gaim - Signed off"
-#~ msgstr "గెయిమ్ - సైన్డ్ ఆఫ్ "
-
-#~ msgid "Gaim - Away"
-#~ msgstr "గెయిమ్ - దూరంగా "
-
-#~ msgid "Join A Chat..."
-#~ msgstr "సంభాషణలో పాల్గొనండి..."
-
-#  *< name
-#  *< version
-#  *  summary
-#~ msgid "Displays an icon for Gaim in the system tray."
-#~ msgstr "సిస్టం ట్రేలో గెయిమ్ కోసం ఐకన్‌ను ప్రదర్శించును."
-
-#  *  description
-#~ msgid ""
-#~ "Displays a system tray icon (in GNOME, KDE or Windows for example) to "
-#~ "show the current status of Gaim, allow fast access to commonly used "
-#~ "functions, and to toggle display of the buddy list or login window. Also "
-#~ "allows messages to be queued until the icon is clicked, similar to ICQ."
-#~ msgstr ""
-#~ "గెయిమ్ వర్తమాన పరిస్థితిని చూపుటకు (ఉదాహరణకు GNOME, KDE లేక విండోస్‌లో) సిస్టం ట్రే ఐకన్‌ను డిస్‌ప్లే "
-#~ "చేయును, తరచుగా ఉపయోగించు ఫంక్షన్లకు వేగవంతమైన యాక్సెస్ కలిగించును, మరియు మిత్రుల లిస్టు - "
-#~ "లాగిన్‌ విండోలమధ్య అటుయిటు ఊగిసలాడుతుంది. ఐకన్ క్లిక్ చేసేంతవరకు వచ్చిన సందేశాలను ICQ వలె "
-#~ "వరుసక్రమంలో ఉంచుతుంది."
-
-#, fuzzy
-#~ msgid "GtkTreeView Expander Size"
-#~ msgstr "Expander Size"
-
-#~ msgid ""
-#~ "You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
-#~ "\">http://gaim.sourceforge.net</a>."
-#~ msgstr ""
-#~ "మీరు %s నుండి వెర్షన్స్ స్వీకరించవచ్చును:<br><a href=\"http://gaim.sourceforge.net/"
-#~ "\">http://gaim.sourceforge.net</a>."
-
-#~ msgid "Delay"
-#~ msgstr "ఆలస్యం "
-
-#~ msgid "WinGaim Options"
-#~ msgstr "విన్‌గెయిమ్ (WinGaim) ఆప్షన్లు"
-
-#~ msgid ""
-#~ "%d buddy from group %s was not removed because its account was not logged "
-#~ "in.  This buddy and the group were not removed.\n"
-#~ msgid_plural ""
-#~ "%d buddies from group %s were not removed because their accounts were not "
-#~ "logged in.  These buddies and the group were not removed.\n"
-#~ msgstr[0] ""
-#~ "%d మిత్రుని %s గ్రూప్‌నుండి తీసివేయలేదు ఎందుకంటే అతని ఎకౌంట్ లాగిన్ చేయలేదు. ఇతని పేరును, ఇతని "
-#~ "గ్రూప్ పేరును తొలగించలేదు.\n"
-#~ msgstr[1] ""
-#~ "%d बड्डी %s समूह से नहीं निकाले गये क्योंकि उन बड्डीयों ने लॉग इन नहीं किया था। वह "
-#~ "बड्डी और समूह नहीं हटाये गये ।\n"
-
-#~ msgid "Group not removed"
-#~ msgstr "గ్రూపును తొలగించలేదు."
-
-#~ msgid "(+%d more)"
-#~ msgstr "(+%d ఎక్కువ)"
-
-#~ msgid " left the room (%s)."
-#~ msgstr " గదిని వదిలిపెట్టి వెళ్లిపోయారు (%s)."
-
-#~ msgid "Screen Name:"
-#~ msgstr "స్క్రీన్ పేరు:"
-
-#~ msgid "Buddy icon:"
-#~ msgstr "మిత్రుని ఐకన్:"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "Do you wish to add him or her to your buddy list?"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "అతనిని లేక ఆమెను మీ మిత్రుల లిస్టులో చేర్చదల్చుకున్నారా?"
-
-#~ msgid "_Alias Buddy..."
-#~ msgstr "_మిత్రుని ఉపనామం..."
-
-#~ msgid "Alias Contact..."
-#~ msgstr "ఉపనామంతో సంబంధం ..."
-
-#  And now for the buttons
-#~ msgid "/Tools/Account Ac_tions"
-#~ msgstr "/ఉపకరణాలు /ఖాతాలపై చర్యలు"
-
-#  And now for the buttons
-#~ msgid "/Tools/A_ccounts"
-#~ msgstr "/ఉపకరణాలు /ఖాతాలు "
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "<b>Contact Alias:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>సంప్రదించుటకు ఉపనామము:</b>"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "<b>Alias:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>ఉపనామం:</b>"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "<b>Nickname:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>ఉపనామం:</b>"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "<b>Logged In:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>ముందే లాగ్ అయివున్నది:</b>"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Status:</b> Offline"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>స్టాటస్:</b> ఆఫ్‌లైన్ "
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Description:</b> Spooky"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>వివరణ:</b> భయపెట్టు"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "<b>Status:</b> Awesome"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>స్టాటస్</b>: గొప్పయైన"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "<b>Status:</b> Rockin'"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>స్టాటస్</b>: ఊగు "
-
-#~ msgid "/Tools/Buddy Pounce"
-#~ msgstr "/ఉపకరణాలు/స్నేహితునిపై దుముకుట "
-
-#  And now for the buttons
-#~ msgid "/Tools/Account Actions"
-#~ msgstr "/ఉపకరణాలు/ఖాతాలపై చర్యలు"
-
-#~ msgid "me is using Gaim v%s."
-#~ msgstr "నేను గెయిమ్‌ను వాడుతున్నాను v%s."
-
-#, fuzzy
-#~ msgid "/Options/Show Buddy _Icon"
-#~ msgstr "మిత్రుల _ఐకన్లను ప్రదర్శించుము."
-
-#, fuzzy
-#~ msgid "/Options/Show Buddy Icon"
-#~ msgstr "మిత్రుల _ఐకన్లను ప్రదర్శించుము."
-
-#~ msgid "IM the user"
-#~ msgstr "నేను వినియోగదారుడను"
-
-#~ msgid "Ignore the user"
-#~ msgstr "వినియోగదారుని ఉపేక్షించుము"
-
-#~ msgid "Get the user's information"
-#~ msgstr "వినియోగదారుని సమాచారమును సేకరించుము "
-
-#, fuzzy
-#~ msgid "Jabber developer"
-#~ msgstr "పూర్వ జాబర్ డెవలపర్ "
-
-#, fuzzy
-#~ msgid ""
-#~ "Gaim is a modular messaging client capable of using 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 GNU GPL."
-#~ "<BR><BR>"
-#~ msgstr ""
-#~ "గెయిమ్ ఒక మాడ్యులర్ పద్ధతిలో సందేశాలను అందించే క్లైంట్. ఇది AIM, MSN, Yahoo!, Jabber, ICQ, "
-#~ "IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu అన్నింటినీ తక్షణమే "
-#~ "వాడుకుంటుంది. Gtk+ ను వాడి ఇది వ్రాయబడి, GPL చే లైసెన్స్ ఇవ్వబడింది. <BR><BR>"
-
-#~ msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
-#~ msgstr "<FONT SIZE=\"4\">IRC:</FONT> #wingaim irc.freenode.net पर<BR><BR>"
-
-#~ msgid "Active Developers"
-#~ msgstr "యాక్టివ్ డెవలపర్స్ "
-
-#~ msgid "_Keep the dialog open"
-#~ msgstr "_డైలాగ్‌ను ఓపెన్ చేసి ఉంచండి."
-
-#~ msgid "Smaller font size"
-#~ msgstr "చిన్న ఫాంట్ సైజ్ "
-
-#~ msgid "Insert link"
-#~ msgstr "లింకును చేర్చండి."
-
-#~ msgid "Insert image"
-#~ msgstr "సచిత్రమును చేర్చండి."
-
-#  Conversations
-#, fuzzy
-#~ msgid "Conversation in %s on %s"
-#~ msgstr "%s తో సంభాషణలు "
-
-#~ msgid "<span weight=\"bold\">From:</span> %s\n"
-#~ msgstr "<span weight=\"bold\">నుండి:</span> %s\n"
-
-#~ msgid "<span weight=\"bold\">Subject:</span> %s\n"
-#~ msgstr "<span weight=\"bold\">విషయం:</span> %s\n"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
-#~ "\n"
-#~ "%s%s%s%s"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">మీకు జాబు వచ్చింది!</span>\n"
-#~ "\n"
-#~ "%s%s%s%s"
-
-#~ msgid "Error launching <b>%s</b>: %s"
-#~ msgstr "<b>%s</b> లాంచ్ చేయడంలో పొరపాటు.: %s"
-
-#~ msgid "A_way"
-#~ msgstr "దూరంగా "
-
-#~ msgid "_Idle"
-#~ msgstr "_సోమరి "
-
-#~ msgid "Retur_n from idle"
-#~ msgstr "సోమరితనం నుండి తిరిగి రండి "
-
-#~ msgid "Pounce Action"
-#~ msgstr "మీదకు దూకుట"
-
-#~ msgid "Bro_wse..."
-#~ msgstr "బ్రౌజ్..."
-
-#~ msgid "Sav_e this pounce after activation"
-#~ msgstr "ఈ దూకుడును యాక్టివేషన్ తర్వాత సేవ్ చేయండి "
-
-#~ msgid "Remove Buddy Pounce"
-#~ msgstr "మిత్రుని దూకుడును సేవ్ చేయండి. "
-
-#~ msgid "Send unknown \"_slash\" commands as messages"
-#~ msgstr "అజ్ఞాత \"_slash\"  కమాండ్స్‌ను సందేశములుగా పంపుము."
-
-#~ msgid "Show buddy _icons"
-#~ msgstr "మిత్రుల _ఐకన్లను ప్రదర్శించుము."
-
-#~ msgid "Tab Options"
-#~ msgstr "టాబ్ ఆప్షన్స్ "
-
-#~ msgid "_Sounds while away"
-#~ msgstr "_దూరంగా ఉన్నప్పుడు ధ్వనించును "
-
-#~ msgid "_Queue new messages when away"
-#~ msgstr "_దూరంగా ఉన్నప్పుడు కొత్త సందేశములు వరుసలో ఉండును."
-
-#, fuzzy
-#~ msgid "Custom status"
-#~ msgstr "వస్తుస్థితి (స్టాటస్) చేత "
-
-#~ msgid ""
-#~ "Unable to play sound because the 'Command' sound method has been chosen, "
-#~ "but no command has been set."
-#~ msgstr ""
-#~ "'కమాండ్' సౌండ్ పద్ధతి ఎంపిక చేసినందువల్ల శబ్దాన్ని వినిపించలేకపోతున్నది. కాని కమాండ్‌ను సెట్ చేయలేదు."
-
-#~ msgid ""
-#~ "Unable to play sound because the configured sound command could not be "
-#~ "launched: %s"
-#~ msgstr ""
-#~ "కన్ఫిగర్ చేసిన సౌండ్ కమాండ్‌ను లాంచ్ చేయుటకు వీలుపడలేదు, అందుచేత శబ్దం వినిపించుటలేదు: %s"
-
-#~ msgid "_Warn"
-#~ msgstr "_హెచ్చరించు"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "<b>Status:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>స్టాటస్</b>: గొప్పయైన"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "<b>Message:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>%s:</b> %s"
-
-#, fuzzy
-#~ msgid "Could't open file"
-#~ msgstr "ఫైలును పంపుట సాధ్యం కాదు. "
-
-#, fuzzy
-#~ msgid "Change password"
-#~ msgstr "పాస్‌వర్డ్‌ను మార్చండి."
-
-#~ msgid "<b>%s:</b> %s"
-#~ msgstr "<b>%s:</b> %s"
-
-#~ msgid "<b>%s:</b> %s<br>"
-#~ msgstr "<b>%s:</b> %s<br>"
-
-#~ msgid "Realname"
-#~ msgstr "నిజమైన పేరు "
-
-#~ msgid "Cannot join %s:"
-#~ msgstr "%sను చేరలేను:"
-
-#~ msgid ""
-#~ "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
-#~ "account properties"
-#~ msgstr ""
-#~ "లాగిన్ చేయాలంటే TLS/SSL అవసరం. ఎకౌంట్ ప్రాపర్టీస్‌లో \"TLS దొరికినచో ఉపయోగించండి\"ని సెలక్ట్ చేయండి."
-
-#~ msgid "Jabber ID"
-#~ msgstr "Jabber ID"
-
-#, fuzzy
-#~ msgid "Search for Jabber users"
-#~ msgstr "ఇ-మెయిల్ అడ్రస్‌తో మిత్రుని కనుగొనండి. "
-
-#~ msgid "Invalid Jabber ID"
-#~ msgstr "విలువలేని Jabber ID."
-
-#~ msgid "Change Jabber Password"
-#~ msgstr "Jabber పాస్‌వర్డ్‌ను మార్చుము."
-
-#~ msgid "Jabber Protocol Plugin"
-#~ msgstr "Jabber Protocol Plugin"
-
-#~ msgid "Use TLS if available"
-#~ msgstr "లభ్యమైతే TLS ఉపయోగించండి. "
-
-#~ msgid "The user %s wants to add %s to his or her buddy list."
-#~ msgstr "వినియోగదారుడు/రాలు %s %sను తన మిత్రుల జాబితాలో చేర్చదల్చుకున్నాడు/న్నది."
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>%s:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>%s:</b> %s"
-
-#~ msgid "Hidden"
-#~ msgstr "దాచిన "
-
-#~ msgid "<b>%s:</b> "
-#~ msgstr "<b>%s:</b> "
-
-#~ msgid "MSN Profile"
-#~ msgstr "MSN ప్రొఫైల్ "
-
-#~ msgid "Login server"
-#~ msgstr "లాగిన్ సెర్వర్ "
-
-#~ msgid "The user %s (%s) wants to add %s to his or her buddy list."
-#~ msgstr "వినియోగదారుడు %s (%s) %sని తన మిత్రుల లిస్టులో చేర్చదల్చుకున్నాడు."
-
-#~ msgid "Unable to read header from server"
-#~ msgstr "సెర్వర్‌నుండి శీర్షికను చదవడంలో అసమర్థత."
-
-#~ msgid ""
-#~ "Unable to read message from server: %s.  Command is %hd, length is %hd."
-#~ msgstr "సెర్వర్‌నుండి సందేశాన్ని చదవడంలో అసమర్థత: %s.  కమాండ్: %hd, పొడవు: %hd."
-
-#~ msgid "users: %s, files: %s, size: %sGB"
-#~ msgstr "వినియోగదారుడు: %s, ఫైల్: %s, సైజ్: %sGB"
-
-#~ msgid "Unable to add \"%s\" to your Napster hotlist"
-#~ msgstr "మీ నాప్‌స్టర్ హాట్‌లిస్టుకు చేర్చుటకు \"%s\" సమర్థత లేదు."
-
-#~ msgid "%s requested a PING"
-#~ msgstr "%s ఒక పింగ్‌ను కోరినారు. "
-
-#~ msgid "NAPSTER Protocol Plugin"
-#~ msgstr "నాప్‌స్టర్ ప్రొటోకాల్ ప్లగ్ఇన్ "
-
-#~ msgid "Invalid password"
-#~ msgstr "పనికిరాని పాస్‌వర్డ్."
-
-#~ msgid "Invalid username or password"
-#~ msgstr "విలువలేని వినియోగదారుని పేరు మరియు పాస్‌వర్డ్."
-
-#~ msgid "Error processing event or response (%s)."
-#~ msgstr "ఘటన లేక బాధ్యతను ప్రాసెస్ చేయడంలో పొరపాటు (%s)."
-
-#~ msgid "Direct IM with %s closed"
-#~ msgstr "%s ముగింపుతో డైరెక్ట్  IM "
-
-#~ msgid "Direct IM with %s failed"
-#~ msgstr "%s వైఫల్యంతో డైరెక్ట్ IM "
-
-#~ msgid "Unable to open Direct IM"
-#~ msgstr "డైరెక్ట్ IMను ఓపెన్ చేయడం సాధ్యం కాదు. "
-
-#, fuzzy
-#~ msgid "You have lost your connection to chat room %s."
-#~ msgstr "సంభాషణ గది %s నుండి మీరు డిస్‌కనెక్ట్ చేయబడినారు "
-
-#~ msgid "Chat is currently unavailable"
-#~ msgstr "సంభాషణ ఇప్పుడు లభ్యం కాదు. "
-
-#, fuzzy
-#~ msgid "Unable to log into file transfer proxy."
-#~ msgstr "%s ఫైలును వ్రాయడంలో అసమర్థత. "
-
-#, fuzzy
-#~ msgid ""
-#~ "Unable to establish listener socket or no AOL proxy connection present."
-#~ msgstr "శ్రోతకు సాకెట్‌ను స్థాపించడంలో అసమర్థత. "
-
-#~ msgid ""
-#~ "The user %s requires authorization before being added to a buddy list.  "
-#~ "Do you want to send an authorization request?"
-#~ msgstr ""
-#~ "మిత్రుల లిస్టులో తన పేరును చేర్చేముందు వినియోగదారునికి ఆథరైజేషన్ %s అవసరం. మీరు ఆథరైజేషన్ కోసం "
-#~ "మనవిచేయదల్చుకున్నారా?"
-
-#~ msgid "Request Authorization"
-#~ msgstr "ఆథరైజేషన్‌కోసం విజ్ఞప్తి చేయండి."
-
-#, fuzzy
-#~ msgid ""
-#~ "The user %u wants to add %s to their buddy list for the following "
-#~ "reason:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "వినియోగదారుడు %u మిమ్మల్ని ఈ కారణంచేత తన మిత్రుల లిస్టులో చేర్చాలని అనుకుంటున్నాడు:\n"
-#~ "%s"
-
-#~ msgid "Authorization Request"
-#~ msgstr "ఆథరైజేషన్ విజ్ఞప్తి. "
-
-#~ msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
-#~ msgstr "<B>UIN:</B> %s<BR><B>స్టాటస్:</B> %s<HR>%s"
-
-#~ msgid "SNAC threw error: %s\n"
-#~ msgstr "SNAC పొరపాటు చేసింది: %s\n"
-
-#~ msgid "User information for %s unavailable:"
-#~ msgstr "వినియోగదారుని సమాచారం %s కు లభించలేదు."
-
-#~ msgid "Rate limiting error."
-#~ msgstr "పొరపాటును నియంత్రించు ధర."
-
-#~ msgid "You have been signed off for an unknown reason."
-#~ msgstr "అజ్ఞాత కారణములవల్ల మీరు సైన్-ఆఫ్ చేయబడినారు."
-
-#~ msgid ""
-#~ "Your screen name is currently formatted as follows:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "మీ స్క్రీన్ పేరు ఈ క్రిందివిధంగా ఫార్మాట్ చేయబడింది:\n"
-#~ "%s"
-
-#~ msgid "Unable to set AIM away message."
-#~ msgstr "AIM కు దూరంగా ఉన్న సందేశాన్ని సెట్ చేయడం అసాధ్యం."
-
-#~ msgid ""
-#~ "You have probably requested to set your away message before the login "
-#~ "procedure completed.  You remain in a \"present\" state; try setting it "
-#~ "again when you are fully connected."
-#~ msgstr ""
-#~ "లాగిన్ ప్రొసీజర్ పూర్తికాకముందే మీ సందేశాన్ని సెట్ చేయమని మీరు మనవిచేసి ఉంటారు. మీరు \"వర్తమాన\" స్థితిలో "
-#~ "ఉండి; మీకు పూర్తి కనెక్షన్ లభించిన తర్వాత సెట్ చేయడానికి ప్రయత్నించండి. "
-
-#~ msgid ""
-#~ "Could not add the buddy %s for an unknown reason.  The most common reason "
-#~ "for this is that you have the maximum number of allowed buddies in your "
-#~ "buddy list."
-#~ msgstr ""
-#~ "అజ్ఞాత కారణంచేత %s మిత్రుని చేర్చడం సాధ్యంకాదు. దీనికి సామాన్య కారణం ఒకటే అయివుంటుంది. మీ మిత్రుల "
-#~ "లిస్టు నిండిపోయి ఉంటుంది. "
-
-#, fuzzy
-#~ msgid ""
-#~ "The user %s wants to add %s to their buddy list for the following "
-#~ "reason:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "ఈ క్రింది కారణంచేత వినియోగదారుడు %s మిమ్మల్ని తన మిత్రుల లిస్టులో చేర్చదల్చుకున్నాడు:\n"
-#~ "%s"
-
-#, fuzzy
-#~ msgid "Hide IP address"
-#~ msgstr "IP అడ్రస్ "
-
-#, fuzzy
-#~ msgid "Web aware"
-#~ msgstr "వెబ్ అవగతం "
-
-#~ msgid "New screen name formatting:"
-#~ msgstr "కొత్త స్క్రీన్‌పేరు ఫార్మాటింగ్:"
-
-#~ msgid "Format Screen Name..."
-#~ msgstr "స్క్రీన్‌పేరును ఫార్మాట్ చేయండి..."
-
-#~ msgid "Auth host"
-#~ msgstr "Auth host"
-
-#~ msgid "Auth port"
-#~ msgstr "Auth port"
-
-#~ msgid "Active"
-#~ msgstr "యాక్టివ్ "
-
-#~ msgid "EMail"
-#~ msgstr "ఇ-మెయిల్ "
-
-#~ msgid "Instant Messages"
-#~ msgstr "సత్వర సందేశాలు "
-
-#~ msgid "Verify all IM message signatures"
-#~ msgstr "అన్ని IM సందేశపు సంతకాలను వెరిఫై చేయండి. "
-
-#~ msgid "Channel Messages"
-#~ msgstr "చానల్ సందేశాలు"
-
-#~ msgid "Digitally sign all channel messages"
-#~ msgstr "అన్ని చానల్ సందేశాలపై డిజిటల్‌ సంతకాలు చేయండి. "
-
-#~ msgid "Verify all channel message signatures"
-#~ msgstr "అన్ని చానల్ సందేశాల సంతకాలను వెరిఫై చేయండి."
-
-#~ msgid "Reject watching by other users"
-#~ msgstr "ఇతర వినియోగదారులు చూచుటకు నిరాకరణ. "
-
-#~ msgid "Block invites"
-#~ msgstr "ఆహ్వానాలకు నిషేధం."
-
-#~ msgid "Reject online status attribute requests"
-#~ msgstr "ఆన్-లైన్ స్టాటస్ ఎట్రిబ్యూట్ మనవుల నిరాకరణ. "
-
-#~ msgid "TOC has sent a PAUSE command."
-#~ msgstr "TOC ఒక PAUSE కమాండ్‌ను పంపింది. "
-
-#~ msgid ""
-#~ "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."
-#~ msgstr ""
-#~ "ఇది జరిగినప్పుడు, TOC తనకు పంపిన సందేశాలను అపేక్షిస్తుంది, మరియు మరల మీరు సందేశాన్ని పంపితే "
-#~ "త్రోసివేయవచ్చు. గెయిమ్ ఇలా జరగడాన్ని నిరోధిస్తుంది. ఇది కేవలం తాత్కాలికం, దయచేసి ఓపిక పట్టండి."
-
-#~ msgid "Gaim - Save As..."
-#~ msgstr "గెయిమ్ - ఇలా సేవ్ చేయండి..."
-
-#~ msgid "TOC host"
-#~ msgstr "TOC దాత"
-
-#~ msgid "TOC port"
-#~ msgstr "TOC పోర్ట్"
-
-#, fuzzy
-#~ msgid "Message (optional) :"
-#~ msgstr "సందేశ సూచన. "
-
-#~ msgid ""
-#~ "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."
-#~ msgstr ""
-#~ "సాధారణ ప్రమాణీకరణ విఫలమైంది. అంటే మీ పాస్‌వర్డ్‌ నిజమైనది కాకపోయి ఉండాలి, లేదా యాహూ ప్రమాణీకరణ పద్ధతి మారి "
-#~ "ఉండాలి. గెయిమ్ ఇప్పుడు వెబ్ మెసెంజర్ ప్రమాణీకరణ నుపయోగించి ప్రయత్నిస్తుంది. ఈ పద్ధతి ఫంక్షన్ తీరును, "
-#~ "ఇతర ఫీచర్లను తగ్గిస్తుంది."
-
-#~ msgid "Unable to read"
-#~ msgstr "చదవడానికి అసమర్థత. "
-
-#, fuzzy
-#~ msgid "Stealth"
-#~ msgstr "స్థితి "
-
-#~ msgid "Pager host"
-#~ msgstr "పేజర్ హోస్ట్"
-
-#~ msgid "YCHT Host"
-#~ msgstr "YCHT హోస్ట్"
-
-#~ msgid "YCHT Port"
-#~ msgstr "YCHT పోర్ట్ "
-
-#~ msgid "<b>IP Address:</b> %s<br>"
-#~ msgstr "<b>IP అడ్రస్:</b> %s<br>"
-
-#~ msgid "(%d message)"
-#~ msgid_plural "(%d messages)"
-#~ msgstr[0] "(%d సందేశం)"
-#~ msgstr[1] "(1 सन्देश)"
-
-#~ msgid "(1 message)"
-#~ msgstr "(1 సందేశం)"
-
-#~ msgid "%s came back"
-#~ msgstr "\"%s వెనక్కు వచ్చినారు."
-
-#, fuzzy
-#~ msgid "Default auto-away"
-#~ msgstr "స్వతఃదూరం"
-
-#~ msgid "g003: Error opening connection.\n"
-#~ msgstr "g003: కనెక్ట్ చేయడంలో పొరపాటు.\n"
-
-#, fuzzy
-#~ msgid "Show more buddy details"
-#~ msgstr "వినియోగదారుని వివరములు చూపుము."
-
-#~ msgid "Gnome Default"
-#~ msgstr "గ్నోమ్ డిఫాల్ట్ "
-
-#~ msgid "Away m_essage:"
-#~ msgstr "సుదూర సందేశము:"
-
-#~ msgid "IRC"
-#~ msgstr "IRC"
-
-#~ msgid "Quit message"
-#~ msgstr "సందేశమును వదలివేయుము."
-
-#~ msgid "Restore Away State On Reconnect"
-#~ msgstr "రీకనెక్ట్ చేయడంవల్ల పూర్వస్థితి పునరుద్ధరణకు వచ్చును."
-
-#~ msgid "Mail Server"
-#~ msgstr "మెయిల్ సెర్వర్ "
-
-#~ msgid "%s (%d new/%d total)"
-#~ msgstr "%s (%d-కొత్త/%d మొత్తం)"
-
-#~ msgid "Check Mail"
-#~ msgstr "తపాలాను చూడండి. "
-
-#~ msgid "Check e-mail every X seconds.\n"
-#~ msgstr "ప్రతి X సెకండ్లకు ఇ-మెయిల్ చూడండి.\n"
-
-#~ msgid "Auto-login"
-#~ msgstr "ఆటో-లాగిన్"
-
-#~ msgid "Signoff"
-#~ msgstr "సైన్‌ఆఫ్ "
-
-#~ msgid "_Hide new messages until tray icon is clicked"
-#~ msgstr "ట్రే ఐకన్‌ క్లిక్ చేసేంతవరకు కొత్త సందేశములను _దాయుము."
-
-#~ msgid "Not connected to AIM"
-#~ msgstr "AIMకు కనెక్ట్ చేయలేదు."
-
-#~ msgid "No roomname given."
-#~ msgstr "గదిపేరు ఇవ్వలేదు."
-
-#~ msgid "Invalid AIM URI"
-#~ msgstr "విలువలేని AIM URI "
-
-#~ msgid ""
-#~ "Failed to assign %s to a socket:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "%s కు సాకెట్‌కు నిర్దిష్టం చేయడంలో అసమర్థత:\n"
-#~ "%s"
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-#~ msgid "Remote Control"
-#~ msgstr "రిమోట్ కంట్రోల్"
-
-#  *< name
-#  *< version
-#  *  summary
-#~ msgid "Provides remote control for gaim applications."
-#~ msgstr "గెయిమ్ అప్లికేషన్ల నిమిత్తం రిమోట్ కంట్రోలును అమర్చును."
-
-#  *  description
-#~ msgid ""
-#~ "Gives Gaim the ability to be remote-controlled through third-party "
-#~ "applications or through the gaim-remote tool."
-#~ msgstr ""
-#~ "మూడవ-పార్టీ అప్లికేషన్ల ద్వారాగానీ లేక గెయిమ్ రిమోట్‌ ఉపకరణం ద్వారాగానీ రిమోట్ ద్వారా కంట్రోల్ చేసే శక్తిని గెయిమ్ "
-#~ "కిస్తుంది."
-
-#  Docked Blist On Top
-#~ msgid "Docked _Buddy List is always on top"
-#~ msgstr "కనిపించు _Buddy List is always on top."
-
-#~ msgid "Away!"
-#~ msgstr "వెళ్లిపోయెను!"
-
-#~ msgid "Edit This Message"
-#~ msgstr "ఈ సందేశాన్ని ఎడిట్ చేయండి. "
-
-#~ msgid "I'm Back!"
-#~ msgstr "నేను వెనుదిరిగి వచ్చాను!"
-
-#~ msgid "Remove Away Message"
-#~ msgstr "బయటకు పోయిన సందేశమును తొలగించుము. "
-
-#~ msgid "Set All Away"
-#~ msgstr "Set All Away"
-
-#~ msgid "You cannot save an away message with a blank title"
-#~ msgstr "శీర్షిక లేకుండా దూరపు సందేశాన్ని మీరు సేవ్ చేయలేరు. "
-
-#~ msgid ""
-#~ "Please give the message a title, or choose \"Use\" to use without saving."
-#~ msgstr "సందేశానికి ఒక శీర్షిక ఇవ్వండి, లేదా సేవ్ చేయకుండా వాడడానికి \"Use\"ను ఎంపిక చేయండి."
-
-#~ msgid "You cannot create an empty away message"
-#~ msgstr "You cannot create an empty away message"
-
-#~ msgid "Away title: "
-#~ msgstr "సుదూరంగా శీర్షిక :"
-
-#~ msgid "Buddy List Error"
-#~ msgstr "మిత్రుల లిస్టులో పొరపాటు. "
-
-#~ msgid "Unable to send message. The message is too large."
-#~ msgstr "సందేశం చాలా పెద్దది. పంపడం కష్టం."
-
-#~ msgid "Size of the expander arrow"
-#~ msgstr "expander బాణం సైజ్ "
-
-#~ msgid ""
-#~ "Usage: %s command [OPTIONS] [URI]\n"
-#~ "\n"
-#~ "    COMMANDS:\n"
-#~ "       uri                      Handle AIM: URI\n"
-#~ "       away                     Popup the away dialog with the default "
-#~ "message\n"
-#~ "       back                     Remove the away dialog\n"
-#~ "       quit                     Close running copy of Gaim\n"
-#~ "\n"
-#~ "    OPTIONS:\n"
-#~ "       -h, --help [command]     Show help for command\n"
-#~ msgstr ""
-#~ "Usage: %s కమాండ్ [ఆప్షన్స్] [URI]\n"
-#~ "\n"
-#~ "    COMMANDS:\n"
-#~ "       uri                      Handle AIM: URI\n"
-#~ "       away                     Popup the away dialog with the default "
-#~ "message\n"
-#~ "       back                     Remove the away dialog\n"
-#~ "       quit                     Close running copy of Gaim\n"
-#~ "\n"
-#~ "    OPTIONS:\n"
-#~ "       -h, --help [command]     Show help for command\n"
-
-#~ msgid ""
-#~ "Gaim not running (on session 0)\n"
-#~ "Is the \"Remote Control\" plugin loaded?\n"
-#~ msgstr ""
-#~ "గెయిమ్ పనిచేయుటలేదు (%d కాలంలో)\n"
-#~ "\"రిమోట్ కంట్రోల్\" లోడ్ చేయబడియున్నదా?\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Using AIM: URIs:\n"
-#~ "Sending an IM to a screen name:\n"
-#~ "\tgaim-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
-#~ "In this case, 'Penguin' is the screen name we wish to IM, and 'hello "
-#~ "world'\n"
-#~ "is the message to be sent.  '+' must be used in place of spaces.\n"
-#~ "Please note the quoting used above - if you run this from a shell the "
-#~ "'&'\n"
-#~ "needs to be escaped, or the command will stop at that point.\n"
-#~ "Also,the following will just open a conversation window to a screen "
-#~ "name,\n"
-#~ "with no message:\n"
-#~ "\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
-#~ "\n"
-#~ "Joining a chat:\n"
-#~ "\tgaim-remote uri 'aim:gochat?roomname=PenguinLounge'\n"
-#~ "...joins the 'PenguinLounge' chat room.\n"
-#~ "\n"
-#~ "Adding a buddy to your buddy list:\n"
-#~ "\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
-#~ "...prompts you to add 'Penguin' to your buddy list.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Using AIM: URIs:\n"
-#~ "స్క్రీన్ పేరు కోసం IM ను పంపుతున్నాను :\n"
-#~ "\tgaim-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
-#~ "In this case, 'Penguin' is the screen name we wish to IM, and 'hello "
-#~ "world'\n"
-#~ "is the message to be sent.  '+' must be used in place of spaces.\n"
-#~ "Please note the quoting used above - if you run this from a shell the "
-#~ "'&'\n"
-#~ "needs to be escaped, or the command will stop at that point.\n"
-#~ "Also,the following will just open a conversation window to a screen "
-#~ "name,\n"
-#~ "with no message:\n"
-#~ "\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
-#~ "\n"
-#~ "Joining a chat:\n"
-#~ "\tgaim-remote uri 'aim:gochat?roomname=PenguinLounge'\n"
-#~ "...joins the 'PenguinLounge' chat room.\n"
-#~ "\n"
-#~ "Adding a buddy to your buddy list:\n"
-#~ "\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
-#~ "...prompts you to add 'Penguin' to your buddy list.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Close running copy of Gaim\n"
-#~ msgstr ""
-#~ "\n"
-#~ "కాపీ చేసిన గెయిమ్‌ను వాడుట కూడదు\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Mark all accounts as \"away\" with the default message.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "అన్ని ఖాతాలకు \"వెళ్లిపోయినవి\" అనే ఉపేక్షాసహిత సందేశము నిమ్ము.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Set all accounts as not away.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "అన్ని ఖాతాలు ఉన్నవనే విషయం ధ్రువపర్చుకోండి.\n"
-
-#~ msgid "Show fewer options"
-#~ msgstr "కొద్దిపాటి ఆప్షన్లను చూపుము. "
-
-#~ msgid "/Tools/_Away"
-#~ msgstr "/ఉపకరణాలు /_దూరంగా "
-
-#  And now for the buttons
-#~ msgid "/Tools/Pl_ugin Actions"
-#~ msgstr "/ఉపకరణాలు /ప్లగ్‌ఇన్ చర్యలు "
-
-#~ msgid "Rename Group"
-#~ msgstr "గ్రూపుకు కొత్త పేరిమ్ము "
-
-#~ msgid "New group name"
-#~ msgstr "గ్రూప్ కొత్తపేరు"
-
-#~ msgid "%d%%"
-#~ msgstr "%d%%"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Account:</b>"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>ఖాతా:</b>"
-
-#~ msgid "Warned (%d%%) "
-#~ msgstr "హెచ్చరించెను (%d%%) "
-
-#~ msgid "/Tools/Away"
-#~ msgstr "/ఉపకరణాలు/దూరంగా "
-
-#~ msgid "Send a message to the selected buddy"
-#~ msgstr "సెలక్ట్ చేసిన మిత్రునికి సందేశాన్ని పంపుము."
-
-#~ msgid "Get information on the selected buddy"
-#~ msgstr "సెలక్ట్ చేసిన మిత్రునికి సమాచారం పంపుము."
-
-#~ msgid "_Chat"
-#~ msgstr "_సంభాషణ"
-
-#~ msgid "Join a chat room"
-#~ msgstr "సంభాషణ గదిలో చేరండి. "
-
-#~ msgid "_Away"
-#~ msgstr "_దూరంగా "
-
-#~ msgid "Set an away message"
-#~ msgstr "దూరపు సందేశాన్ని సెట్ చేయుము. "
-
-#~ msgid "Done."
-#~ msgstr "పూర్తైనది."
-
-#~ msgid "Signon: "
-#~ msgstr "ఖాతాను తెరవండి:"
-
-#~ msgid "Signon"
-#~ msgstr "ఖాతాను తెరవండి"
-
-# #-#-#-#-#  anjuta.ANJUTA_1_2_0.hi.po (anjuta2 VERSION)  #-#-#-#-#
-# #-#-#-#-#  gnome-session.HEAD.hi.po (gnome-session VERSION)  #-#-#-#-#
-# gnome-session/session-properties.c:179
-#  Cancel button.
-#~ msgid "Cancel All"
-#~ msgstr "అన్నింటిని కాన్సెల్ చేయండి "
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-#~ msgid "_Reconnect"
-#~ msgstr "_రీ కనెక్ట్ చేయండి."
-
-# #-#-#-#-#  gnome-applets.gnome-2-2.hi.po (gnome-applets 2.x)  #-#-#-#-#
-# gnome-session/gsm-client-row.c:43
-# #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
-# gnome-session/gsm-client-row.c:43
-#~ msgid "Reason Unknown."
-#~ msgstr "కారణం తెలియదు. "
-
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-#~ msgid "Reconnect _All"
-#~ msgstr "_అన్నింటిని రీకనెక్ట్ చేయుము."
-
-#~ msgid "Get Away Msg"
-#~ msgstr "దూరంగా పోవుటకు సందేశం "
-
-#  Conversations
-#~ msgid "/Conversation/_Warn..."
-#~ msgstr "/సంభాషణ/_హెచ్చరిక ..."
-
-#  Conversations
-#~ msgid "/Conversation/A_lias..."
-#~ msgstr "/సంభాషణ/ఉపనామము ..."
-
-#~ msgid "/Options/Show T_imestamps"
-#~ msgstr "/ఆప్షన్స్/టైం-స్టాంప్స్‌ను చూపించును "
-
-#  Conversations
-#~ msgid "/Conversation/Warn..."
-#~ msgstr "/సంభాషణ/హెచ్చరిక... "
-
-#~ msgid "Warn the user"
-#~ msgstr "వినియోగదారుని హెచ్చరించుము "
-
-#~ msgid "Send a file to the user"
-#~ msgstr "వినియోగదారునికి ఫైలును పంపుము "
-
-#~ msgid "Remove the user from your buddy list"
-#~ msgstr "వినియోగదారుని మీ మిత్రుల లిస్టునుండి తొలగించుము "
-
-#~ msgid "Invite a user"
-#~ msgstr "వినియోగదారుని ఆహ్వానించుము"
-
-#~ msgid "Add the chat to your buddy list"
-#~ msgstr "మీ మిత్రుల లిస్టుకు సంభాషణను చేర్చుము "
-
-#  Conversations
-#~ msgid "<main>/Conversation/Close"
-#~ msgstr "<main>/సంభాషణ/క్లోజ్ "
-
-#~ msgid "former lead developer"
-#~ msgstr "పూర్వ ముఖ్య డెవలపర్ "
-
-#~ msgid "former maintainer"
-#~ msgstr "పూర్వ మెయింటెయినర్"
-
-#~ msgid "Azerbaijani"
-#~ msgstr "అజర్‌బైజానీ "
-
-#~ msgid "Vladimira Girginova and Vladimir (Kaladan) Petkov"
-#~ msgstr "వ్లాదిమిరా గిర్గినోవా మరియు వ్లాదిమిర్ (కలాదాన్) పెత్కోవ్ "
-
-#~ msgid "Burmese"
-#~ msgstr "బర్మీస్ "
-
-#~ msgid "Punjabi"
-#~ msgstr "పంజాబీ "
-
-#~ msgid "Ukrainian"
-#~ msgstr "ఉక్రేనియన్ "
-
-#~ msgid "Chinese"
-#~ msgstr "చైనీస్ "
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
-#~ "\n"
-#~ "This will increase %s's warning level and he or she will be subject to "
-#~ "harsher rate limiting.\n"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">%s హెచ్చరిస్తారా?</span>\n"
-#~ "\n"
-#~ "इस से %s's का चेतावनी के नियम बढ़ जायगा और उसके उपर कठोर माप सीमा लागू होगी।\n"
-
-#~ msgid "Warn _anonymously?"
-#~ msgstr "_అజ్ఞాతవ్యక్తిగా హెచ్చరిస్తారా?"
-
-#~ msgid "<b>Anonymous warnings are less severe.</b>"
-#~ msgstr "<b>అజ్ఞాత హెచ్చరికలవల్ల అంత ఉపయోగం ఉండదు</b>"
-
-#~ msgid "Show transfer details"
-#~ msgstr "ట్రాన్స్‌ఫర్‌ ఫైల్స్‌ను చూపించుము."
-
-#~ msgid "D_isplay remote nicknames if no alias is set"
-#~ msgstr "ఉపనామములను సెట్ చేయకపోతే సుదూరపు ఉపనామములను ప్రదర్శించుము."
-
-#~ msgid "Display"
-#~ msgstr "ప్రదర్శన"
-
-#~ msgid "Show _timestamp on messages"
-#~ msgstr "సందేశములపై టైమ్‌స్టాంప్‌ను ప్రదర్శించుము."
-
-#~ msgid "Ignore font _faces"
-#~ msgstr "ఫాంట్ ఫేసెస్‌ను ఉపేక్షించుము."
-
-#~ msgid "_Send default formatting with outgoing messages"
-#~ msgstr "_బయటకుపోయే సందేశాలను డిఫాల్ట్ ఫార్మాటింగ్‌లో పంపుము. "
-
-#~ msgid "Enter _sends message"
-#~ msgstr "ఎంటర్ _సందేశములను పంపును."
-
-#~ msgid "Window Closing"
-#~ msgstr "విండో క్లోజింగ్ "
-
-#~ msgid "_Escape closes window"
-#~ msgstr "_ఎస్కేప్ విండోను క్లోజ్ చేయును."
-
-#~ msgid "Insertions"
-#~ msgstr "చేర్పులు "
-
-#~ msgid "Control-{B/I/U} changes _formatting"
-#~ msgstr "Control-{B/I/U} _ఫార్మాటింగ్‌లో మార్పులు."
-
-#~ msgid "Control-(number) _inserts smileys"
-#~ msgstr "Control-(number) _smileysను చేర్చుము."
-
-#~ msgid "Show _buttons as:"
-#~ msgstr "_బటన్స్‌ను ఇలా చూపించుము :"
-
-#~ msgid "Text"
-#~ msgstr "టెక్‌స్ట్ "
-
-#~ msgid "Pictures and text"
-#~ msgstr "సచిత్రములు మరియు టెక్‌స్ట్ "
-
-#~ msgid "_Raise window on events"
-#~ msgstr "_సంఘటనలపై విండోను ఎత్తుము. "
-
-#~ msgid "Show _warning levels"
-#~ msgstr "_వార్నింగ్ లెవల్స్‌ను చూపించుము. "
-
-#~ msgid "Enable \"_slash\" commands"
-#~ msgstr "\"శ్లాష్\" కమాండ్స్‌ను ఎనేబుల్ చేయుము."
-
-#~ msgid "_Raise IM window on events"
-#~ msgstr "సంఘటనల ననుసరించి తక్షణ సందేశముల విండోను _ఎత్తుము."
-
-#~ msgid "Raise chat _window on events"
-#~ msgstr "సంఘటనల ననుసరించి సంభాషణల _విండోను ఎత్తుము."
-
-#~ msgid "Use _multi-colored screen names in chats"
-#~ msgstr "సంభాషణల్లో _మల్టీకలర్ ఉపనామములను ఉపయోగించండి."
-
-#~ msgid "Tab p_lacement:"
-#~ msgstr "టాబ్ రీప్లేస్‌మెంట్:"
-
-#  Conversations
-#~ msgid "New conversation _placement:"
-#~ msgstr "కొత్త సంభాషణ _ప్లేస్‌మెంట్:"
-
-#~ msgid "System Logs"
-#~ msgstr "సిస్టం లాగ్స్"
-
-#~ msgid "_Enable system log"
-#~ msgstr "_సిస్టం లాగ్‌ను ఎనేబుల్ చేయుము."
-
-#~ msgid "Log when buddies _sign on/sign off"
-#~ msgstr "మిత్రులు _సైన్ ఆన్/సైన్ ఆఫ్ చేసినప్పుడు లాగ్ చేయండి,"
-
-#~ msgid "Log when buddies become _idle/un-idle"
-#~ msgstr "మిత్రులు _సోమరులైనప్పుడు/కానప్పుడు లాగ్ చేయండి."
-
-#~ msgid "Log when buddies go away/come _back"
-#~ msgstr "మిత్రులు దూరంగా పోయినప్పుడు/వెనుదిరిగి వచ్చినప్పుడు లాగ్ చేయుము."
-
-#~ msgid "Log your _own signons/idleness/awayness"
-#~ msgstr "మీ సైన్-ఆన్/ సోమరితనమును/ దూరంగా-ఉండడాన్ని లాగ్ చేయండి."
-
-#~ msgid "Idle _time reporting:"
-#~ msgstr "సోమరి _సమయం రిపోర్టింగ్:"
-
-#~ msgid "Gaim usage"
-#~ msgstr "గెయిమ్ వాడకం "
-
-#~ msgid "X usage"
-#~ msgstr "X వాడకం "
-
-#~ msgid "Windows usage"
-#~ msgstr "విండోస్ వాడకం"
-
-#~ msgid ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
-#~ "<span weight=\"bold\">Written by:</span>  %s\n"
-#~ "<span weight=\"bold\">URL:</span>  %s\n"
-#~ "<span weight=\"bold\">File name:</span>  %s"
-#~ msgstr ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
-#~ "<span weight=\"bold\">ने लिखा है:</span>  %s\n"
-#~ "<span weight=\"bold\">यू आर एल:</span>  %s\n"
-#~ "<span weight=\"bold\">फा़इल-नाम:</span>  %s"
-
-#~ msgid "Summary"
-#~ msgstr "సారాంశం "
-
-#~ msgid "Details"
-#~ msgstr "వివరములు "
-
-#~ msgid "Message Text"
-#~ msgstr "సందేశం టెక్‌స్ట్ "
-
-#~ msgid "Shortcuts"
-#~ msgstr "షార్ట్‌కట్స్ "
-
-#~ msgid "Away Messages"
-#~ msgstr "దూరపు సందేశాలు "
-
-#~ msgid "Please create an account."
-#~ msgstr "ఒక ఖాతాను సృష్టించండి."
-
-#  And now for the buttons
-#~ msgid "<b>_Account:</b>"
-#~ msgstr "<b>_ఖాతా:</b>"
-
-#  And now for the buttons
-#~ msgid "A_ccounts"
-#~ msgstr "ఖాతాలు "
-
-#~ msgid "P_references"
-#~ msgstr "అభీష్టములు (ప్రెఫరెన్స్‌లు) "
-
-#~ msgid "_Sign on"
-#~ msgstr "_సైన్ ఆన్ "
-
-#~ msgid ""
-#~ "Gaim %s\n"
-#~ "Usage: %s [OPTION]...\n"
-#~ "\n"
-#~ "  -a, --acct          display account editor window\n"
-#~ "  -w, --away[=MESG]   make away on signon (optional argument MESG "
-#~ "specifies\n"
-#~ "                      name of away message to use)\n"
-#~ "  -l, --login[=NAME]  automatically login (optional argument NAME "
-#~ "specifies\n"
-#~ "                      account(s) to use, seperated by commas)\n"
-#~ "  -n, --loginwin      don't automatically login; show login window\n"
-#~ "  -u, --user=NAME     use account NAME\n"
-#~ "  -c, --config=DIR    use DIR for config files\n"
-#~ "  -d, --debug         print debugging messages to stdout\n"
-#~ "  -v, --version       display the current version and exit\n"
-#~ "  -h, --help          display this help and exit\n"
-#~ msgstr ""
-#~ "Gaim %s\n"
-#~ "Usage: %s [OPTION]...\n"
-#~ "\n"
-#~ "  -a, --acct          display account editor window\n"
-#~ "  -w, --away[=MESG]   make away on signon (optional argument MESG "
-#~ "specifies\n"
-#~ "                      name of away message to use)\n"
-#~ "  -l, --login[=NAME]  automatically login (optional argument NAME "
-#~ "specifies\n"
-#~ "                      account(s) to use, seperated by commas)\n"
-#~ "  -n, --loginwin      don't automatically login; show login window\n"
-#~ "  -u, --user=NAME     use account NAME\n"
-#~ "  -c, --config=DIR    use DIR for config files\n"
-#~ "  -d, --debug         print debugging messages to stdout\n"
-#~ "  -v, --version       display the current version and exit\n"
-#~ "  -h, --help          display this help and exit\n"
-
-#~ msgid "Unable to load preferences"
-#~ msgstr "అభీష్టములను లోడ్‌చేయుటకు అశక్తత. "
-
-#~ msgid ""
-#~ "Gaim was not able to load your preferences because they are stored in an "
-#~ "old format that is no longer used.  Please reconfigure your settings "
-#~ "using the Preferences window."
-#~ msgstr ""
-#~ "మీ అభీష్టాలను గెయిమ్ లోడ్ చేయలేకపోతున్నది. ఎందుకంటే అవి పాత ఫార్మాట్‌లో స్టోర్ చేసి చాలాకాలం నుండి వాడకంలో "
-#~ "లేకుండా ఉన్నాయి. దయచేసి ప్రెఫరెన్సెస్ విండోను వాడి మీ సెట్టింగ్స్‌ను సెట్ చేయండి."
-
-#~ msgid "Slightly less boring default"
-#~ msgstr "స్వల్పంగా వినోదరహిత ఉపేక్ష. "
-
-#~ msgid "Available for friends only"
-#~ msgstr "మిత్రులకు మాత్రమే లభించును."
-
-#~ msgid "Away for friends only"
-#~ msgstr "మిత్రులకు దూరంగా మాత్రమే. "
-
-#~ msgid "Invisible for friends only"
-#~ msgstr "మిత్రులకు మాత్రమే అదృశ్యం."
-
-#~ msgid "Error while writing to socket."
-#~ msgstr "సాకెట్‌కు వ్రాయునప్పుడు పొరపాటు."
-
-#~ msgid "Authentication failed."
-#~ msgstr "అప్లికేషన్ వైఫల్యం."
-
-#~ msgid "Unknown Error Code."
-#~ msgstr "అజ్ఞాత పొరపాటు కోడ్."
-
-#~ msgid "Balancer handshake"
-#~ msgstr "బాలెన్సర్ హాండ్‌షేక్ "
-
-#~ msgid "Reading server key"
-#~ msgstr "సెర్వర్‌ కీని చదువుతూ "
-
-#~ msgid "Exchanging key hash"
-#~ msgstr "కీ హాష్‌ను మార్చుతూ "
-
-#~ msgid "Critical error in GG library\n"
-#~ msgstr "GG లైబ్రరీలో సున్నితమైన పొరపాటు\n"
-
-#~ msgid "Unable to ping server"
-#~ msgstr "సెర్వర్‌ను పింగ్‌ చేయుటకు అశక్తత. "
-
-#~ msgid "Send as message"
-#~ msgstr "సందేశంవలె పంపుము. "
-
-#~ msgid "Looking up GG server"
-#~ msgstr "GG సెర్వర్‌ కోసం ప్రతీక్ష. "
-
-#~ msgid "Invalid Gadu-Gadu UIN specified"
-#~ msgstr "విలువలేని Gadu-Gadu UIN ను నిర్దేశించినారు."
-
-#~ msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
-#~ msgstr "మీరు విలువలేని Gadu-Gadu UINకు సందేశం పంపాలని ప్రయత్నిస్తున్నారు."
-
-#~ msgid "Couldn't get search results"
-#~ msgstr "అన్వేషణ ఫలితాలను పొందలేము."
-
-#~ msgid "Sex"
-#~ msgstr "లింగము"
-
-#~ msgid "Couldn't Import Buddy List from Server"
-#~ msgstr "సెర్వర్‌నుండి మిత్రుల లిస్టును ఇంపోర్ట్ చేసుకోలేదు."
-
-#~ msgid "Buddy List successfully transferred to Gadu-Gadu server"
-#~ msgstr "Gadu-Gadu సెర్వర్‌కు మిత్రుల లిస్ట్ విజయవంతంగా ట్రాన్స్‌ఫర్ చేయబడింది."
-
-#~ msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
-#~ msgstr "Gadu-Gadu సెర్వర్‌కు మిత్రుల లిస్టును ట్రాన్స్‌ఫర్ చేయలేకపోయింది."
-
-#~ msgid "Buddy List successfully deleted from Gadu-Gadu server"
-#~ msgstr "Gadu-Gadu సెర్వర్‌నుండి మిత్రుల లిస్ట్ విజయవంతంగా తొలగించబడింది."
-
-#~ msgid "Couldn't delete Buddy List from Gadu-Gadu server"
-#~ msgstr "Gadu-Gadu సెర్వర్‌నుండి మిత్రుల లిస్టును తొలగించలేము."
-
-#~ msgid "Password couldn't be changed"
-#~ msgstr "పాస్‌వర్డ్ మార్చుటకు సాధ్యం కాదు."
-
-#~ msgid "Error communicating with Gadu-Gadu server"
-#~ msgstr "Gadu-Gadu సెర్వర్‌ను సంప్రదించడంలో పొరపాటు. "
-
-#~ msgid ""
-#~ "Gaim was unable to complete your request due to a problem communicating "
-#~ "with the Gadu-Gadu HTTP server.  Please try again later."
-#~ msgstr ""
-#~ "Gadu-Gadu HTTP సెర్వర్‌తో జరిపే సంప్రదింపుల్లో సమస్య ఏర్పడ్డంవల్ల  గెయిమ్ మీ కోరికను నెరవేర్చలేదు. "
-#~ "తర్వాత మరోసారి ప్రయత్నించండి. "
-
-#~ msgid "Unable to import Gadu-Gadu buddy list"
-#~ msgstr "Gadu-Gadu మిత్రుల లిస్టును ఇంపోర్ట్ చేసుకోలేని అశక్తత."
-
-#~ msgid ""
-#~ "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please "
-#~ "try again later."
-#~ msgstr "గెయిమ్ Gadu-Gadu మిత్రుల లిస్ట్ సెర్వర్‌తో కనెక్ట్ చేసుకోలేకపోతోంది. తర్వాత మరల ప్రయత్నించండి."
-
-#~ msgid ""
-#~ "Gaim was unable to connect to the buddy list server.  Please try again "
-#~ "later."
-#~ msgstr "మిత్రుల లిస్ట్ సెర్వర్‌కు గెయిమ్ కనెక్ట్ అగుటలేదు. తర్వాత మరోసారి ప్రయత్నించండి."
-
-#~ msgid "Unable to delete Gadu-Gadu buddy list"
-#~ msgstr "Gadu-Gadu మిత్రుల లిస్టును తొలగించడంలో వైఫల్యం."
-
-#~ msgid "Unable to access directory"
-#~ msgstr "డైరెక్టరీని యాక్సెస్ చేయడంలో వైఫల్యం. "
-
-#~ msgid ""
-#~ "Gaim was unable to search the Directory because it was unable to connect "
-#~ "to the directory server.  Please try again later."
-#~ msgstr ""
-#~ "డైరెక్టరీ సెర్వర్‌తో  గెయిమ్‌ కనెక్ట్ చేయలేకపోయింది.  అందుచేత డైరెక్టరీని  అన్వేషించలేకపోతోంది. దయచేసి తర్వాత "
-#~ "మరల ప్రయత్నించండి."
-
-#~ msgid ""
-#~ "Gaim was unable to change your password due to an error connecting to the "
-#~ "Gadu-Gadu server.  Please try again later."
-#~ msgstr ""
-#~ "Gadu-Gadu సెర్వర్‌ కనెక్షన్‌తో సంభవించిన పొరపాటువల్ల గెయిమ్ మీ పాస్‌వర్డ్‌ను మార్చలేకపోతోంది. దయచేసి తర్వాత "
-#~ "మరల ప్రయత్నించండి."
-
-#~ msgid "Directory Search"
-#~ msgstr "డైరెక్టరీ అన్వేషణ "
-
-#~ msgid "Unable to access user profile."
-#~ msgstr "వినియోగదారుని ఫైలును యాక్సెస్ చేయడంలో అశక్తత."
-
-#~ msgid ""
-#~ "Gaim was unable to access this user's profile due to an error connecting "
-#~ "to the directory server.  Please try again later."
-#~ msgstr ""
-#~ "డైరెక్టరీ సెర్వర్‌తో కనెక్షన్‌లో పొరపాటు సంభవించినందువల్ల ఈ వినియోగదారుని ప్రొఫైల్‌ను గెయిమ్ యాక్సెస్ "
-#~ "చేయలేకపోతున్నది. తర్వాత మరల ప్రయత్నించండి.  "
-
-#~ msgid "Gaim encountered an error communicating with the ICQ server."
-#~ msgstr "ICQ సెర్వర్‌తో కమ్యూనికేషన్ నిర్వహించడంలో గెయిమ్‌కు పొరపాటు ఎదురైంది."
-
-#~ msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
-#~ msgstr "మీరు (%s%s%s%s%s)ను అనుమతించమని  వినియోగదారుడు %s కోరుతున్నాడు."
-
-#~ msgid "Send message through server"
-#~ msgstr "సెర్వర్‌ద్వారా సందేశం పంపండి."
-
-#~ msgid "Nick:"
-#~ msgstr "ఉపనామం :"
-
-#~ msgid "Gaim User"
-#~ msgstr "గెయిమ్ వినియోగదారుడు "
-
-#~ msgid "File Transfer Aborted"
-#~ msgstr "ఫైల్ ట్రాన్స్‌ఫర్ రద్దయినది."
-
-#~ msgid "Buddy Information for %s"
-#~ msgstr "%s కోసం మిత్రుల సమాచారం. "
-
-#~ msgid "Invalid nickname '%s'"
-#~ msgstr "విలువలేని ఉపనామం '%s'"
-
-#~ msgid "Jabber Profile"
-#~ msgstr "జాబర్ ఫైల్"
-
-#~ msgid "Roomlist Error"
-#~ msgstr "రూమ్ లిస్టులో పొరపాటు."
-
-#~ msgid "The user %s wants to add you to their buddy list."
-#~ msgstr "వినియోగాదారుడు %s మిమ్మల్ని తన మిత్రుల లిస్టులో కలపాలని కోరుతున్నాడు."
-
-#~ msgid "Display conversation closed notices"
-#~ msgstr "సంభాషణ ముగింపు నోటీసుల ప్రదర్శన "
-
-#~ msgid "The conversation has become inactive and timed out."
-#~ msgstr "సమయం మించిపోయింది, సంభాషణ ఆగిపోయింది. "
-
-#~ msgid ""
-#~ "You were disconnected from the server, because you logged on from a "
-#~ "different location"
-#~ msgstr "మీరు వేరే ప్రదేశంనుండి లాగ్ చేసినందువల్ల సెర్వర్‌నుండి డిస్‌కనెక్ట్ చేయబడినారు."
-
-#~ msgid "User Properties"
-#~ msgstr "వినియోగదారుని ప్రాపర్టీలు "
-
-#~ msgid "Transfer of file %s timed out."
-#~ msgstr "%s ట్రాన్స్‌ఫర్ చేయుటకు సమయం మించిపోయినది. "
-
-#~ msgid ""
-#~ "You have been disconnected because you have signed on with this screen "
-#~ "name at another location."
-#~ msgstr "మీరు డిస్‌కనెక్ట్ అయినారు. ఎందుకంటే ఈ స్క్రీన్ పేరుతోనే మీరు మరో చోట సైన్ ఆన్ చేసినారు."
-
-#~ msgid "Not specified"
-#~ msgstr "నిర్దేశించలేదు "
-
-#~ msgid "ICQ Info for %s"
-#~ msgstr "%s కోసం ICQ సమాచారం "
-
-#~ msgid ""
-#~ "Error 0x%04x: Unable to format screen name because the requested screen "
-#~ "name ends in a space."
-#~ msgstr ""
-#~ "పొరపాటు 0x%04x: స్క్రీన్‌పేరును ఫార్మాట్ చేయడం సాధ్యం కాదు, ఎందుకంటే స్క్రీన్‌పేరు స్పేస్‌తో "
-#~ "అంతమవుతున్నది."
-
-#~ msgid "I'm doing work and hoping for a distraction--IM me!"
-#~ msgstr "నా పని చేస్తున్నాను కాని ధ్యాస మరో విషయంపై మరలిపోవచ్చు - -IM me!"
-
-#~ msgid "Set Available Message..."
-#~ msgstr "లభించే సందేశాన్ని సెట్ చేయండి ..."
-
-#~ msgid "Failed to leave channel"
-#~ msgstr "చానల్‌ను వదిలివేయడంలో వైఫల్యం. "
-
-#~ msgid "Basic Profile"
-#~ msgstr "బేసిక్ ప్రొఫైల్ "
-
-#~ msgid "AIM"
-#~ msgstr "AIM"
-
-#~ msgid "ICQ UIN"
-#~ msgstr "ICQ UIN"
-
-#~ msgid "MSN"
-#~ msgstr "MSN"
-
-#~ msgid "Yahoo"
-#~ msgstr "Yahoo"
-
-#~ msgid "I'm From"
-#~ msgstr "నేను ఇక్కడి నుండి "
-
-#~ msgid "Set your Trepia profile data."
-#~ msgstr "మీ ట్రెపియా ప్రొఫైల్ డాటాను సెట్ చేయండి. "
-
-#~ msgid "Visit Homepage"
-#~ msgstr "హోమ్ పేజీని విజిట్ చేయండి. "
-
-#~ msgid "Local Users"
-#~ msgstr "స్థానిక వినియోగదారులు "
-
-#~ msgid "Trepia Protocol Plugin"
-#~ msgstr "Trepia Protocol Plugin"
-
-#~ msgid ""
-#~ "You have been logged off as you have logged in on a different machine or "
-#~ "device."
-#~ msgstr "మీరు లాగ్‌ ఆఫ్ చేయబడినారు ఎందుకంటే మీరు మరో మిషన్‌లో లేదా సాధనంతో లాగ్ చేసినారు. "
-
-#~ msgid "Please enter your password"
-#~ msgstr "మీ పాస్‌వర్డ్‌ను ఎంటర్ చేయండి. "
-
-#~ msgid "%s logged in."
-#~ msgstr "%s లాగిన్ చేసినారు."
-
-#~ msgid "%s logged out."
-#~ msgstr "%s లాగ్ ఔట్ చేసినారు."
-
-#~ msgid ""
-#~ "%s has just been warned by %s.\n"
-#~ "Your new warning level is %d%%"
-#~ msgstr ""
-#~ "%s has just been warned by %s.\n"
-#~ "Your new warning level is %d%%"
-
-#~ msgid "an anonymous person"
-#~ msgstr "ఆకాశరామన్న"
-
-#~ msgid ""
-#~ "%s has invited %s to the chat room %s:\n"
-#~ "<b>%s</b>"
-#~ msgstr ""
-#~ "%s has invited %s to the chat room %s:\n"
-#~ "<b>%s</b>"
-
-#~ msgid "Sorry, I ran out for a bit!"
-#~ msgstr "క్షమించాలి, కొంచెంసేపు నేను బయటకు వెళ్లాను."
-
-#~ msgid ""
-#~ "Unable to guess the image type based on the file extension supplied.  "
-#~ "Defaulting to PNG."
-#~ msgstr ""
-#~ "फ़ायल की ऐक्सटेन्शन का अन्दाजा नहीं लगा पाया। डिफाल्ट ऐक्सटेन्शन PNG का प्रयोग कर "
-#~ "रहा है।"
-
-#~ msgid ""
-#~ "%d buddy from group %s was not removed because its account was not logged "
-#~ "in.  This buddy and the group were not removed.\n"
-#~ "%d buddies from group %s were not removed because their accounts were not "
-#~ "logged in.  These buddies and the group were not removed.\n"
-#~ msgstr ""
-#~ "%d बड्डी %s समूह से नहीं निकाला गया क्योंकि उस बड्डी ने लॉग इन नहीं किया था। वह "
-#~ "बड्डी और समूह नहीं हटाया गया ।\n"
-#~ "%d बड्डी %s समूह से नहीं निकाले गये क्योंकि उन बड्डीयों ने लॉग इन नहीं किया था। वह "
-#~ "बड्डी और समूह नहीं हटाये गये ।\n"
-
-#~ msgid ""
-#~ "Insufficient arguments (-t, -f, -p, & -m are all required) or arguments "
-#~ "greater than 9999 chars\n"
-#~ msgstr ""
-#~ "अपर्याप्त प्रमाण (-t, -f, -p, & -m सभी ज़रुरी हैं) या फिर प्रमाण चिह्न से 9999 अधिक "
-#~ "हैं\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Send instant message\n"
-#~ msgstr ""
-#~ "\n"
-#~ "इंस्टेंट संदेश भेजें\n"
-
-#~ msgid "Auto log in"
-#~ msgstr "स्वतः लॉगइन"
-
-#~ msgid "Auto Log In"
-#~ msgstr "स्वतः लॉगइन"
-
-#~ msgid "/Buddies/_Log Out"
-#~ msgstr "/बड्डी/लॉग आउट(_L)"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Idle</b>"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>बेकार</b>"
+msgstr "ఈ ప్లగ్ ఇన్ XMPP సర్వర్ ను లేదా క్లైంట్స్ ను డీబగ్గింగ్ చేయాడానికి ఉపయోగపడుతుంది."
+
--- a/po/zh_HK.po	Sat Nov 17 18:26:03 2007 +0000
+++ b/po/zh_HK.po	Sat Nov 17 19:41:05 2007 +0000
@@ -1,62 +1,63 @@
 # Pidgin's Chinese (Hong Kong) translation
 # Copyright (C) 2002-2007, Paladin R. Liu <paladin@ms1.hinet.net>
 # Copyright (C) 2003-2007, Ambrose C. Li <acli@ada.dhs.org>
-# Copyright (C) 2007, Abel Cheung <abelcheung@gmail.com>
 #
 # This file is distributed under the same license as the "Pidgin" package.
+# $InternalId: zh_TW.po,v 1.518 2007/11/14 05:19:25 acli Exp $
 #
 # ----------------------------------------------------------
 # For internal use only:
-# FIXME 表示發現了問題,遲早要解決
-# NOTE  表示翻譯有困難,解決了,但不寫下會不明白為什麼這樣譯
-# TODO  表示發現了問題,但不知如何解決
-# XXX   表示可能有問題,要複查;有問題需討論
-# ANS   表示對 XXX 的看法回覆 (問題解決後 XXX 與 ANS 一概刪除)
+# FIXME 表示發現了問題,遲早要解決
+# NOTE  表示翻譯有困難,解決了,但不寫下會不明白為什麼這樣譯
+# TODO  表示發現了問題,但不知如何解決
+# XXX   表示可能有問題,要複查;有問題需討論
+# ANS   表示對 XXX 的看法回覆 (問題解決後 XXX 與 ANS 一概刪除)
 # ----------------------------------------------------------
-# 注意: screen name = user name = 帳號 = 使用者名稱
-#        screen name 和 user name 在意義上是沒有分別的!
-# 理據如下
-# (01時52分58秒) wing: hmm. does "screen name" mean "user name" now, or has it actually always meant "user name"?
-# (02時09分45秒) KingAnt: wing: They're the same thing.  If you're unhappy with the change please email the gaim-devel mailing list.  (I'm unhappy with the change.)
+# 注意: screen name = user name = 帳號 = 使用者名稱
+#        screen name 和 user name 在意義上是沒有分別的!
+# 理據如下
+# (01時52分58秒) wing: hmm. does "screen name" mean "user name" now, or has it actually always meant "user name"?
+# (02時09分45秒) KingAnt: wing: They're the same thing.  If you're unhappy with the change please email the gaim-devel mailing list.  (I'm unhappy with the change.)
 # ----------------------------------------------------------
-# SILC問題:似乎臺灣和香港的「密碼學」術語相差甚遠,很頭痛 (^^;)
-# - Key 暫譯「密鑰」,原因:「Key Exchange」既有譯文為「交換密鑰」
-# - Public Key 暫譯「公鑰」
-# - Private Key 暫譯「私鑰」
-# - Key Agreement 與 Key Exchange 似乎同義,譯「交換密鑰」
-# - Passphrase 譯「密碼」
-# (是否應參照 Mozilla 的譯法 <http://ccca.nctu.edu.tw/~hlb/tavi/MozillaGlossary>?)
-# 另有 SILC 術語:
-# - Private Group 係聊天室內的一種小圈子,譯無可譯之下,暫譯「小圈子」 (XXX)
-# - KE Group 即 Key Exchange Group, 暫譯「密鑰交換群組」,有可能是誤譯 (TODO)
-# - Kill 意為 Remove client from network, 暫直譯「從網路上移除」 (XXX)
-# - Detach 意即跟伺服器停止連線,但不登出,暫譯「暫停連線」
-#   - Detach 的相反詞 Resume 暫譯「恢復連線」
-# - Watch 暫時意譯「伺服器端的好友狀態捕捉」
-# - SILC 的全名暫時意譯「安全性網際網路即時會議協定」
+# SILC問題:似乎臺灣和香港的「密碼學」術語相差甚遠,很頭痛 (^^;)
+# - Key 暫譯「密鑰」,原因:「Key Exchange」既有譯文為「交換密鑰」
+# - Public Key 暫譯「公鑰」
+# - Private Key 暫譯「私鑰」
+# - Key Agreement 與 Key Exchange 似乎同義,譯「交換密鑰」
+# - Passphrase 譯「密碼」
+# (是否應參照 Mozilla 的譯法 <http://ccca.nctu.edu.tw/~hlb/tavi/MozillaGlossary>?)
+# 另有 SILC 術語:
+# - Private Group 係聊天室內的一種小圈子,譯無可譯之下,暫譯「小圈子」 (XXX)
+# - KE Group 即 Key Exchange Group, 暫譯「密鑰交換群組」,有可能是誤譯 (TODO)
+# - Kill 意為 Remove client from network, 暫直譯「從網路上移除」 (XXX)
+# - Detach 意即跟伺服器停止連線,但不登出,暫譯「暫停連線」
+#   - Detach 的相反詞 Resume 暫譯「恢復連線」
+# - Watch 暫時意譯「伺服器端的好友狀態捕捉」
+# - SILC 的全名暫時意譯「安全性網際網路即時會議協定」
 #
-# FIXME 未有統一譯法的字詞:Buddy List, Postal code、Profile、match、connect、user info
-# FIXME「such」應為「斯」,即「這個」,但目前譯文沒有統一
-# NOTE  中文統一用「」引號;URL、指令等該用 '/" 者除外
-# NOTE  以前分「Deny」(拒絕) 和「Block」(封鎖),現在不分了
-# NOTE  拒絕可以說等同於封鎖和某一個使用者的聯繫,有時用封鎖比較好。
-# NOTE  MSN6.0中文版對「Block」一詞的譯文為「封鎖」
-# XXX   Stream 暫譯「串流」,應該不是「通道」
-# NOTE  nplurals 重設為 2,因為部分原文要分辨例如「它」及「它們」一類的字眼
-# NOTE 所有語文名稱(除「世界語」外)一概譯成「XX文」,不譯「XX語」,因為寫下的是文,不是語
+# FIXME 未有統一譯法的字詞:Buddy List, Postal code、Profile、match、connect、user info
+# FIXME「such」應為「斯」,即「這個」,但目前譯文沒有統一
+# NOTE  中文統一用「」引號;URL、指令等該用 '/" 者除外
+# NOTE  以前分「Deny」(拒絕) 和「Block」(封鎖),現在不分了
+# NOTE  拒絕可以說等同於封鎖和某一個使用者的聯繫,有時用封鎖比較好。
+# NOTE  MSN6.0中文版對「Block」一詞的譯文為「封鎖」
+# XXX   Stream 暫譯「串流」,應該不是「通道」
+# NOTE  nplurals 重設為 2,因為部分原文要分辨例如「它」及「它們」一類的字眼
+# NOTE 所有語文名稱(除「世界語」外)一概譯成「XX文」,不譯「XX語」,因為寫下的是文,不是語
 # ----------------------------------------------------------
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Pidgin 2.0.1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-28 15:32-0500\n"
-"PO-Revision-Date: 2007-05-24 06:43+0800\n"
-"Last-Translator: Ambrose Li <acli@ada.dhs.org>\n"
+"Project-Id-Version: Pidgin 2.3.0\n"
+"POT-Creation-Date: 2007-11-12 03:23-0500\n"
+"PO-Revision-Date: 2007-11-15 22:22+0800\n"
+"Last-Translator: Ambrose C. Li <acli@ada.dhs.org>, Paladin R. Liu "
+"<paladin@ms1.hinet.net>\n"
 "Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #  NOTE Untranslated
@@ -91,34 +92,32 @@
 "  -n, --nologin       不自動登入\n"
 "  -v, --version       顯示版本訊息並離開\n"
 
-#  NOTE 第二、三個 %s 係目錄名稱(不是程式名)
-#: ../finch/finch.c:328 ../pidgin/gtkmain.c:711
+#  NOTE 第二、三個 %s 係目錄名稱(不是程式名)
+#: ../finch/finch.c:328 ../pidgin/gtkmain.c:730
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
 "investigate and complete the migration by hand. Please report this error at "
 "http://developer.pidgin.im"
-msgstr ""
-"%s 將設定由目錄 %s 轉移至目錄 %s 途中發生錯誤,請調查後改以人手完成轉移程序,"
-"並透過 http://developer.pidgin.im 匯報這個錯誤。"
+msgstr "%s 將設定由目錄 %s 轉移至目錄 %s 途中發生錯誤,請調查後改以人手完成轉移程序,並透過 http://developer.pidgin.im 匯報這個錯誤。"
 
 #: ../finch/gntaccount.c:124 ../finch/gntaccount.c:484 ../finch/gntblist.c:300
-#: ../finch/gntblist.c:433 ../finch/gntblist.c:446 ../finch/gntplugin.c:186
-#: ../finch/gntplugin.c:234 ../finch/gntstatus.c:301 ../finch/gntstatus.c:310
+#: ../finch/gntblist.c:433 ../finch/gntblist.c:446 ../finch/gntplugin.c:189
+#: ../finch/gntplugin.c:237 ../finch/gntstatus.c:301 ../finch/gntstatus.c:310
 #: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
 #: ../finch/plugins/gntclipboard.c:128
-#: ../libpurple/protocols/jabber/buddy.c:2029
+#: ../libpurple/protocols/jabber/buddy.c:2032
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1515
+#: ../libpurple/protocols/jabber/jabber.c:1553
 #: ../libpurple/protocols/qq/group_join.c:328
 #: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:57
-#: ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/silc/ops.c:1460
 #: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "錯誤"
 
-# FIXME 譯文有待改進 - 20061028
+# FIXME 譯文有待改進 - 20061028
 #: ../finch/gntaccount.c:124
 msgid "Account was not added"
 msgstr "帳號未被新增"
@@ -137,14 +136,14 @@
 
 #: ../finch/gntaccount.c:485
 msgid "There's no protocol plugins installed."
-msgstr ""
+msgstr "未有安裝任何協定模組。"
 
 #: ../finch/gntaccount.c:486
 msgid "(You probably forgot to 'make install'.)"
-msgstr ""
-
-#: ../finch/gntaccount.c:496 ../finch/gntconn.c:136
-#: ../pidgin/gtkaccount.c:1473 ../pidgin/gtkblist.c:4040
+msgstr "(大概是忘記了執行「make install」了。)"
+
+#: ../finch/gntaccount.c:496 ../finch/gntconn.c:137
+#: ../pidgin/gtkaccount.c:1478 ../pidgin/gtkblist.c:4492
 msgid "Modify Account"
 msgstr "修改帳號"
 
@@ -175,32 +174,36 @@
 #: ../finch/gntaccount.c:575 ../finch/gntaccount.c:638
 #: ../finch/gntaccount.c:889 ../finch/gntblist.c:344 ../finch/gntblist.c:421
 #: ../finch/gntblist.c:456 ../finch/gntblist.c:803 ../finch/gntblist.c:1005
-#: ../finch/gntblist.c:1101 ../finch/gntblist.c:2222 ../finch/gntcertmgr.c:91
-#: ../finch/gntplugin.c:379 ../finch/gntpounce.c:459 ../finch/gntpounce.c:667
-#: ../finch/gntprefs.c:265 ../finch/gntsound.c:1058 ../finch/gntstatus.c:145
-#: ../finch/gntstatus.c:485 ../finch/gntstatus.c:610
-#: ../libpurple/account.c:1013 ../libpurple/account.c:1263
-#: ../libpurple/account.c:1298 ../libpurple/conversation.c:1215
-#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:507
-#: ../libpurple/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803
-#: ../libpurple/protocols/gg/gg.c:884
+#: ../finch/gntblist.c:1101 ../finch/gntblist.c:2224 ../finch/gntblist.c:2287
+#: ../finch/gntcertmgr.c:91 ../finch/gntplugin.c:475 ../finch/gntpounce.c:472
+#: ../finch/gntpounce.c:680 ../finch/gntprefs.c:265 ../finch/gntsound.c:1058
+#: ../finch/gntstatus.c:145 ../finch/gntstatus.c:485 ../finch/gntstatus.c:610
+#: ../libpurple/account.c:1105 ../libpurple/account.c:1394
+#: ../libpurple/account.c:1429 ../libpurple/conversation.c:1215
+#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:508
+#: ../libpurple/protocols/gg/gg.c:667 ../libpurple/protocols/gg/gg.c:804
+#: ../libpurple/protocols/gg/gg.c:886
 #: ../libpurple/protocols/jabber/buddy.c:728
-#: ../libpurple/protocols/jabber/buddy.c:2413
-#: ../libpurple/protocols/jabber/buddy.c:2449
+#: ../libpurple/protocols/jabber/buddy.c:2426
+#: ../libpurple/protocols/jabber/buddy.c:2462
 #: ../libpurple/protocols/jabber/chat.c:786
-#: ../libpurple/protocols/jabber/jabber.c:1008
-#: ../libpurple/protocols/jabber/jabber.c:1017
-#: ../libpurple/protocols/jabber/jabber.c:1737
+#: ../libpurple/protocols/jabber/jabber.c:1035
+#: ../libpurple/protocols/jabber/jabber.c:1044
+#: ../libpurple/protocols/jabber/jabber.c:1746
 #: ../libpurple/protocols/jabber/si.c:874
-#: ../libpurple/protocols/jabber/usermood.c:184
+#: ../libpurple/protocols/jabber/usermood.c:202
 #: ../libpurple/protocols/jabber/usernick.c:78
 #: ../libpurple/protocols/jabber/xdata.c:400
-#: ../libpurple/protocols/msn/msn.c:287 ../libpurple/protocols/msn/msn.c:304
-#: ../libpurple/protocols/msn/msn.c:321 ../libpurple/protocols/msn/msn.c:338
-#: ../libpurple/protocols/msn/msn.c:359
-#: ../libpurple/protocols/oscar/oscar.c:6094
-#: ../libpurple/protocols/oscar/peer.c:1046
-#: ../libpurple/protocols/qq/buddy_info.c:484
+#: ../libpurple/protocols/msn/msn.c:291 ../libpurple/protocols/msn/msn.c:308
+#: ../libpurple/protocols/msn/msn.c:325 ../libpurple/protocols/msn/msn.c:342
+#: ../libpurple/protocols/msn/msn.c:363 ../libpurple/protocols/msnp9/msn.c:287
+#: ../libpurple/protocols/msnp9/msn.c:304
+#: ../libpurple/protocols/msnp9/msn.c:321
+#: ../libpurple/protocols/msnp9/msn.c:338
+#: ../libpurple/protocols/msnp9/msn.c:359
+#: ../libpurple/protocols/oscar/oscar.c:6144
+#: ../libpurple/protocols/oscar/peer.c:1048
+#: ../libpurple/protocols/qq/buddy_info.c:525
 #: ../libpurple/protocols/qq/buddy_opt.c:214
 #: ../libpurple/protocols/qq/buddy_opt.c:411
 #: ../libpurple/protocols/qq/group.c:124
@@ -211,60 +214,60 @@
 #: ../libpurple/protocols/qq/sys_msg.c:113
 #: ../libpurple/protocols/qq/sys_msg.c:172
 #: ../libpurple/protocols/qq/sys_msg.c:266
-#: ../libpurple/protocols/sametime/sametime.c:3388
-#: ../libpurple/protocols/sametime/sametime.c:3474
-#: ../libpurple/protocols/sametime/sametime.c:3645
-#: ../libpurple/protocols/sametime/sametime.c:5397
-#: ../libpurple/protocols/sametime/sametime.c:5487
-#: ../libpurple/protocols/sametime/sametime.c:5612
+#: ../libpurple/protocols/sametime/sametime.c:3430
+#: ../libpurple/protocols/sametime/sametime.c:3516
+#: ../libpurple/protocols/sametime/sametime.c:3690
+#: ../libpurple/protocols/sametime/sametime.c:5443
+#: ../libpurple/protocols/sametime/sametime.c:5533
+#: ../libpurple/protocols/sametime/sametime.c:5658
 #: ../libpurple/protocols/silc/buddy.c:455
-#: ../libpurple/protocols/silc/buddy.c:1076
-#: ../libpurple/protocols/silc/buddy.c:1191
-#: ../libpurple/protocols/silc/chat.c:616
-#: ../libpurple/protocols/silc/chat.c:746
-#: ../libpurple/protocols/silc/ops.c:1816
-#: ../libpurple/protocols/silc/silc.c:823
-#: ../libpurple/protocols/silc/silc.c:1031
+#: ../libpurple/protocols/silc/buddy.c:1079
+#: ../libpurple/protocols/silc/buddy.c:1194
+#: ../libpurple/protocols/silc/chat.c:620
+#: ../libpurple/protocols/silc/chat.c:750
+#: ../libpurple/protocols/silc/ops.c:1820
+#: ../libpurple/protocols/silc/silc.c:966
+#: ../libpurple/protocols/silc/silc.c:1174
 #: ../libpurple/protocols/silc10/buddy.c:468
-#: ../libpurple/protocols/silc10/buddy.c:1084
-#: ../libpurple/protocols/silc10/buddy.c:1189
+#: ../libpurple/protocols/silc10/buddy.c:1087
+#: ../libpurple/protocols/silc10/buddy.c:1192
 #: ../libpurple/protocols/silc10/chat.c:600
 #: ../libpurple/protocols/silc10/chat.c:730
 #: ../libpurple/protocols/silc10/ops.c:1904
 #: ../libpurple/protocols/silc10/silc.c:736
-#: ../libpurple/protocols/silc10/silc.c:942
-#: ../libpurple/protocols/yahoo/yahoo.c:1032
-#: ../libpurple/protocols/yahoo/yahoo.c:3498
-#: ../libpurple/protocols/yahoo/yahoo.c:3509 ../pidgin/gtkaccount.c:1908
-#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:5967
-#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:773
-#: ../pidgin/gtkdialogs.c:912 ../pidgin/gtkdialogs.c:1004
-#: ../pidgin/gtkdialogs.c:1024 ../pidgin/gtkdialogs.c:1048
-#: ../pidgin/gtkdialogs.c:1070 ../pidgin/gtkdialogs.c:1118
-#: ../pidgin/gtkdialogs.c:1159 ../pidgin/gtkdialogs.c:1215
-#: ../pidgin/gtkdialogs.c:1254 ../pidgin/gtkdialogs.c:1281
-#: ../pidgin/gtkimhtmltoolbar.c:435 ../pidgin/gtklog.c:328
-#: ../pidgin/gtkplugin.c:289 ../pidgin/gtkpounce.c:1101
-#: ../pidgin/gtkprivacy.c:563 ../pidgin/gtkprivacy.c:579
-#: ../pidgin/gtkprivacy.c:604 ../pidgin/gtkprivacy.c:618
-#: ../pidgin/gtkrequest.c:271 ../pidgin/gtksavedstatuses.c:345
-#: ../pidgin/gtkstatusbox.c:1574
+#: ../libpurple/protocols/silc10/silc.c:943
+#: ../libpurple/protocols/yahoo/yahoo.c:1034
+#: ../libpurple/protocols/yahoo/yahoo.c:3509
+#: ../libpurple/protocols/yahoo/yahoo.c:3520 ../pidgin/gtkaccount.c:1913
+#: ../pidgin/gtkaccount.c:2501 ../pidgin/gtkblist.c:6639
+#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:787
+#: ../pidgin/gtkdialogs.c:926 ../pidgin/gtkdialogs.c:1018
+#: ../pidgin/gtkdialogs.c:1038 ../pidgin/gtkdialogs.c:1062
+#: ../pidgin/gtkdialogs.c:1084 ../pidgin/gtkdialogs.c:1132
+#: ../pidgin/gtkdialogs.c:1173 ../pidgin/gtkdialogs.c:1229
+#: ../pidgin/gtkdialogs.c:1268 ../pidgin/gtkdialogs.c:1295
+#: ../pidgin/gtkimhtmltoolbar.c:437 ../pidgin/gtklog.c:328
+#: ../pidgin/gtkplugin.c:289 ../pidgin/gtkpounce.c:1121
+#: ../pidgin/gtkprivacy.c:565 ../pidgin/gtkprivacy.c:581
+#: ../pidgin/gtkprivacy.c:606 ../pidgin/gtkprivacy.c:620
+#: ../pidgin/gtkrequest.c:321 ../pidgin/gtksavedstatuses.c:345
+#: ../pidgin/gtkstatusbox.c:1593
 msgid "Cancel"
 msgstr "取消"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:311
-#: ../finch/gntplugin.c:379 ../finch/gntpounce.c:465 ../finch/gntprefs.c:265
+#: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:311 ../finch/gntdebug.c:297
+#: ../finch/gntplugin.c:475 ../finch/gntpounce.c:478 ../finch/gntprefs.c:265
 #: ../finch/gntsound.c:1055 ../finch/gntstatus.c:488 ../finch/gntstatus.c:598
-#: ../libpurple/account.c:1297 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:727 ../pidgin/gtkdebug.c:749
-#: ../pidgin/gtkrequest.c:277
+#: ../libpurple/account.c:1428 ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:727 ../pidgin/gtkdebug.c:754
+#: ../pidgin/gtkrequest.c:327
 msgid "Save"
 msgstr "儲存"
 
-#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1900
-#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1568
+#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1905
+#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1587
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "你確定要刪除 %s?"
@@ -275,16 +278,16 @@
 
 #. Delete button
 #: ../finch/gntaccount.c:637 ../finch/gntaccount.c:707
-#: ../finch/gntcertmgr.c:319 ../finch/gntpounce.c:666 ../finch/gntpounce.c:729
+#: ../finch/gntcertmgr.c:319 ../finch/gntpounce.c:679 ../finch/gntpounce.c:742
 #: ../finch/gntstatus.c:144 ../finch/gntstatus.c:210
-#: ../pidgin/gtkaccount.c:1907 ../pidgin/gtklog.c:327
-#: ../pidgin/gtkpounce.c:1100 ../pidgin/gtkrequest.c:274
-#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1573
+#: ../pidgin/gtkaccount.c:1912 ../pidgin/gtklog.c:327
+#: ../pidgin/gtkpounce.c:1120 ../pidgin/gtkrequest.c:324
+#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1592
 msgid "Delete"
 msgstr "刪除"
 
-#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2119 ../finch/gntui.c:82
-#: ../pidgin/gtkaccount.c:2325 ../pidgin/gtkdocklet.c:522
+#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2121 ../finch/gntui.c:82
+#: ../pidgin/gtkaccount.c:2331 ../pidgin/gtkdocklet.c:715
 msgid "Accounts"
 msgstr "帳號清單"
 
@@ -294,53 +297,54 @@
 
 #. Add button
 #: ../finch/gntaccount.c:698 ../finch/gntaccount.c:888 ../finch/gntblist.c:343
-#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntcertmgr.c:306
-#: ../finch/gntnotify.c:380 ../finch/gntpounce.c:713 ../finch/gntstatus.c:199
-#: ../libpurple/protocols/gg/gg.c:883 ../libpurple/protocols/qq/sys_msg.c:114
+#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntblist.c:2379
+#: ../finch/gntcertmgr.c:306 ../finch/gntnotify.c:385 ../finch/gntpounce.c:726
+#: ../finch/gntstatus.c:199 ../libpurple/protocols/gg/gg.c:885
+#: ../libpurple/protocols/qq/sys_msg.c:114
 #: ../libpurple/protocols/qq/sys_msg.c:173
 #: ../libpurple/protocols/qq/sys_msg.c:267
-#: ../libpurple/protocols/sametime/sametime.c:5486
-#: ../libpurple/protocols/silc/chat.c:615
-#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2494
-#: ../pidgin/gtkblist.c:5966 ../pidgin/gtkconv.c:1659
-#: ../pidgin/gtkrequest.c:275
+#: ../libpurple/protocols/sametime/sametime.c:5532
+#: ../libpurple/protocols/silc/chat.c:619
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2500
+#: ../pidgin/gtkblist.c:6638 ../pidgin/gtkconv.c:1713
+#: ../pidgin/gtkrequest.c:325
 msgid "Add"
 msgstr "加入"
 
 #. Modify button
-#: ../finch/gntaccount.c:703 ../finch/gntpounce.c:721
+#: ../finch/gntaccount.c:703 ../finch/gntpounce.c:734
 msgid "Modify"
 msgstr "修改"
 
-#: ../finch/gntaccount.c:811 ../pidgin/gtkaccount.c:2441
+#: ../finch/gntaccount.c:811 ../pidgin/gtkaccount.c:2447
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s 加入了 %s 為他(她)的好友 %s%s"
 
-#: ../finch/gntaccount.c:884 ../pidgin/gtkaccount.c:2493
+#: ../finch/gntaccount.c:884 ../pidgin/gtkaccount.c:2499
 msgid "Add buddy to your list?"
 msgstr "將使用者加入你的好友清單?"
 
-#  NOTE: 最頭的 %s%s%s%s 是對方帳號,或帳號括弧別名(第二、四個 %s 是括弧)
-#  NOTE: 最尾的 %s%s 是空白或「: 訊息」,基本上可以不理會(也不能怎樣理會)
-#: ../finch/gntaccount.c:944 ../pidgin/gtkaccount.c:2551
+#  NOTE: 最頭的 %s%s%s%s 是對方帳號,或帳號括弧別名(第二、四個 %s 是括弧)
+#  NOTE: 最尾的 %s%s 是空白或「: 訊息」,基本上可以不理會(也不能怎樣理會)
+#: ../finch/gntaccount.c:944 ../pidgin/gtkaccount.c:2557
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "使用者 %s%s%s%s 想要將 %s 加入他(她)的好友清單%s%s。"
 
 #: ../finch/gntaccount.c:969 ../finch/gntaccount.c:972
-#: ../finch/gntaccount.c:999 ../pidgin/gtkaccount.c:2574
-#: ../pidgin/gtkaccount.c:2580
+#: ../finch/gntaccount.c:999 ../pidgin/gtkaccount.c:2580
+#: ../pidgin/gtkaccount.c:2586
 msgid "Authorize buddy?"
 msgstr "給予認證?"
 
 #: ../finch/gntaccount.c:976 ../finch/gntaccount.c:1003
-#: ../pidgin/gtkaccount.c:2575 ../pidgin/gtkaccount.c:2581
+#: ../pidgin/gtkaccount.c:2581 ../pidgin/gtkaccount.c:2587
 msgid "Authorize"
 msgstr "給予認證"
 
 #: ../finch/gntaccount.c:977 ../finch/gntaccount.c:1004
-#: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
+#: ../pidgin/gtkaccount.c:2582 ../pidgin/gtkaccount.c:2588
 msgid "Deny"
 msgstr "拒絕"
 
@@ -364,20 +368,21 @@
 msgid "Error adding buddy"
 msgstr "新增好友途中發生了錯誤"
 
-#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2888
-#: ../pidgin/gtkaccount.c:1981 ../pidgin/gtksavedstatuses.c:980
+#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2898
+#: ../pidgin/gtkaccount.c:1986 ../pidgin/gtksavedstatuses.c:986
 msgid "Screen Name"
 msgstr "帳號"
 
 #: ../finch/gntblist.c:328 ../finch/gntblist.c:410 ../finch/gntblist.c:1250
-#: ../libpurple/protocols/msn/msn.c:1395
-#: ../libpurple/protocols/silc/chat.c:606
+#: ../libpurple/protocols/msn/msn.c:1551
+#: ../libpurple/protocols/msnp9/msn.c:1402
+#: ../libpurple/protocols/silc/chat.c:610
 #: ../libpurple/protocols/silc10/chat.c:590
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:704
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1023
-#: ../pidgin/gtkdialogs.c:1047 ../pidgin/gtkdialogs.c:1069
-#: ../pidgin/gtkrequest.c:278
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1037
+#: ../pidgin/gtkdialogs.c:1061 ../pidgin/gtkdialogs.c:1083
+#: ../pidgin/gtkrequest.c:328
 msgid "Alias"
 msgstr "別名"
 
@@ -386,44 +391,49 @@
 msgstr "羣組"
 
 #: ../finch/gntblist.c:335 ../finch/gntblist.c:401 ../finch/gntblist.c:1305
-#: ../finch/gntnotify.c:174 ../finch/gntstatus.c:576
-#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:3008 ../pidgin/gtknotify.c:506
-#: ../pidgin/gtkpounce.c:1268 ../pidgin/plugins/gevolution/gevolution.c:445
+#: ../finch/gntblist.c:2210 ../finch/gntblist.c:2274 ../finch/gntnotify.c:174
+#: ../finch/gntstatus.c:576 ../libpurple/plugins/idle.c:153
+#: ../libpurple/plugins/idle.c:190 ../pidgin/gtkblist.c:3242
+#: ../pidgin/gtknotify.c:512 ../pidgin/gtkpounce.c:1288
+#: ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "帳號"
 
 #: ../finch/gntblist.c:341 ../finch/gntblist.c:852
 #: ../libpurple/protocols/silc/buddy.c:725
-#: ../libpurple/protocols/silc/buddy.c:1027
-#: ../libpurple/protocols/silc/buddy.c:1072
-#: ../libpurple/protocols/silc/buddy.c:1182
+#: ../libpurple/protocols/silc/buddy.c:1030
+#: ../libpurple/protocols/silc/buddy.c:1075
+#: ../libpurple/protocols/silc/buddy.c:1185
 #: ../libpurple/protocols/silc10/buddy.c:737
-#: ../libpurple/protocols/silc10/buddy.c:1033
-#: ../libpurple/protocols/silc10/buddy.c:1080
-#: ../libpurple/protocols/silc10/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3343 ../pidgin/gtkblist.c:5483
+#: ../libpurple/protocols/silc10/buddy.c:1036
+#: ../libpurple/protocols/silc10/buddy.c:1083
+#: ../libpurple/protocols/silc10/buddy.c:1183
+#: ../libpurple/protocols/yahoo/yahoo.c:3354 ../pidgin/gtkblist.c:6140
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "新增好友"
 
-# TODO 要覆查 - 20061025
+# TODO 要覆查 - 20061025
 #: ../finch/gntblist.c:341
 msgid "Please enter buddy information."
 msgstr "請輸入好友的資訊。"
 
-#: ../finch/gntblist.c:370 ../libpurple/blist.c:1209
+#: ../finch/gntblist.c:370 ../libpurple/blist.c:1210
 msgid "Chats"
 msgstr "聊天"
 
-# NOTE 只能譯「名稱」,因為同時解作「人名」及「模組名稱」
+# NOTE 只能譯「名稱」,因為同時解作「人名」及「模組名稱」
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:407 ../libpurple/protocols/jabber/jabber.c:924
-#: ../libpurple/protocols/jabber/jabber.c:927
-#: ../libpurple/protocols/msn/msn.c:1584 ../libpurple/protocols/msn/msn.c:1649
-#: ../libpurple/protocols/msn/msn.c:1676
-#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:582
-#: ../pidgin/gtkroomlist.c:618
+#: ../finch/gntblist.c:407 ../finch/gntblist.c:2205
+#: ../libpurple/protocols/jabber/jabber.c:951
+#: ../libpurple/protocols/jabber/jabber.c:954
+#: ../libpurple/protocols/msn/msn.c:1732 ../libpurple/protocols/msn/msn.c:1797
+#: ../libpurple/protocols/msn/msn.c:1824
+#: ../libpurple/protocols/msnp9/msn.c:1585
+#: ../libpurple/protocols/msnp9/msn.c:1650
+#: ../libpurple/protocols/msnp9/msn.c:1677
+#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:608
+#: ../pidgin/gtkroomlist.c:931
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
@@ -433,7 +443,7 @@
 msgid "Auto-join"
 msgstr "自動加入"
 
-#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:5859
+#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:6524
 msgid "Add Chat"
 msgstr "新增聊天室"
 
@@ -453,14 +463,14 @@
 msgid "A group with the name already exists."
 msgstr "那個羣組已經存在"
 
-# TODO 請覆查核實:是「加入」抑或「新增」?
+# TODO 請覆查核實:是「加入」抑或「新增」?
 #: ../finch/gntblist.c:454 ../finch/gntblist.c:856
-#: ../libpurple/protocols/sametime/sametime.c:5396
-#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5963
+#: ../libpurple/protocols/sametime/sametime.c:5442
+#: ../libpurple/protocols/sametime/sametime.c:5530 ../pidgin/gtkblist.c:6635
 msgid "Add Group"
 msgstr "加入羣組"
 
-# TODO 要覆查 - 20061026
+# TODO 要覆查 - 20061026
 #: ../finch/gntblist.c:454
 msgid "Enter the name of the group"
 msgstr "請給羣組輸入名稱。"
@@ -473,12 +483,12 @@
 msgid "Please Update the necessary fields."
 msgstr "請按需要更新欄位內的資訊。"
 
-# TODO 要覆查 - 20061025
+# TODO 要覆查 - 20061025
 #: ../finch/gntblist.c:803 ../finch/gntstatus.c:205
 msgid "Edit"
 msgstr "修改"
 
-# XXX 還是「修改選項」?
+# XXX 還是「修改選項」?
 #: ../finch/gntblist.c:828
 msgid "Edit Settings"
 msgstr "修改設定"
@@ -492,8 +502,8 @@
 msgid "Retrieving..."
 msgstr "讀取中..."
 
-#: ../finch/gntblist.c:904 ../finch/gntconv.c:507
-#: ../libpurple/protocols/silc/chat.c:899
+#: ../finch/gntblist.c:904 ../finch/gntconv.c:528
+#: ../libpurple/protocols/silc/chat.c:903
 #: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "取得資訊"
@@ -503,10 +513,10 @@
 msgstr "加入好友狀態捕捉"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:915 ../finch/gntconv.c:519
+#: ../finch/gntblist.c:915 ../finch/gntconv.c:540
 #: ../libpurple/protocols/jabber/si.c:874
-#: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:587
-#: ../pidgin/gtkconv.c:1607
+#: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:588
+#: ../pidgin/gtkconv.c:1661
 msgid "Send File"
 msgstr "傳送檔案"
 
@@ -527,7 +537,7 @@
 msgid "Set Alias"
 msgstr "設定別名"
 
-# FIXME 譯文有待改進 - 20061029
+# FIXME 譯文有待改進 - 20061029
 #: ../finch/gntblist.c:1003
 msgid "Enter empty string to reset the name."
 msgstr "如果要重置名稱,請輸入空白字串。"
@@ -551,20 +561,20 @@
 msgstr "確認移除"
 
 #: ../finch/gntblist.c:1100 ../finch/gntblist.c:1252 ../finch/gntft.c:227
-#: ../pidgin/gtkconv.c:1656 ../pidgin/gtkrequest.c:276
+#: ../pidgin/gtkconv.c:1710 ../pidgin/gtkrequest.c:326
 #: ../pidgin/gtkstatusbox.c:264
 msgid "Remove"
 msgstr "移除"
 
 #. Buddy List
-#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2307 ../finch/gntprefs.c:258
-#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2688 ../pidgin/gtkblist.c:4284
+#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2432 ../finch/gntprefs.c:258
+#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2908 ../pidgin/gtkblist.c:4898
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "好友清單"
 
 # XXX - 20061122
-# NOTE (01時35分37秒) wabz: Anyway, I think the concept is more important than the literal translation - you use "Toggle Tag" on the currently selected buddy, then select a group/contact and hit "Place Tagged", and the buddy is moved
+# NOTE (01時35分37秒) wabz: Anyway, I think the concept is more important than the literal translation - you use "Toggle Tag" on the currently selected buddy, then select a group/contact and hit "Place Tagged", and the buddy is moved
 #: ../finch/gntblist.c:1257
 msgid "Place tagged"
 msgstr "移動已標記的項目"
@@ -575,51 +585,55 @@
 msgstr "切換標記"
 
 #. General
-#: ../finch/gntblist.c:1298 ../libpurple/protocols/gg/gg.c:637
-#: ../libpurple/protocols/gg/gg.c:1050 ../libpurple/protocols/gg/gg.c:1123
-#: ../libpurple/protocols/gg/gg.c:2207
+#: ../finch/gntblist.c:1298 ../libpurple/protocols/gg/gg.c:638
+#: ../libpurple/protocols/gg/gg.c:1052 ../libpurple/protocols/gg/gg.c:1125
+#: ../libpurple/protocols/gg/gg.c:2228
 #: ../libpurple/protocols/jabber/buddy.c:286
 #: ../libpurple/protocols/jabber/buddy.c:1247
-#: ../libpurple/protocols/jabber/buddy.c:2214
-#: ../libpurple/protocols/jabber/buddy.c:2396
-#: ../libpurple/protocols/jabber/jabber.c:937
-#: ../libpurple/protocols/jabber/jabber.c:1544
-#: ../libpurple/protocols/jabber/jabber.c:1567
-#: ../libpurple/protocols/jabber/jabber.c:1590
-#: ../libpurple/protocols/jabber/jabber.c:1613
-#: ../libpurple/protocols/jabber/jabber.c:1636
-#: ../libpurple/protocols/msn/msn.c:1403 ../libpurple/protocols/msn/msn.c:1587
+#: ../libpurple/protocols/jabber/buddy.c:2217
+#: ../libpurple/protocols/jabber/buddy.c:2409
+#: ../libpurple/protocols/jabber/jabber.c:964
+#: ../libpurple/protocols/jabber/jabber.c:1573
+#: ../libpurple/protocols/jabber/jabber.c:1587
+#: ../libpurple/protocols/jabber/jabber.c:1601
+#: ../libpurple/protocols/jabber/jabber.c:1615
+#: ../libpurple/protocols/jabber/jabber.c:1629
+#: ../libpurple/protocols/msn/msn.c:1559 ../libpurple/protocols/msn/msn.c:1735
+#: ../libpurple/protocols/msnp9/msn.c:1410
+#: ../libpurple/protocols/msnp9/msn.c:1588
 #: ../libpurple/protocols/qq/buddy_info.c:43
-#: ../libpurple/protocols/silc/buddy.c:1535
+#: ../libpurple/protocols/silc/buddy.c:1538
 #: ../libpurple/protocols/silc/ops.c:1002
 #: ../libpurple/protocols/silc/ops.c:1186
-#: ../libpurple/protocols/silc/ops.c:1322
-#: ../libpurple/protocols/silc10/buddy.c:1535
+#: ../libpurple/protocols/silc/ops.c:1324
+#: ../libpurple/protocols/silc10/buddy.c:1538
 #: ../libpurple/protocols/silc10/ops.c:1036
 #: ../libpurple/protocols/silc10/ops.c:1179
 #: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3032
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3266
 msgid "Nickname"
 msgstr "網名"
 
 #. Idle stuff
 #: ../finch/gntblist.c:1320 ../finch/gntprefs.c:261
-#: ../libpurple/protocols/bonjour/bonjour.c:340
+#: ../libpurple/protocols/bonjour/bonjour.c:358
 #: ../libpurple/protocols/jabber/buddy.c:787
 #: ../libpurple/protocols/jabber/buddy.c:951
-#: ../libpurple/protocols/msn/msn.c:544 ../libpurple/protocols/msn/state.c:32
-#: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2912
-#: ../libpurple/protocols/yahoo/yahoo.c:3097
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3060
-#: ../pidgin/gtkblist.c:3460 ../pidgin/gtkprefs.c:1925
+#: ../libpurple/protocols/msn/msn.c:611 ../libpurple/protocols/msn/msn.c:629
+#: ../libpurple/protocols/msn/msn.c:637 ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/msnp9/msn.c:544
+#: ../libpurple/protocols/msnp9/state.c:32
+#: ../libpurple/protocols/novell/novell.c:2842
+#: ../libpurple/protocols/oscar/oscar.c:2922
+#: ../libpurple/protocols/yahoo/yahoo.c:3108
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3294
+#: ../pidgin/gtkblist.c:3700 ../pidgin/gtkprefs.c:2026
 msgid "Idle"
 msgstr "閒置"
 
 #: ../finch/gntblist.c:1334
-#, fuzzy
 msgid "On Mobile"
-msgstr "使用流動通訊器材"
+msgstr "使用流動通訊器材中"
 
 #: ../finch/gntblist.c:1415
 #, c-format
@@ -645,39 +659,26 @@
 "<b>最後見到:</b>%s前"
 
 # XXX check
-#: ../finch/gntblist.c:1702 ../pidgin/gtkdocklet.c:470
-#: ../pidgin/gtkstatusbox.c:1072
+#: ../finch/gntblist.c:1704 ../pidgin/gtkdocklet.c:582
 msgid "New..."
 msgstr "新增..."
 
-# NOTE 這是很差的原文,指「已儲存」(Saved) 的「狀態」:P
-# NOTE 上下文有一些常用(?)的狀態及「新增」(新增一個狀態),彈出的視窗也有「新增」,可能應該叫「狀態一覽」或者「狀態清單」一類的……
-#: ../finch/gntblist.c:1709 ../pidgin/gtkdocklet.c:471
-#: ../pidgin/gtkstatusbox.c:1073
+# NOTE 這是很差的原文,指「已儲存」(Saved) 的「狀態」:P
+# NOTE 上下文有一些常用(?)的狀態及「新增」(新增一個狀態),彈出的視窗也有「新增」,可能應該叫「狀態一覽」或者「狀態清單」一類的……
+#: ../finch/gntblist.c:1711 ../pidgin/gtkdocklet.c:583
 msgid "Saved..."
 msgstr "狀態清單..."
 
-#: ../finch/gntblist.c:2087 ../finch/gntplugin.c:255 ../finch/gntui.c:88
-#: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:531
+#: ../finch/gntblist.c:2089 ../finch/gntplugin.c:345 ../finch/gntui.c:88
+#: ../pidgin/gtkdocklet.c:716 ../pidgin/gtkplugin.c:555
 msgid "Plugins"
 msgstr "模組清單"
 
-# NOTE 只能譯「名稱」,因為同時解作「人名」及「模組名稱」
-#: ../finch/gntblist.c:2203 ../pidgin/gtkdialogs.c:754
-#: ../pidgin/gtkdialogs.c:893 ../pidgin/gtkdialogs.c:974
-msgid "_Name"
-msgstr "名稱(_N)"
-
-#: ../finch/gntblist.c:2208 ../pidgin/gtkdialogs.c:759
-#: ../pidgin/gtkdialogs.c:898 ../pidgin/gtkdialogs.c:979
-msgid "_Account"
-msgstr "帳號(_A)"
-
-#: ../finch/gntblist.c:2216 ../pidgin/gtkdialogs.c:767
+#: ../finch/gntblist.c:2218 ../pidgin/gtkdialogs.c:781
 msgid "New Instant Message"
 msgstr "新即時訊息"
 
-#: ../finch/gntblist.c:2218 ../pidgin/gtkdialogs.c:769
+#: ../finch/gntblist.c:2220 ../pidgin/gtkdialogs.c:783
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr "請輸入你所想要發送即時訊息對象的帳號。"
@@ -685,83 +686,114 @@
 #. Not multiline
 #. Not masked?
 #. No hints?
-#: ../finch/gntblist.c:2221 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:135
-#: ../finch/gntnotify.c:80 ../libpurple/account.c:1012
-#: ../libpurple/account.c:1262 ../libpurple/protocols/gg/gg.c:506
-#: ../libpurple/protocols/gg/gg.c:665 ../libpurple/protocols/gg/gg.c:802
-#: ../libpurple/protocols/jabber/jabber.c:1736
+#: ../finch/gntblist.c:2223 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:136
+#: ../finch/gntnotify.c:80 ../libpurple/account.c:1104
+#: ../libpurple/account.c:1393 ../libpurple/protocols/gg/gg.c:507
+#: ../libpurple/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803
+#: ../libpurple/protocols/jabber/jabber.c:1745
 #: ../libpurple/protocols/jabber/xdata.c:399
-#: ../libpurple/protocols/msn/msn.c:286 ../libpurple/protocols/msn/msn.c:303
-#: ../libpurple/protocols/msn/msn.c:320 ../libpurple/protocols/msn/msn.c:337
-#: ../libpurple/protocols/oscar/oscar.c:6093
+#: ../libpurple/protocols/msn/msn.c:290 ../libpurple/protocols/msn/msn.c:307
+#: ../libpurple/protocols/msn/msn.c:324 ../libpurple/protocols/msn/msn.c:341
+#: ../libpurple/protocols/msnp9/msn.c:286
+#: ../libpurple/protocols/msnp9/msn.c:303
+#: ../libpurple/protocols/msnp9/msn.c:320
+#: ../libpurple/protocols/msnp9/msn.c:337
+#: ../libpurple/protocols/oscar/oscar.c:6143
 #: ../libpurple/protocols/silc/buddy.c:454
-#: ../libpurple/protocols/silc/buddy.c:1190
-#: ../libpurple/protocols/silc/chat.c:447
-#: ../libpurple/protocols/silc/chat.c:482
-#: ../libpurple/protocols/silc/chat.c:745
-#: ../libpurple/protocols/silc/ops.c:1291
-#: ../libpurple/protocols/silc/ops.c:1815
-#: ../libpurple/protocols/silc/silc.c:822
+#: ../libpurple/protocols/silc/buddy.c:1193
+#: ../libpurple/protocols/silc/chat.c:449
+#: ../libpurple/protocols/silc/chat.c:486
+#: ../libpurple/protocols/silc/chat.c:749
+#: ../libpurple/protocols/silc/ops.c:1293
+#: ../libpurple/protocols/silc/ops.c:1819
+#: ../libpurple/protocols/silc/silc.c:965
 #: ../libpurple/protocols/silc10/buddy.c:467
-#: ../libpurple/protocols/silc10/buddy.c:1188
+#: ../libpurple/protocols/silc10/buddy.c:1191
 #: ../libpurple/protocols/silc10/chat.c:425
 #: ../libpurple/protocols/silc10/chat.c:464
 #: ../libpurple/protocols/silc10/chat.c:729
 #: ../libpurple/protocols/silc10/ops.c:1297
 #: ../libpurple/protocols/silc10/ops.c:1903
 #: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/yahoo/yahoo.c:1031
-#: ../libpurple/protocols/yahoo/yahoo.c:3497
-#: ../libpurple/protocols/yahoo/yahoo.c:3508 ../pidgin/gtkblist.c:4039
-#: ../pidgin/gtkcertmgr.c:195 ../pidgin/gtkdialogs.c:772
-#: ../pidgin/gtkdialogs.c:911 ../pidgin/gtkdialogs.c:1003
-#: ../pidgin/gtkrequest.c:270
+#: ../libpurple/protocols/yahoo/yahoo.c:1033
+#: ../libpurple/protocols/yahoo/yahoo.c:3508
+#: ../libpurple/protocols/yahoo/yahoo.c:3519 ../pidgin/gtkcertmgr.c:195
+#: ../pidgin/gtkdialogs.c:786 ../pidgin/gtkdialogs.c:925
+#: ../pidgin/gtkdialogs.c:1017 ../pidgin/gtkrequest.c:320
 msgid "OK"
 msgstr "確定"
 
+#: ../finch/gntblist.c:2270
+msgid "Channel"
+msgstr "頻道"
+
+# TODO 看起來應該為加一個新的聊天室,並把聊天室歸類到某個群組。
+# NOTE 譯文更動 by Paladin
+#: ../finch/gntblist.c:2282 ../pidgin/gtkblist.c:940
+msgid "Join a Chat"
+msgstr "加入聊天室"
+
+#: ../finch/gntblist.c:2284
+msgid "Please enter the name of the chat you want to join."
+msgstr "請輸入你想要加入的聊天室的名稱。"
+
+#: ../finch/gntblist.c:2286 ../finch/gntnotify.c:394
+msgid "Join"
+msgstr "加入"
+
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2241 ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:790
+#: ../finch/gntblist.c:2324 ../finch/gntpounce.c:460 ../pidgin/gtkpounce.c:810
 msgid "Options"
 msgstr "選項"
 
-#: ../finch/gntblist.c:2247
+#: ../finch/gntblist.c:2330
 msgid "Send IM..."
 msgstr "送出即時訊息..."
 
-#: ../finch/gntblist.c:2251
-#, fuzzy
-msgid "Show empty groups"
-msgstr "根據羣組"
-
-#: ../finch/gntblist.c:2257
-#, fuzzy
-msgid "Show offline buddies"
-msgstr "顯示離線好友"
-
-#: ../finch/gntblist.c:2263
-msgid "Sort by status"
-msgstr "根據狀態排列"
-
-#: ../finch/gntblist.c:2267
-msgid "Sort alphabetically"
-msgstr "根據字母排列"
-
-#: ../finch/gntblist.c:2271
-msgid "Sort by log size"
-msgstr "根據日誌大小排列"
+#: ../finch/gntblist.c:2335
+msgid "Join Chat..."
+msgstr "加入聊天室..."
+
+#: ../finch/gntblist.c:2340
+msgid "Show"
+msgstr "顯示"
+
+#: ../finch/gntblist.c:2345
+msgid "Empty groups"
+msgstr "空的羣組"
+
+#: ../finch/gntblist.c:2352
+msgid "Offline buddies"
+msgstr "離線好友"
+
+#: ../finch/gntblist.c:2359
+msgid "Sort"
+msgstr "排序"
+
+#: ../finch/gntblist.c:2364
+msgid "By Status"
+msgstr "根據照狀態"
+
+#: ../finch/gntblist.c:2369 ../pidgin/gtkblist.c:4191
+msgid "Alphabetically"
+msgstr "根據照字母"
+
+#: ../finch/gntblist.c:2374
+msgid "By Log Size"
+msgstr "根據照日誌大小"
 
 #: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:188
-#, fuzzy
 msgid "Certificate Import"
-msgstr "連線埠"
+msgstr "匯入證書"
 
 #: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:189
 msgid "Specify a hostname"
-msgstr ""
-
+msgstr "請指定主機名稱"
+
+# XXX 譯文有待改進 - acli 20070913
 #: ../finch/gntcertmgr.c:88 ../pidgin/gtkcertmgr.c:190
 msgid "Type the host name this certificate is for."
-msgstr ""
+msgstr "請輸入這張證書所屬的主機名稱。"
 
 #: ../finch/gntcertmgr.c:97 ../pidgin/gtkcertmgr.c:210
 #, c-format
@@ -769,19 +801,20 @@
 "File %s could not be imported.\n"
 "Make sure that the file is readable and in PEM format.\n"
 msgstr ""
+"無法匯入檔案「%s」。\n"
+"請檢查檔案是否可讀及是否為 PEM 格式。\n"
 
 #: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:212
 msgid "Certificate Import Error"
-msgstr ""
+msgstr "證書匯入錯誤"
 
 #: ../finch/gntcertmgr.c:100 ../pidgin/gtkcertmgr.c:213
 msgid "X.509 certificate import failed"
-msgstr ""
+msgstr "X.509 證書匯入失敗"
 
 #: ../finch/gntcertmgr.c:110 ../pidgin/gtkcertmgr.c:224
-#, fuzzy
 msgid "Select a PEM certificate"
-msgstr "選擇檔案"
+msgstr "選擇PEM證書"
 
 #: ../finch/gntcertmgr.c:127 ../pidgin/gtkcertmgr.c:245
 #, c-format
@@ -789,23 +822,25 @@
 "Export to file %s failed.\n"
 "Check that you have write permission to the target path\n"
 msgstr ""
+"無法匯出至檔案「%s」。\n"
+"請確定你有權限寫入目標檔\n"
 
 #: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:247
 msgid "Certificate Export Error"
-msgstr ""
+msgstr "證書匯出錯誤"
 
 #: ../finch/gntcertmgr.c:130 ../pidgin/gtkcertmgr.c:248
 msgid "X.509 certificate export failed"
-msgstr ""
+msgstr "X.509 證書匯出失敗"
 
 #: ../finch/gntcertmgr.c:159 ../pidgin/gtkcertmgr.c:299
 msgid "PEM X.509 Certificate Export"
-msgstr ""
+msgstr "匯出 X.509 證書"
 
 #: ../finch/gntcertmgr.c:188
-#, fuzzy, c-format
+#, c-format
 msgid "Certificate for %s"
-msgstr "狀態:%s"
+msgstr "%s 的證書"
 
 #: ../finch/gntcertmgr.c:195
 #, c-format
@@ -815,61 +850,66 @@
 "SHA1 fingerprint:\n"
 "%s"
 msgstr ""
+"全名:%s\n"
+"\n"
+"SHA1 指紋:\n"
+"%s"
 
 #: ../finch/gntcertmgr.c:198
 msgid "SSL Host Certificate"
-msgstr ""
+msgstr "SSL 主機證書"
 
 #: ../finch/gntcertmgr.c:233 ../pidgin/gtkcertmgr.c:372
 #, c-format
 msgid "Really delete certificate for %s?"
-msgstr ""
+msgstr "確定要刪除 %s 的證書?"
 
 #: ../finch/gntcertmgr.c:236 ../pidgin/gtkcertmgr.c:374
 msgid "Confirm certificate delete"
-msgstr ""
-
-#: ../finch/gntcertmgr.c:293 ../pidgin/gtkcertmgr.c:602
+msgstr "確定刪除證書"
+
+#: ../finch/gntcertmgr.c:293 ../pidgin/gtkcertmgr.c:603
 msgid "Certificate Manager"
-msgstr ""
+msgstr "證書管理"
 
 #. Creating the user splits
-#: ../finch/gntcertmgr.c:298 ../libpurple/protocols/bonjour/bonjour.c:652
-#: ../libpurple/protocols/silc/silc.c:1007
+#: ../finch/gntcertmgr.c:298 ../libpurple/protocols/bonjour/bonjour.c:670
+#: ../libpurple/protocols/silc/silc.c:1150
 #: ../libpurple/protocols/silc10/silc.c:918
 msgid "Hostname"
 msgstr "主機名稱"
 
-# XXX「Info」的作用似乎係取得使用者資訊,但不肯定,看了其他po檔仍是不肯定這是什麼
-# XXX javajsp (Ka-Hing CHEUNG) 見過的「Info」按紐全都是「取得使用者資訊」
-# XXX 注:現在 (2.0.0b4) 不是了,除錯視窗的「過濾程度」竟有「Info」(資訊)級別……
-#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:383 ../pidgin/gtkconv.c:1635
-#: ../pidgin/gtkdebug.c:835
+# XXX「Info」的作用似乎係取得使用者資訊,但不肯定,看了其他po檔仍是不肯定這是什麼
+# XXX javajsp (Ka-Hing CHEUNG) 見過的「Info」按紐全都是「取得使用者資訊」
+# XXX 注:現在 (2.0.0b4) 不是了,除錯視窗的「過濾程度」竟有「Info」(資訊)級別……
+#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:388 ../pidgin/gtkconv.c:1689
+#: ../pidgin/gtkdebug.c:840
 msgid "Info"
 msgstr "資訊"
 
 #. Close button
 #: ../finch/gntcertmgr.c:324 ../finch/gntft.c:237 ../finch/gntnotify.c:182
-#: ../finch/gntplugin.c:210 ../finch/gntplugin.c:310 ../finch/gntpounce.c:738
-#: ../finch/gntstatus.c:216 ../libpurple/protocols/msn/msn.c:403
-#: ../libpurple/protocols/silc/util.c:382
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2468
-#: ../pidgin/gtkrequest.c:273
+#: ../finch/gntplugin.c:213 ../finch/gntplugin.c:406 ../finch/gntpounce.c:751
+#: ../finch/gntstatus.c:216 ../libpurple/protocols/msn/msn.c:407
+#: ../libpurple/protocols/msnp9/msn.c:403
+#: ../libpurple/protocols/silc/util.c:388
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2474
+#: ../pidgin/gtkrequest.c:323
 msgid "Close"
 msgstr "關閉"
 
-#: ../finch/gntconn.c:124
+#: ../finch/gntconn.c:125
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:127
+#: ../finch/gntconn.c:128
 #, c-format
 msgid "%s disconnected."
 msgstr "%s 結束連線。"
 
-#: ../finch/gntconn.c:128
-#, fuzzy, c-format
+#: ../finch/gntconn.c:129
+#, c-format
 msgid ""
 "%s\n"
 "\n"
@@ -877,53 +917,53 @@
 "and re-enable the account."
 msgstr ""
 "%s\n"
-"在你更正這個錯誤並重新啟動這個帳號前,%s 將不會再嘗試重新連線。"
-
-#: ../finch/gntconn.c:137 ../pidgin/gtkblist.c:4041
+"\n"
+"在你更正這個錯誤並重新啟動這個帳號前,Finch 將不會再嘗試重新連線。"
+
+#: ../finch/gntconn.c:138
 msgid "Re-enable Account"
 msgstr "重新啟動帳號"
 
-#: ../finch/gntconv.c:139
+#: ../finch/gntconv.c:137
 msgid "No such command."
 msgstr "無此指令。"
 
-#: ../finch/gntconv.c:143 ../pidgin/gtkconv.c:489
+#: ../finch/gntconv.c:141 ../pidgin/gtkconv.c:531
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "語法錯誤:輸入的參數少於指令所需的參數數量。"
 
-#: ../finch/gntconv.c:148 ../pidgin/gtkconv.c:495
+#: ../finch/gntconv.c:146 ../pidgin/gtkconv.c:537
 msgid "Your command failed for an unknown reason."
 msgstr "指令執行失敗,原因不明。"
 
-#: ../finch/gntconv.c:153 ../pidgin/gtkconv.c:502
+#: ../finch/gntconv.c:151 ../pidgin/gtkconv.c:544
 msgid "That command only works in chats, not IMs."
 msgstr "這個指令只在聊天室內有效,在即時訊息中無效。"
 
-#: ../finch/gntconv.c:156 ../pidgin/gtkconv.c:505
+#: ../finch/gntconv.c:154 ../pidgin/gtkconv.c:547
 msgid "That command only works in IMs, not chats."
 msgstr "這個指令只在即時訊息中有效,在聊天室內無效。"
 
-#: ../finch/gntconv.c:160 ../pidgin/gtkconv.c:510
+#: ../finch/gntconv.c:158 ../pidgin/gtkconv.c:552
 msgid "That command doesn't work on this protocol."
 msgstr "這個指令在這個通訊協定內無效。"
 
-#: ../finch/gntconv.c:168
-#, fuzzy
+#: ../finch/gntconv.c:166
 msgid "Message was not sent, because you are not signed on."
-msgstr "因為我們傳送訊息的速度太快,所以訊息無法送出:"
-
-# XXX 這是什麼?
-#: ../finch/gntconv.c:251
+msgstr "因為你並未登入,所以訊息無法送出:"
+
+# XXX 這是什麼?
+#: ../finch/gntconv.c:245
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:274
+#: ../finch/gntconv.c:268
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:279 ../finch/gntconv.c:773
+#: ../finch/gntconv.c:273 ../finch/gntconv.c:795
 #, c-format
 msgid ""
 "\n"
@@ -932,67 +972,65 @@
 "\n"
 "%s 正在輸入..."
 
-#: ../finch/gntconv.c:298
+#: ../finch/gntconv.c:292
 msgid "You have left this chat."
 msgstr "你離開了聊天室。"
 
-#: ../finch/gntconv.c:387 ../pidgin/gtkconv.c:1362
+#: ../finch/gntconv.c:408 ../pidgin/gtkconv.c:1416
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr "日誌系統啟動。未來在這個交談中的訊息都將被記錄於日誌中。"
 
-#: ../finch/gntconv.c:393 ../pidgin/gtkconv.c:1370
+#: ../finch/gntconv.c:414 ../pidgin/gtkconv.c:1424
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr "日誌系統關閉。未來在這個交談中的訊息都將不會被記錄於日誌中。"
 
-#: ../finch/gntconv.c:442
+#: ../finch/gntconv.c:463
 msgid "Send To"
 msgstr "傳送到"
 
-#: ../finch/gntconv.c:486
+#: ../finch/gntconv.c:507
 msgid "Conversation"
 msgstr "交談"
 
-#: ../finch/gntconv.c:492
+#: ../finch/gntconv.c:513
 msgid "Clear Scrollback"
 msgstr "清空交談內容"
 
-#: ../finch/gntconv.c:496 ../finch/gntprefs.c:191
+#: ../finch/gntconv.c:517 ../finch/gntprefs.c:191
 msgid "Show Timestamps"
 msgstr "顯示時間戳記"
 
-#: ../finch/gntconv.c:512
+#: ../finch/gntconv.c:533
 msgid "Add Buddy Pounce..."
 msgstr "加入好友狀態捕捉..."
 
-#: ../finch/gntconv.c:527
-#, fuzzy
+#: ../finch/gntconv.c:548
 msgid "Enable Logging"
-msgstr "/選項/開始記錄日誌"
-
-#: ../finch/gntconv.c:533
-#, fuzzy
+msgstr "開始記錄日誌"
+
+#: ../finch/gntconv.c:554
 msgid "Enable Sounds"
-msgstr "啟動音效:"
-
-#: ../finch/gntconv.c:739
+msgstr "啟動音效"
+
+#: ../finch/gntconv.c:760
 msgid "<AUTO-REPLY> "
 msgstr "<自動回應> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:861
+#: ../finch/gntconv.c:883
 msgid "List of users:\n"
 msgstr "使用者列表:\n"
 
-#: ../finch/gntconv.c:1023 ../pidgin/gtkconv.c:331
+#: ../finch/gntconv.c:1045 ../pidgin/gtkconv.c:371
 msgid "Supported debug options are:  version"
 msgstr "支援的除錯選項有:version"
 
-#: ../finch/gntconv.c:1059 ../pidgin/gtkconv.c:381
+#: ../finch/gntconv.c:1081 ../pidgin/gtkconv.c:423
 msgid "No such command (in this context)."
 msgstr "沒有這個指令(可在這裏使用)"
 
-#: ../finch/gntconv.c:1062 ../pidgin/gtkconv.c:384
+#: ../finch/gntconv.c:1084 ../pidgin/gtkconv.c:426
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -1000,60 +1038,65 @@
 "要獲得某一指令的說明,輸入「/help &lt;指令&gt;」即可。\n"
 "在這裏,可用的指令有:\n"
 
-#: ../finch/gntconv.c:1120 ../pidgin/gtkconv.c:7560
+#: ../finch/gntconv.c:1142 ../pidgin/gtkconv.c:7755
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr "say &lt;訊息&gt;:將指定的訊息當成一般訊息正常送出,而非當為指令處理。"
 
-#: ../finch/gntconv.c:1123 ../pidgin/gtkconv.c:7563
+#: ../finch/gntconv.c:1145 ../pidgin/gtkconv.c:7758
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;要執行的動作&gt;:模仿IRC,執行一個動作。"
 
-#: ../finch/gntconv.c:1126 ../pidgin/gtkconv.c:7566
+#: ../finch/gntconv.c:1148 ../pidgin/gtkconv.c:7761
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr "debug &lt;選項&gt;:向目前的交談送出一些除錯資訊。"
 
 # XXX
-#: ../finch/gntconv.c:1129 ../pidgin/gtkconv.c:7569
+#: ../finch/gntconv.c:1151 ../pidgin/gtkconv.c:7764
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear:清空交談的回捲緩衝區"
 
-#: ../finch/gntconv.c:1132 ../pidgin/gtkconv.c:7575
+#: ../finch/gntconv.c:1154 ../pidgin/gtkconv.c:7770
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;指令&gt;:顯示某一指令的說明。"
 
-#: ../finch/gntconv.c:1135
+#: ../finch/gntconv.c:1157
 msgid "users:  Show the list of users in the chat."
 msgstr "users:顯示這個聊天室內的使用者。"
 
-#: ../finch/gntconv.c:1140
+#: ../finch/gntconv.c:1162
 msgid "plugins: Show the plugins window."
 msgstr "plugins:顯示「模組」視窗"
 
-#: ../finch/gntconv.c:1143
+#: ../finch/gntconv.c:1165
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist:顯示好友清單。"
 
-#: ../finch/gntconv.c:1146
+#: ../finch/gntconv.c:1168
 msgid "accounts: Show the accounts window."
 msgstr "accounts:顯示帳號清單。"
 
-#: ../finch/gntconv.c:1149
+#: ../finch/gntconv.c:1171
 msgid "debugwin: Show the debug window."
 msgstr "debugwin:顯示除錯視窗"
 
-#: ../finch/gntconv.c:1152
+#: ../finch/gntconv.c:1174
 msgid "prefs: Show the preference window."
 msgstr "prefs:顯示「偏好設定」視窗"
 
-#: ../finch/gntconv.c:1155
+#: ../finch/gntconv.c:1177
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses:「狀態清單」視窗"
 
-#: ../finch/gntdebug.c:235 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:695
+#: ../finch/gntdebug.c:231 ../pidgin/gtkconv.c:989 ../pidgin/gtkconv.c:2663
+#: ../pidgin/gtkdebug.c:220 ../pidgin/gtkft.c:543
+msgid "Unable to open file."
+msgstr "無法開啟檔案。"
+
+#: ../finch/gntdebug.c:271 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:700
 msgid "Debug Window"
 msgstr "除錯視窗"
 
@@ -1061,15 +1104,15 @@
 #. * it's necessary to make the width of the debug window resizable ... like I said,
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #.
-#: ../finch/gntdebug.c:256 ../pidgin/gtkdebug.c:754
+#: ../finch/gntdebug.c:292 ../pidgin/gtkdebug.c:759
 msgid "Clear"
 msgstr "清除"
 
-#: ../finch/gntdebug.c:262
-msgid "Filter: "
+#: ../finch/gntdebug.c:303
+msgid "Filter:"
 msgstr "過濾器:"
 
-#: ../finch/gntdebug.c:266 ../pidgin/gtkdebug.c:763
+#: ../finch/gntdebug.c:309 ../pidgin/gtkdebug.c:768
 msgid "Pause"
 msgstr "暫停"
 
@@ -1106,25 +1149,27 @@
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
 #: ../finch/gntft.c:201 ../finch/gntstatus.c:547 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:344
-#: ../libpurple/protocols/gg/gg.c:1039 ../libpurple/protocols/gg/gg.c:1576
-#: ../libpurple/protocols/gg/gg.c:1584
+#: ../libpurple/protocols/bonjour/bonjour.c:362
+#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1584
+#: ../libpurple/protocols/gg/gg.c:1592
 #: ../libpurple/protocols/jabber/buddy.c:778
 #: ../libpurple/protocols/jabber/buddy.c:782
 #: ../libpurple/protocols/jabber/buddy.c:941
-#: ../libpurple/protocols/jabber/jabber.c:1500
-#: ../libpurple/protocols/msn/msn.c:543
-#: ../libpurple/protocols/novell/novell.c:2835
+#: ../libpurple/protocols/jabber/jabber.c:1538
+#: ../libpurple/protocols/msn/msn.c:621 ../libpurple/protocols/msn/msn.c:631
+#: ../libpurple/protocols/msn/msn.c:636 ../libpurple/protocols/msn/msn.c:639
+#: ../libpurple/protocols/msnp9/msn.c:543
+#: ../libpurple/protocols/novell/novell.c:2852
 #: ../libpurple/protocols/oscar/oscar.c:821
 #: ../libpurple/protocols/oscar/oscar.c:826
 #: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:2700
-#: ../libpurple/protocols/oscar/oscar.c:3780
-#: ../libpurple/protocols/sametime/sametime.c:3263
-#: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3248 ../pidgin/gtkblist.c:3104
-#: ../pidgin/gtkblist.c:3118 ../pidgin/gtkblist.c:3120
-#: ../pidgin/gtksavedstatuses.c:999 ../pidgin/gtksavedstatuses.c:1144
+#: ../libpurple/protocols/oscar/oscar.c:2710
+#: ../libpurple/protocols/oscar/oscar.c:3790
+#: ../libpurple/protocols/sametime/sametime.c:3305
+#: ../libpurple/protocols/sametime/sametime.c:4196
+#: ../libpurple/protocols/yahoo/yahoo.c:3259 ../pidgin/gtkblist.c:3338
+#: ../pidgin/gtkblist.c:3352 ../pidgin/gtkblist.c:3354
+#: ../pidgin/gtksavedstatuses.c:1005 ../pidgin/gtksavedstatuses.c:1150
 msgid "Status"
 msgstr "狀態"
 
@@ -1140,7 +1185,7 @@
 msgid "Stop"
 msgstr "中止"
 
-#  XXX 暫譯
+#  XXX 暫譯
 #: ../finch/gntft.c:305 ../pidgin/gtkft.c:169 ../pidgin/gtkft.c:973
 msgid "Waiting for transfer to begin"
 msgstr "等待開始傳輸檔案中..."
@@ -1153,22 +1198,24 @@
 msgid "Failed"
 msgstr "失敗"
 
+#  XXX pending Paladin's confirmation - acli 20070713
 #: ../finch/gntft.c:420 ../pidgin/gtkft.c:134
-#, fuzzy, c-format
+#, c-format
 msgid "%.2f KiB/s"
 msgstr "%.2f kB/s"
 
 #: ../finch/gntft.c:431
 #, c-format
 msgid "The file was saved as %s."
-msgstr ""
+msgstr "成功存檔至 %s。"
 
 #: ../finch/gntft.c:432 ../finch/gntft.c:433 ../pidgin/gtkft.c:163
 #: ../pidgin/gtkft.c:1116
 msgid "Finished"
 msgstr "已完成"
 
-#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:347
+#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:404
+#: ../libpurple/protocols/msnp9/session.c:357
 msgid "Transferring"
 msgstr "傳輸中"
 
@@ -1176,74 +1223,70 @@
 msgid "Emails"
 msgstr "電子郵件"
 
-# XXX 要覆查
-#: ../finch/gntnotify.c:171 ../finch/gntnotify.c:225
+# XXX 要覆查
+#: ../finch/gntnotify.c:171 ../finch/gntnotify.c:226
 msgid "You have mail!"
 msgstr "你收到郵件!"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:513
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:519
 msgid "Sender"
 msgstr "發信人"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:520
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:526
 msgid "Subject"
 msgstr "主題"
 
-#: ../finch/gntnotify.c:201
+#: ../finch/gntnotify.c:202
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s (%s) 有 %d 封新郵件。"
 msgstr[1] "%s (%s) 有 %d 封新郵件。"
 
-#: ../finch/gntnotify.c:225 ../pidgin/gtknotify.c:341
+#: ../finch/gntnotify.c:226 ../pidgin/gtknotify.c:342
 msgid "New Mail"
 msgstr "新郵件"
 
-#: ../finch/gntnotify.c:290 ../pidgin/gtknotify.c:940
+#: ../finch/gntnotify.c:291 ../pidgin/gtknotify.c:949
 #, c-format
 msgid "Info for %s"
 msgstr "%s 的資訊"
 
-#: ../finch/gntnotify.c:291 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:941
+#: ../finch/gntnotify.c:292 ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:950
 msgid "Buddy Information"
 msgstr "好友資訊"
 
-#: ../finch/gntnotify.c:377 ../libpurple/protocols/qq/group_join.c:367
+#: ../finch/gntnotify.c:382 ../libpurple/protocols/qq/group_join.c:367
 msgid "Continue"
 msgstr "繼續"
 
-#: ../finch/gntnotify.c:386 ../pidgin/gtkconv.c:1596
+#: ../finch/gntnotify.c:391 ../pidgin/gtkconv.c:1650
 msgid "IM"
 msgstr "即時訊息"
 
-#: ../finch/gntnotify.c:389
-msgid "Join"
-msgstr "加入"
-
-#: ../finch/gntnotify.c:392 ../libpurple/protocols/sametime/sametime.c:3473
+#: ../finch/gntnotify.c:397 ../libpurple/protocols/sametime/sametime.c:3515
 msgid "Invite"
 msgstr "邀請"
 
-# TODO 要覆查 - 20061028
-#: ../finch/gntnotify.c:395
+# TODO 要覆查 - 20061028
+#: ../finch/gntnotify.c:400
 msgid "(none)"
 msgstr "(沒有名字)"
 
-#: ../finch/gntplugin.c:75 ../finch/gntplugin.c:84
+#: ../finch/gntplugin.c:77 ../finch/gntplugin.c:86
 msgid "ERROR"
 msgstr "錯誤"
 
-#: ../finch/gntplugin.c:75
+#: ../finch/gntplugin.c:77
 msgid "loading plugin failed"
 msgstr "模組載入失敗"
 
-#: ../finch/gntplugin.c:84
+#: ../finch/gntplugin.c:86
 msgid "unloading plugin failed"
 msgstr "模組卸載失敗"
 
-#: ../finch/gntplugin.c:129
+#: ../finch/gntplugin.c:132
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1260,19 +1303,40 @@
 "網站:%s\n"
 "檔名:%s\n"
 
-#: ../finch/gntplugin.c:187
+#: ../finch/gntplugin.c:190
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "設定模組前,請先載入模組。"
 
-#: ../finch/gntplugin.c:235
+#: ../finch/gntplugin.c:238
 msgid "No configuration options for this plugin."
 msgstr "此模組並無選項可供設定。"
 
+#: ../finch/gntplugin.c:259
+msgid "Error loading plugin"
+msgstr "載入模組途中遭遇錯誤"
+
 #: ../finch/gntplugin.c:260
+msgid "The selected file is not a valid plugin."
+msgstr "所指定的檔案不是有效的模組。"
+
+#: ../finch/gntplugin.c:261
+msgid ""
+"Please open the debug window and try again to see the exact error message."
+msgstr "請開啟「除錯視窗」檢視確實的錯誤訊息。"
+
+#: ../finch/gntplugin.c:324
+msgid "Select plugin to install"
+msgstr "請選擇希望安裝的模組"
+
+#: ../finch/gntplugin.c:350
 msgid "You can (un)load plugins from the following list."
 msgstr "你可透過以下列表載入或卸載模組。"
 
-#: ../finch/gntplugin.c:315
+#: ../finch/gntplugin.c:401
+msgid "Install Plugin..."
+msgstr "安裝模組..."
+
+#: ../finch/gntplugin.c:411
 msgid "Configure Plugin"
 msgstr "設定模組"
 
@@ -1281,191 +1345,188 @@
 #. (that should have been "effect," right?)
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
-#: ../finch/gntplugin.c:371 ../finch/gntplugin.c:378 ../finch/gntprefs.c:264
-#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2067
+#: ../finch/gntplugin.c:467 ../finch/gntplugin.c:474 ../finch/gntprefs.c:264
+#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:717 ../pidgin/gtkprefs.c:2169
 msgid "Preferences"
 msgstr "偏好設定"
 
-#: ../finch/gntpounce.c:183 ../pidgin/gtkpounce.c:256
+#: ../finch/gntpounce.c:194 ../pidgin/gtkpounce.c:256
 msgid "Please enter a buddy to pounce."
 msgstr "請輸入一個好友以進行捕捉。"
 
-#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:517
+#: ../finch/gntpounce.c:339 ../pidgin/gtkpounce.c:531
 msgid "New Buddy Pounce"
 msgstr "新增好友狀態捕捉"
 
-#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:517
+#: ../finch/gntpounce.c:339 ../pidgin/gtkpounce.c:531
 msgid "Edit Buddy Pounce"
 msgstr "編輯好友狀態捕捉"
 
-#: ../finch/gntpounce.c:333
+#: ../finch/gntpounce.c:344
 msgid "Pounce Who"
 msgstr "捕捉誰的狀態"
 
 #. Account:
-#: ../finch/gntpounce.c:336 ../finch/gntstatus.c:456
+#: ../finch/gntpounce.c:347 ../finch/gntstatus.c:456
 msgid "Account:"
 msgstr "帳號:"
 
-#: ../finch/gntpounce.c:358
+#: ../finch/gntpounce.c:369
 msgid "Buddy name:"
 msgstr "好友名稱:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:374 ../pidgin/gtkpounce.c:585
+#: ../finch/gntpounce.c:387 ../pidgin/gtkpounce.c:600
 msgid "Pounce When Buddy..."
 msgstr "捕捉狀態..."
 
-#: ../finch/gntpounce.c:376
+#: ../finch/gntpounce.c:389
 msgid "Signs on"
 msgstr "登入"
 
-#: ../finch/gntpounce.c:377
+#: ../finch/gntpounce.c:390
 msgid "Signs off"
 msgstr "登出"
 
-#: ../finch/gntpounce.c:378
+#: ../finch/gntpounce.c:391
 msgid "Goes away"
 msgstr "離開"
 
-#: ../finch/gntpounce.c:379
+#: ../finch/gntpounce.c:392
 msgid "Returns from away"
 msgstr "返回"
 
-#: ../finch/gntpounce.c:380
+#: ../finch/gntpounce.c:393
 msgid "Becomes idle"
 msgstr "閒置"
 
-#: ../finch/gntpounce.c:381
+#: ../finch/gntpounce.c:394
 msgid "Is no longer idle"
 msgstr "不再閒置"
 
-#: ../finch/gntpounce.c:382
+#: ../finch/gntpounce.c:395
 msgid "Starts typing"
 msgstr "開始輸入"
 
-#: ../finch/gntpounce.c:383
+#: ../finch/gntpounce.c:396
 msgid "Pauses while typing"
 msgstr "暫停輸入"
 
-#: ../finch/gntpounce.c:384
+#: ../finch/gntpounce.c:397
 msgid "Stops typing"
 msgstr "停止輸入"
 
-#: ../finch/gntpounce.c:385
+#: ../finch/gntpounce.c:398
 msgid "Sends a message"
 msgstr "送出一個訊息"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:414 ../pidgin/gtkpounce.c:646
+#: ../finch/gntpounce.c:427 ../pidgin/gtkpounce.c:661
 msgid "Action"
 msgstr "執行動作"
 
-#: ../finch/gntpounce.c:416
+#: ../finch/gntpounce.c:429
 msgid "Open an IM window"
 msgstr "開啟即時訊息視窗"
 
-#: ../finch/gntpounce.c:417
+#: ../finch/gntpounce.c:430
 msgid "Pop up a notification"
 msgstr "彈出通知"
 
-#: ../finch/gntpounce.c:418
+#: ../finch/gntpounce.c:431
 msgid "Send a message"
 msgstr "送出訊息"
 
-#: ../finch/gntpounce.c:419
+#: ../finch/gntpounce.c:432
 msgid "Execute a command"
 msgstr "執行指令"
 
-#: ../finch/gntpounce.c:420
+#: ../finch/gntpounce.c:433
 msgid "Play a sound"
 msgstr "播放音效"
 
-#: ../finch/gntpounce.c:448
+#: ../finch/gntpounce.c:461
 msgid "Pounce only when my status is not available"
 msgstr "只在我的狀態不為「上線」時啟用"
 
-#: ../finch/gntpounce.c:450 ../pidgin/gtkpounce.c:1281
+#: ../finch/gntpounce.c:463 ../pidgin/gtkpounce.c:1301
 msgid "Recurring"
-msgstr "重複發生"
-
-#: ../finch/gntpounce.c:618
-#, fuzzy
+msgstr "重覆發生"
+
+#: ../finch/gntpounce.c:631
 msgid "Cannot create pounce"
-msgstr "無法更改網名"
-
-#: ../finch/gntpounce.c:619
-#, fuzzy
+msgstr "無法新增好友狀態捕捉"
+
+#: ../finch/gntpounce.c:632
 msgid "You do not have any accounts."
-msgstr "必須指定帳號"
-
-#: ../finch/gntpounce.c:620
+msgstr "未有設定任何帳號"
+
+#: ../finch/gntpounce.c:633
 msgid "You must create an account first before you can create a pounce."
-msgstr ""
-
-#: ../finch/gntpounce.c:662 ../pidgin/gtkpounce.c:1096
+msgstr "新增好友狀態捕捉前,必須先新增一個帳號。"
+
+#: ../finch/gntpounce.c:675 ../pidgin/gtkpounce.c:1116
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "你確定你要刪除對 %2$s 的 %1$s 捕捉?"
 
-#: ../finch/gntpounce.c:696 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1325
+#: ../finch/gntpounce.c:709 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1352
 msgid "Buddy Pounces"
 msgstr "好友狀態捕捉"
 
-#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1452
+#: ../finch/gntpounce.c:823 ../pidgin/gtkpounce.c:1480
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s 開始輸入訊息給你 (%s)"
 
-#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1454
+#: ../finch/gntpounce.c:825 ../pidgin/gtkpounce.c:1482
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s 暫停輸入訊息給你 (%s)"
 
-#: ../finch/gntpounce.c:814 ../pidgin/gtkpounce.c:1456
+#: ../finch/gntpounce.c:827 ../pidgin/gtkpounce.c:1484
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s 已經登入 (%s)"
 
-#: ../finch/gntpounce.c:816 ../pidgin/gtkpounce.c:1458
+#: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1486
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s 由閒置返回 (%s)"
 
-#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1460
+#: ../finch/gntpounce.c:831 ../pidgin/gtkpounce.c:1488
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s 由離開返回 (%s)"
 
-#: ../finch/gntpounce.c:820 ../pidgin/gtkpounce.c:1462
+#: ../finch/gntpounce.c:833 ../pidgin/gtkpounce.c:1490
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s 停止輸入訊息給你 (%s)"
 
-#: ../finch/gntpounce.c:822 ../pidgin/gtkpounce.c:1464
+#: ../finch/gntpounce.c:835 ../pidgin/gtkpounce.c:1492
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s 已經登出 (%s)"
 
-#: ../finch/gntpounce.c:824 ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:837 ../pidgin/gtkpounce.c:1494
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s 更改狀態為閒置 (%s)"
 
 # XXX This string is very problematic. The other person might have changed to any non-available
-# XXX status like "Busy" (not necessarily "Away"), and "已經離開" seems misleading. - 20061123
-#: ../finch/gntpounce.c:826 ../pidgin/gtkpounce.c:1468
+# XXX status like "Busy" (not necessarily "Away"), and "已經離開" seems misleading. - 20061123
+#: ../finch/gntpounce.c:839 ../pidgin/gtkpounce.c:1496
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s 已經離開。 (%s)"
 
-#: ../finch/gntpounce.c:828 ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:841 ../pidgin/gtkpounce.c:1498
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s 送出一個訊息給你。 (%s)"
 
-#: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1471
-#, c-format
+#: ../finch/gntpounce.c:842 ../pidgin/gtkpounce.c:1499
 msgid "Unknown pounce event. Please report this!"
 msgstr "未知的捕捉事件。請匯報這個問題!"
 
@@ -1473,12 +1534,12 @@
 msgid "Based on keyboard use"
 msgstr "以鍵盤的使用為基準"
 
-#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1930
+#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:2031
 msgid "From last sent message"
 msgstr "從上次送出訊息時為基準"
 
-#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:907
-#: ../pidgin/gtkprefs.c:1929 ../pidgin/gtkprefs.c:1943
+#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:900 ../pidgin/gtkprefs.c:908
+#: ../pidgin/gtkprefs.c:2030 ../pidgin/gtkprefs.c:2044
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "從不"
@@ -1512,207 +1573,193 @@
 msgstr "記錄所有的狀態改變"
 
 #: ../finch/gntprefs.c:207
-#, fuzzy
 msgid "Report Idle time"
 msgstr "閒置時間基準(_R)"
 
 #: ../finch/gntprefs.c:208
-#, fuzzy
 msgid "Change status when idle"
-msgstr "閒置時更改狀態(_I)"
-
-# NOTE 譯文更動 by Ambrose
+msgstr "閒置時更改狀態"
+
 #: ../finch/gntprefs.c:209
-#, fuzzy
 msgid "Minutes before changing status"
-msgstr "閒置多少分鐘設為離開(_M):"
+msgstr "閒置多少分鐘更改狀態"
 
 #: ../finch/gntprefs.c:210
-#, fuzzy
 msgid "Change status to"
-msgstr "更改狀態為(_S):"
+msgstr "更改狀態為"
 
 #. Conversations
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:993 ../pidgin/gtkprefs.c:2033
+#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:995 ../pidgin/gtkprefs.c:2135
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "交談"
 
-#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1467 ../pidgin/gtkprefs.c:2044
+#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1563 ../pidgin/gtkprefs.c:2146
 msgid "Logging"
 msgstr "日誌"
 
-#: ../finch/gntrequest.c:583
+#: ../finch/gntrequest.c:585
 msgid "Not implemented yet."
 msgstr "該功能尚未實作"
 
-#: ../finch/gntrequest.c:659 ../pidgin/gtkrequest.c:1555
-#: ../pidgin/gtkrequest.c:1601
+#: ../finch/gntrequest.c:661 ../pidgin/gtkrequest.c:1699
+#: ../pidgin/gtkrequest.c:1745
 msgid "Save File..."
 msgstr "儲存檔案..."
 
-#: ../finch/gntrequest.c:659 ../pidgin/gtkrequest.c:1556
-#: ../pidgin/gtkrequest.c:1602
+#: ../finch/gntrequest.c:661 ../pidgin/gtkrequest.c:1700
+#: ../pidgin/gtkrequest.c:1746
 msgid "Open File..."
 msgstr "開啟檔案..."
 
-#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:64
+#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:62
 msgid "Buddy logs in"
 msgstr "好友登入"
 
-#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:65
+#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:63
 msgid "Buddy logs out"
 msgstr "好友登出"
 
-#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:66
+#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:64
 msgid "Message received"
 msgstr "收到訊息"
 
-#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:67
+#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:65
 msgid "Message received begins conversation"
 msgstr "訊息收到,開始進行交談"
 
-#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:68
+#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:66
 msgid "Message sent"
 msgstr "訊息送出"
 
-#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:69
+#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:67
 msgid "Person enters chat"
 msgstr "有人進入聊天室"
 
-#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:70
+#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:68
 msgid "Person leaves chat"
 msgstr "有人離開聊天室"
 
-#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:71
+#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:69
 msgid "You talk in chat"
 msgstr "你在聊天室說話"
 
-#: ../finch/gntsound.c:105 ../pidgin/gtksound.c:72
+#: ../finch/gntsound.c:105 ../pidgin/gtksound.c:70
 msgid "Others talk in chat"
 msgstr "其他人進入聊天室"
 
-#: ../finch/gntsound.c:107 ../pidgin/gtksound.c:75
+#: ../finch/gntsound.c:107 ../pidgin/gtksound.c:73
 msgid "Someone says your screen name in chat"
 msgstr "有人在聊天室中提到你的名字"
 
-#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:311
+#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:306
 msgid "GStreamer Failure"
 msgstr "GStreamer 錯誤"
 
-#: ../finch/gntsound.c:362 ../pidgin/gtksound.c:312
+#: ../finch/gntsound.c:362 ../pidgin/gtksound.c:307
 msgid "GStreamer failed to initialize."
 msgstr "GStreamer 初始化失敗。"
 
-#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1587
-#: ../pidgin/gtkprefs.c:1676 ../pidgin/gtkprefs.c:1872
+#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1687
+#: ../pidgin/gtkprefs.c:1776 ../pidgin/gtkprefs.c:1972
 msgid "(default)"
 msgstr "(預設)"
 
 #: ../finch/gntsound.c:729
-#, fuzzy
 msgid "Select Sound File ..."
-msgstr "選擇資料匣..."
+msgstr "選擇音效檔..."
 
 #: ../finch/gntsound.c:904
-#, fuzzy
 msgid "Sound Preferences"
-msgstr "偏好設定"
+msgstr "音效設定"
 
 #: ../finch/gntsound.c:915
-#, fuzzy
 msgid "Profiles"
 msgstr "個人資料"
 
-#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1717
+#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1817
 msgid "Automatic"
 msgstr "自動"
 
 #: ../finch/gntsound.c:957
-#, fuzzy
 msgid "Console Beep"
 msgstr "嗶一聲"
 
-#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1721
+#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1821
 msgid "Command"
 msgstr "指令"
 
 #: ../finch/gntsound.c:959
-#, fuzzy
 msgid "No Sound"
 msgstr "無音效"
 
-#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1712
+#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1812
 msgid "Sound Method"
 msgstr "音效播放方式"
 
 #: ../finch/gntsound.c:966
-#, fuzzy
 msgid "Method: "
-msgstr "播放方式(_M):"
+msgstr "播放方式:"
 
 #: ../finch/gntsound.c:973
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Sound Command\n"
 "(%s for filename)"
 msgstr ""
-"音效指令(_C):\n"
+"音效指令:\n"
 "(請以 %s 代表檔名)"
 
 #. Sound options
-#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1756
+#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1856
 msgid "Sound Options"
 msgstr "音效選項"
 
 #: ../finch/gntsound.c:982
-#, fuzzy
 msgid "Sounds when conversation has focus"
-msgstr "當交談取得輸入焦點發出音效(_F)"
-
-#: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:909
-#: ../pidgin/gtkprefs.c:1763 ../pidgin/plugins/timestamp_format.c:42
+msgstr "當交談取得輸入焦點發出音效"
+
+#: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:910
+#: ../pidgin/gtkprefs.c:1863 ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:334
 msgid "Always"
 msgstr "務必"
 
-#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1761
+#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1861
 msgid "Only when available"
 msgstr "上線而非離開期間"
 
-#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1762
+#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1862
 msgid "Only when not available"
 msgstr "離開期間"
 
 #: ../finch/gntsound.c:999
-#, fuzzy
 msgid "Volume(0-100):"
-msgstr "音量:"
+msgstr "音量(0-100):"
 
 #. Sound events
-#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1798
+#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1898
 msgid "Sound Events"
 msgstr "事件音效"
 
-#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1857
+#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1957
 msgid "Event"
 msgstr "事件"
 
 #: ../finch/gntsound.c:1020
-#, fuzzy
 msgid "File"
-msgstr "失敗"
-
-#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1876
+msgstr "檔案"
+
+#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1976
 msgid "Test"
 msgstr "測試"
 
-#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1880
+#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1980
 msgid "Reset"
 msgstr "重置"
 
-#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1884
+#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1984
 msgid "Choose..."
 msgstr "選擇..."
 
@@ -1725,21 +1772,22 @@
 msgid "Delete Status"
 msgstr "移除狀態"
 
-# FIXME 譯得太差了
+# FIXME 譯得太差了
 #: ../finch/gntstatus.c:176 ../pidgin/gtksavedstatuses.c:597
 msgid "Saved Statuses"
 msgstr "狀態清單"
 
-# FIXME 原文一詞兩義,根本無法翻譯
+# FIXME 原文一詞兩義,根本無法翻譯
 #: ../finch/gntstatus.c:183 ../finch/gntstatus.c:539
 #: ../libpurple/protocols/jabber/buddy.c:298
 #: ../libpurple/protocols/jabber/buddy.c:1359
-#: ../libpurple/protocols/novell/novell.c:1484
+#: ../libpurple/protocols/msn/msn.c:725
+#: ../libpurple/protocols/novell/novell.c:1493
 #: ../pidgin/gtksavedstatuses.c:500
 msgid "Title"
 msgstr "職銜"
 
-# NOTE 應指儲存時的格式
+# NOTE 應指儲存時的格式
 #: ../finch/gntstatus.c:183 ../pidgin/gtksavedstatuses.c:515
 msgid "Type"
 msgstr "格式"
@@ -1753,41 +1801,44 @@
 #. not independent
 #. Attributes - each status can have a message.
 #: ../finch/gntstatus.c:183 ../finch/gntstatus.c:564 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:256
-#: ../libpurple/protocols/bonjour/bonjour.c:263
-#: ../libpurple/protocols/bonjour/bonjour.c:346
-#: ../libpurple/protocols/gg/gg.c:1077 ../libpurple/protocols/gg/gg.c:1579
-#: ../libpurple/protocols/gg/gg.c:1597 ../libpurple/protocols/gg/gg.c:1607
-#: ../libpurple/protocols/gg/gg.c:1613 ../libpurple/protocols/gg/gg.c:1622
-#: ../libpurple/protocols/gg/gg.c:1627 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1532
-#: ../libpurple/protocols/jabber/jabber.c:1555
-#: ../libpurple/protocols/jabber/jabber.c:1578
-#: ../libpurple/protocols/jabber/jabber.c:1601
-#: ../libpurple/protocols/jabber/jabber.c:1624
-#: ../libpurple/protocols/jabber/jabber.c:1649
+#: ../libpurple/protocols/bonjour/bonjour.c:274
+#: ../libpurple/protocols/bonjour/bonjour.c:281
+#: ../libpurple/protocols/bonjour/bonjour.c:364
+#: ../libpurple/protocols/gg/gg.c:1079 ../libpurple/protocols/gg/gg.c:1587
+#: ../libpurple/protocols/gg/gg.c:1605 ../libpurple/protocols/gg/gg.c:1615
+#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/gg/gg.c:1630
+#: ../libpurple/protocols/gg/gg.c:1635 ../libpurple/protocols/irc/irc.c:238
+#: ../libpurple/protocols/jabber/jabber.c:1570
+#: ../libpurple/protocols/jabber/jabber.c:1584
+#: ../libpurple/protocols/jabber/jabber.c:1598
+#: ../libpurple/protocols/jabber/jabber.c:1612
+#: ../libpurple/protocols/jabber/jabber.c:1626
+#: ../libpurple/protocols/jabber/jabber.c:1642
+#: ../libpurple/protocols/msn/msn.c:677 ../libpurple/protocols/msn/msn.c:683
+#: ../libpurple/protocols/msn/msn.c:689 ../libpurple/protocols/msn/msn.c:695
+#: ../libpurple/protocols/msn/msn.c:700 ../libpurple/protocols/msn/msn.c:705
 #: ../libpurple/protocols/myspace/myspace.c:148
-#: ../libpurple/protocols/novell/novell.c:2838
-#: ../libpurple/protocols/novell/novell.c:2941
-#: ../libpurple/protocols/novell/novell.c:2947
-#: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/oscar/oscar.c:5554
-#: ../libpurple/protocols/oscar/oscar.c:5772
-#: ../libpurple/protocols/oscar/oscar.c:5786
-#: ../libpurple/protocols/oscar/oscar.c:5802
-#: ../libpurple/protocols/oscar/oscar.c:5809
-#: ../libpurple/protocols/oscar/oscar.c:5816
-#: ../libpurple/protocols/sametime/sametime.c:3286
-#: ../libpurple/protocols/sametime/sametime.c:3292
-#: ../libpurple/protocols/sametime/sametime.c:3298
-#: ../libpurple/protocols/sametime/sametime.c:3377
-#: ../libpurple/protocols/silc/buddy.c:1551
-#: ../libpurple/protocols/silc10/buddy.c:1551
-#: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3751
-#: ../libpurple/protocols/yahoo/yahoo.c:3757
+#: ../libpurple/protocols/novell/novell.c:2855
+#: ../libpurple/protocols/novell/novell.c:2958
+#: ../libpurple/protocols/novell/novell.c:2964
+#: ../libpurple/protocols/novell/novell.c:2970
+#: ../libpurple/protocols/oscar/oscar.c:5604
+#: ../libpurple/protocols/oscar/oscar.c:5822
+#: ../libpurple/protocols/oscar/oscar.c:5836
+#: ../libpurple/protocols/oscar/oscar.c:5852
+#: ../libpurple/protocols/oscar/oscar.c:5859
+#: ../libpurple/protocols/oscar/oscar.c:5866
+#: ../libpurple/protocols/sametime/sametime.c:3328
+#: ../libpurple/protocols/sametime/sametime.c:3334
+#: ../libpurple/protocols/sametime/sametime.c:3340
+#: ../libpurple/protocols/sametime/sametime.c:3419
+#: ../libpurple/protocols/silc/buddy.c:1554
+#: ../libpurple/protocols/silc10/buddy.c:1554
+#: ../libpurple/protocols/simple/simple.c:247
+#: ../libpurple/protocols/yahoo/yahoo.c:3762
+#: ../libpurple/protocols/yahoo/yahoo.c:3768
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
-#: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1010
+#: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1016
 msgid "Message"
 msgstr "訊息"
 
@@ -1806,7 +1857,7 @@
 
 #: ../finch/gntstatus.c:310
 msgid "Duplicate title"
-msgstr "標題重複"
+msgstr "標題重覆"
 
 #: ../finch/gntstatus.c:311
 msgid "Please enter a different title for the status."
@@ -1839,9 +1890,9 @@
 
 #: ../finch/gntui.c:85
 msgid "Certificates"
-msgstr ""
-
-#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2035
+msgstr "證書"
+
+#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2137
 msgid "Sounds"
 msgstr "音效"
 
@@ -1851,23 +1902,20 @@
 
 #: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
 #: ../finch/plugins/gntclipboard.c:128
-#, fuzzy
 msgid "Error loading the plugin."
-msgstr "卸載模組途中遭遇錯誤。"
+msgstr "載入模組途中遭遇錯誤。"
 
 #: ../finch/plugins/gntclipboard.c:116
-#, fuzzy
 msgid "Couldn't find X display"
-msgstr "無法開啟檔案"
+msgstr "找不到 X Display 的設定"
 
 #: ../finch/plugins/gntclipboard.c:122
-#, fuzzy
 msgid "Couldn't find window"
-msgstr "無法開啟檔案"
+msgstr "無法找到視窗"
 
 #: ../finch/plugins/gntclipboard.c:129
 msgid "This plugin cannot be loaded because it was not built with X11 support."
-msgstr ""
+msgstr "無法載入模組,因為建置模組時沒有給它加入 X11 支援。"
 
 #: ../finch/plugins/gntclipboard.c:158
 msgid "GntClipboard"
@@ -1877,12 +1925,12 @@
 msgid "Clipboard plugin"
 msgstr "剪貼簿模組"
 
-#  FIXME: 這很不通順
+#  FIXME: 這很不通順
 #: ../finch/plugins/gntclipboard.c:161
 msgid ""
 "When the gnt clipboard contents change, the contents are made available to "
 "X, if possible."
-msgstr "當 gnt 的剪貼薄內容有所更改時,儘可能把新的內容匯出至 X 視窗系統。"
+msgstr "當 gnt 的剪貼簿內容有所更改時,儘可能把新的內容匯出至 X 視窗系統。"
 
 #: ../finch/plugins/gntgf.c:231
 #, c-format
@@ -1925,7 +1973,7 @@
 msgid "Someone says your name in a chat"
 msgstr "有人在聊天室中提到你的名字"
 
-#  NOTE「GntGf」意為「Gnt 版的 Guifications」,「Toaster」指 MSN 風格的彈出式通知好像多士爐彈出烘好的麵包一樣
+#  NOTE「GntGf」意為「Gnt 版的 Guifications」,「Toaster」指 MSN 風格的彈出式通知好像多士爐彈出烘好的麵包一樣
 #: ../finch/plugins/gntgf.c:336
 msgid "Notify with a toaster when"
 msgstr "以下情況下使用多士爐式彈出通知"
@@ -1942,21 +1990,21 @@
 msgid "GntGf"
 msgstr "GntGf"
 
-#  NOTE「GntGf」意為「Gnt 版的 Guifications」,「Toaster」指 MSN 風格的彈出式通知好像多士爐彈出烘好的麪包一樣
+#  NOTE「GntGf」意為「Gnt 版的 Guifications」,「Toaster」指 MSN 風格的彈出式通知好像多士爐彈出烘好的麪包一樣
 #: ../finch/plugins/gntgf.c:379 ../finch/plugins/gntgf.c:380
 msgid "Toaster plugin"
 msgstr "多士爐式彈出通知模組"
 
-#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:120
+#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:125
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>與 %s 於 %s 的交談;</b><br>"
 
-#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:147
+#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:153
 msgid "History Plugin Requires Logging"
 msgstr "使用歷史記錄模組,先要啟用日誌功能"
 
-#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:148
+#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:154
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
@@ -1971,11 +2019,11 @@
 msgid "GntHistory"
 msgstr "歷史記錄"
 
-#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:190
+#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:197
 msgid "Shows recently logged conversations in new conversations."
 msgstr "顯示最近所記錄的交談到新的交談視窗中"
 
-#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:191
+#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:198
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -1988,7 +2036,7 @@
 #. Translator Note: The "backlog" is the conversation buffer/history.
 #: ../finch/plugins/lastlog.c:100
 msgid "lastlog: Searches for a substring in the backlog."
-msgstr ""
+msgstr "lastlog:在交談的回捲緩衝區搜尋字串。"
 
 #: ../finch/plugins/lastlog.c:122
 msgid "GntLastlog"
@@ -1998,97 +2046,96 @@
 msgid "Lastlog plugin."
 msgstr ""
 
-#: ../libpurple/account.c:791
+#: ../libpurple/account.c:875
 msgid "accounts"
 msgstr "帳號清單"
 
-#: ../libpurple/account.c:958 ../libpurple/protocols/jabber/auth.c:195
+#: ../libpurple/account.c:1050 ../libpurple/protocols/jabber/auth.c:199
 msgid "Password is required to sign on."
 msgstr "登入時需要密碼。"
 
-#: ../libpurple/account.c:992
+#: ../libpurple/account.c:1084
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "輸入 %s (%s) 的密碼"
 
-#: ../libpurple/account.c:999
+#: ../libpurple/account.c:1091
 msgid "Enter Password"
 msgstr "輸入密碼"
 
-#: ../libpurple/account.c:1004
+#: ../libpurple/account.c:1096
 msgid "Save password"
 msgstr "儲存密碼"
 
-#: ../libpurple/account.c:1039 ../libpurple/connection.c:105
+#: ../libpurple/account.c:1131 ../libpurple/connection.c:105
 #: ../libpurple/connection.c:178
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "找不到 %s 的協定模組"
 
-#: ../libpurple/account.c:1041 ../libpurple/connection.c:108
-#: ../pidgin/gtkblist.c:4036
+#: ../libpurple/account.c:1133 ../libpurple/connection.c:108
 msgid "Connection Error"
 msgstr "連線錯誤"
 
-#: ../libpurple/account.c:1199 ../libpurple/protocols/gg/gg.c:707
-#: ../libpurple/protocols/jabber/jabber.c:1687
+#: ../libpurple/account.c:1330 ../libpurple/protocols/gg/gg.c:708
+#: ../libpurple/protocols/jabber/jabber.c:1698
 msgid "New passwords do not match."
 msgstr "新密碼並不相符。"
 
-# NOTE 譯文更動 by Ambrose
-#: ../libpurple/account.c:1208
+# NOTE 譯文更動 by Ambrose
+#: ../libpurple/account.c:1339
 msgid "Fill out all fields completely."
 msgstr "請填妥整份表格所有的欄位。"
 
-#: ../libpurple/account.c:1231
+#: ../libpurple/account.c:1362
 msgid "Original password"
 msgstr "舊密碼"
 
-#: ../libpurple/account.c:1238
+#: ../libpurple/account.c:1369
 msgid "New password"
 msgstr "新密碼"
 
-#: ../libpurple/account.c:1245
+#: ../libpurple/account.c:1376
 msgid "New password (again)"
 msgstr "新密碼(再次確認)"
 
-#: ../libpurple/account.c:1251
+#: ../libpurple/account.c:1382
 #, c-format
 msgid "Change password for %s"
 msgstr "修改 %s 的密碼"
 
-#: ../libpurple/account.c:1259
+#: ../libpurple/account.c:1390
 msgid "Please enter your current password and your new password."
 msgstr "請輸入你目前的密碼以及希望使用的新密碼。"
 
-#: ../libpurple/account.c:1290
+#: ../libpurple/account.c:1421
 #, c-format
 msgid "Change user information for %s"
 msgstr "更改 %s 的個人資料"
 
-#: ../libpurple/account.c:1293 ../libpurple/protocols/toc/toc.c:1670
+#: ../libpurple/account.c:1424 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "設定使用者資訊"
 
-# XXX 問題:
-# XXX gtk/gtkft.c - 「Unknown」是一指一個未能計算的數值,譯「未知」較好
-# XXX libgaim/account.c - 「Unknown」指不知道是什麼通訊協定,譯「不明」較好(因為一定「曾經知道」,
-# XXX                      我在「帳號清單」看見「未知」真的看了很久也看不明白)
-# XXX libgaim/protocols/* - 「Unknown」指不明的好友狀態,可能是指「不明」(通訊系統回報的狀態是「不明」)
-# XXX                       或者「未知」(出現了 Pidgin 未見過的狀態代號)
+# XXX 問題:
+# XXX gtk/gtkft.c - 「Unknown」是一指一個未能計算的數值,譯「未知」較好
+# XXX libgaim/account.c - 「Unknown」指不知道是什麼通訊協定,譯「不明」較好(因為一定「曾經知道」,
+# XXX                      我在「帳號清單」看見「未知」真的看了很久也看不明白)
+# XXX libgaim/protocols/* - 「Unknown」指不明的好友狀態,可能是指「不明」(通訊系統回報的狀態是「不明」)
+# XXX                       或者「未知」(出現了 Pidgin 未見過的狀態代號)
 # XXX - Ambrose 20061123
-#: ../libpurple/account.c:1764 ../libpurple/protocols/gg/gg.c:1017
+#: ../libpurple/account.c:1895 ../libpurple/protocols/gg/gg.c:1019
 #: ../libpurple/protocols/jabber/buddy.c:782
-#: ../libpurple/protocols/jabber/buddy.c:2027
-#: ../libpurple/protocols/jabber/buddy.c:2044
-#: ../libpurple/protocols/novell/novell.c:2831
-#: ../libpurple/protocols/qq/qq.c:232 ../pidgin/gtkft.c:160
+#: ../libpurple/protocols/jabber/buddy.c:2030
+#: ../libpurple/protocols/jabber/buddy.c:2047
+#: ../libpurple/protocols/novell/novell.c:2848
+#: ../libpurple/protocols/qq/qq.c:233 ../pidgin/gtkft.c:160
 msgid "Unknown"
 msgstr "未知"
 
-#: ../libpurple/blist.c:521 ../libpurple/blist.c:1320
-#: ../libpurple/blist.c:1552 ../libpurple/protocols/jabber/roster.c:69
-#: ../libpurple/protocols/myspace/myspace.c:3244 ../pidgin/gtkblist.c:5373
+#: ../libpurple/blist.c:521 ../libpurple/blist.c:1321
+#: ../libpurple/blist.c:1531 ../libpurple/protocols/jabber/roster.c:69
+#: ../libpurple/protocols/myspace/myspace.c:3272 ../pidgin/gtkblist.c:6030
 #: ../pidgin/plugins/gevolution/gevo-util.c:67
 #: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
@@ -2098,58 +2145,62 @@
 msgid "buddy list"
 msgstr "好友清單"
 
-#: ../libpurple/certificate.c:545
+#: ../libpurple/certificate.c:558
 msgid "(DOES NOT MATCH)"
-msgstr ""
-
+msgstr "(並不相符)"
+
+#  XXX 這是暫譯 - acli 20070913
 #. Make messages
-#: ../libpurple/certificate.c:549
+#: ../libpurple/certificate.c:562
 #, c-format
 msgid "%s has presented the following certificate for just-this-once use:"
-msgstr ""
-
-#: ../libpurple/certificate.c:550
+msgstr "%s 出示了以下隨用即棄的證書:"
+
+#: ../libpurple/certificate.c:563
 #, c-format
 msgid ""
 "Common name: %s %s\n"
 "Fingerprint (SHA1): %s"
 msgstr ""
-
+"全名:%s %s\n"
+"指紋 (SHA1):%s"
+
+#  XXX 這是暫譯 - acli 20070913
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:555
+#: ../libpurple/certificate.c:568
 msgid "Single-use Certificate Verification"
-msgstr ""
-
-#. Scheme name
-#. Pool name
-#: ../libpurple/certificate.c:872
-msgid "Certificate Authorities"
-msgstr ""
+msgstr "核實即棄證書"
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:1040
+#: ../libpurple/certificate.c:886
+msgid "Certificate Authorities"
+msgstr "證書機構"
+
+#  TODO Untranslated - acli 20070913
+#. Scheme name
+#. Pool name
+#: ../libpurple/certificate.c:1054
 msgid "SSL Peers Cache"
-msgstr ""
+msgstr "SSL Peer 快取"
 
 #. Make messages
-#: ../libpurple/certificate.c:1171
-#, fuzzy, c-format
+#: ../libpurple/certificate.c:1185
+#, c-format
 msgid "Accept certificate for %s?"
-msgstr "接受邀請嗎?"
+msgstr "接受 %s 的證書嗎?"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1177
+#: ../libpurple/certificate.c:1191
 msgid "SSL Certificate Verification"
-msgstr ""
+msgstr "核實 SSL 證書"
 
 #. Number of actions
-#: ../libpurple/certificate.c:1186
-#, fuzzy
+#: ../libpurple/certificate.c:1201
 msgid "Accept"
-msgstr "接受(_A)"
-
-#: ../libpurple/certificate.c:1187 ../libpurple/protocols/qq/buddy_opt.c:214
+msgstr "接受"
+
+#: ../libpurple/certificate.c:1202 ../libpurple/protocols/qq/buddy_opt.c:214
 #: ../libpurple/protocols/qq/group_im.c:144
 #: ../libpurple/protocols/qq/group_opt.c:127
 #: ../libpurple/protocols/qq/sys_msg.c:90
@@ -2157,77 +2208,76 @@
 msgid "Reject"
 msgstr "拒絕"
 
-#: ../libpurple/certificate.c:1188
+#: ../libpurple/certificate.c:1203
 msgid "_View Certificate..."
-msgstr ""
-
+msgstr "檢視證書(_V)"
+
+# FIXME 譯文不太通順 - acli 20070913
 #. Prompt the user to authenticate the certificate
 #. TODO: Provide the user with more guidance about why he is
 #. being prompted
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1288
+#: ../libpurple/certificate.c:1303
 #, c-format
 msgid ""
 "The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
 "could mean that you are not connecting to the service you believe you are."
-msgstr ""
+msgstr "「%s」出示的證書聲稱它應該屬於「%s」,你目前可能的連線可能不是你心目中希望使用的服務。"
 
 #. Prompt the user to authenticate the certificate
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1313
+#: ../libpurple/certificate.c:1328
 #, c-format
 msgid ""
 "The certificate presented by \"%s\" is self-signed. It cannot be "
 "automatically checked."
-msgstr ""
-
-#: ../libpurple/certificate.c:1331
+msgstr "「%s」出示的證書是自簽的,無法自動進行核實。"
+
+#: ../libpurple/certificate.c:1346
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
-msgstr ""
+msgstr "「%s」出示的證書鍊是無效的。"
 
 #. TODO: Make this error either block the ensuing SSL
 #. connection error until the user dismisses this one, or
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
-#: ../libpurple/certificate.c:1339 ../libpurple/certificate.c:1416
-#, fuzzy
+#: ../libpurple/certificate.c:1354 ../libpurple/certificate.c:1423
 msgid "SSL Certificate Error"
-msgstr "寫入錯誤"
-
-#: ../libpurple/certificate.c:1340
-#, fuzzy
+msgstr "SSL 證書錯誤"
+
+#: ../libpurple/certificate.c:1355
 msgid "Invalid certificate chain"
-msgstr "標題無效"
+msgstr "無效的證書鏈"
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1360
+#: ../libpurple/certificate.c:1375
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
 "validated."
-msgstr ""
+msgstr "無法核實這張證書,因為你沒有根證書機構證書 (root certificate) 的資料庫。"
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1382
+#: ../libpurple/certificate.c:1398
 msgid ""
 "The root certificate this one claims to be issued by is unknown to Pidgin."
-msgstr ""
-
-#: ../libpurple/certificate.c:1408
+msgstr "這張證書聲稱由一所 Pidgin 不認識的根證書機構簽發。"
+
+#: ../libpurple/certificate.c:1415
 #, c-format
 msgid ""
 "The certificate chain presented by %s does not have a valid digital "
 "signature from the Certificate Authority from which it claims to have a "
 "signature."
-msgstr ""
-
-#: ../libpurple/certificate.c:1417
+msgstr "「%s」出示的證書鍊聲稱它是由某證書機構簽發,但實際上卻沒有該證書機構的有效簽署。"
+
+#: ../libpurple/certificate.c:1424
 msgid "Invalid certificate authority signature"
-msgstr ""
+msgstr "證書機構的簽署是無效的"
 
 #. Make messages
-#: ../libpurple/certificate.c:1881
+#: ../libpurple/certificate.c:1888
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -2237,21 +2287,25 @@
 "Activation date: %s\n"
 "Expiration date: %s\n"
 msgstr ""
+"全名:%s\n"
+"\n"
+"指紋 (SHA1):%s\n"
+"\n"
+"生效日期:%s\n"
+"失效日期:%s\n"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1890
-#, fuzzy
+#: ../libpurple/certificate.c:1897
 msgid "Certificate Information"
-msgstr "伺服器資訊"
+msgstr "證書資訊"
 
 #: ../libpurple/connection.c:107
 msgid "Registration Error"
 msgstr "註冊錯誤"
 
 #: ../libpurple/connection.c:180
-#, fuzzy
 msgid "Unregistration Error"
-msgstr "註冊錯誤"
+msgstr "移除註冊錯誤"
 
 #: ../libpurple/connection.c:350
 #, c-format
@@ -2263,10 +2317,12 @@
 msgid "+++ %s signed off"
 msgstr "+++ %s 登出"
 
-#: ../libpurple/connection.c:497 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:2337
+#: ../libpurple/connection.c:525 ../libpurple/plugin.c:277
+#: ../libpurple/protocols/jabber/buddy.c:2350
 #: ../libpurple/protocols/msn/servconn.c:141
-#: ../libpurple/protocols/msn/session.c:322
+#: ../libpurple/protocols/msn/session.c:377
+#: ../libpurple/protocols/msnp9/servconn.c:139
+#: ../libpurple/protocols/msnp9/session.c:330
 msgid "Unknown error"
 msgstr "未知錯誤"
 
@@ -2331,23 +2387,23 @@
 msgid "Failed to get connection: %s"
 msgstr "無法建立連結:%s"
 
-# TODO 覆查譯文 - 20061028
+# TODO 覆查譯文 - 20061028
 #: ../libpurple/dbus-server.c:596
 #, c-format
 msgid "Failed to get name: %s"
 msgstr "無法取得名稱:%s"
 
-# TODO 覆查譯文 - 20061028
+# TODO 覆查譯文 - 20061028
 #: ../libpurple/dbus-server.c:610
 #, c-format
 msgid "Failed to get serv name: %s"
 msgstr "無法取得伺服器名稱:%s"
 
-#: ../libpurple/dbus-server.h:85
+#: ../libpurple/dbus-server.h:84
 msgid "Purple's D-BUS server is not running for the reason listed below"
 msgstr "因下列原因,Purple 的 D-BUS 伺服器未有執行"
 
-# NOTE 暫譯,或許有其他意義
+# NOTE 暫譯,或許有其他意義
 #: ../libpurple/desktopitem.c:287 ../libpurple/desktopitem.c:878
 msgid "No name"
 msgstr "未命名"
@@ -2360,7 +2416,7 @@
 msgid "Unable to send request to resolver process\n"
 msgstr "無法送出訊息給解析程序\n"
 
-#: ../libpurple/dnsquery.c:549 ../libpurple/dnsquery.c:697
+#: ../libpurple/dnsquery.c:549 ../libpurple/dnsquery.c:698
 #, c-format
 msgid ""
 "Error resolving %s:\n"
@@ -2369,8 +2425,8 @@
 "解析 %s 途中發生了錯誤:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:552 ../libpurple/dnsquery.c:711
-#: ../libpurple/dnsquery.c:831
+#: ../libpurple/dnsquery.c:552 ../libpurple/dnsquery.c:712
+#: ../libpurple/dnsquery.c:830
 #, c-format
 msgid "Error resolving %s: %d"
 msgstr "解析 %s 途中發生了錯誤:%d"
@@ -2385,16 +2441,15 @@
 "%s"
 
 #: ../libpurple/dnsquery.c:578
-#, c-format
 msgid "EOF while reading from resolver process"
 msgstr "由解析程序讀取時碰到檔案結尾"
 
-#: ../libpurple/dnsquery.c:761
+#: ../libpurple/dnsquery.c:762
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "無法建立執行緒:%s"
 
-#: ../libpurple/dnsquery.c:762
+#: ../libpurple/dnsquery.c:763
 msgid "Unknown reason"
 msgstr "原因不明"
 
@@ -2457,7 +2512,7 @@
 msgid "Accept file transfer request from %s?"
 msgstr "接受來自於「%s」的檔案傳輸要求嗎?"
 
-#  XXX 暫譯
+#  XXX 暫譯
 #: ../libpurple/ft.c:401
 #, c-format
 msgid ""
@@ -2495,7 +2550,6 @@
 msgstr "檔案 %s 傳送完畢"
 
 #: ../libpurple/ft.c:685
-#, c-format
 msgid "File transfer complete"
 msgstr "檔案傳輸完畢"
 
@@ -2505,7 +2559,6 @@
 msgstr "你取消了 %s 的傳送"
 
 #: ../libpurple/ft.c:1108
-#, c-format
 msgid "File transfer cancelled"
 msgstr "檔案傳輸已取消"
 
@@ -2695,7 +2748,7 @@
 msgid "Plain text"
 msgstr "純文字"
 
-#  NOTE: xfce 譯「flat file」為「平面檔案」
+#  NOTE: xfce 譯「flat file」為「平面檔案」
 #: ../libpurple/log.c:626
 msgid "Old flat format"
 msgstr "舊式平面檔案"
@@ -2713,20 +2766,16 @@
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
-msgstr ""
-"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;自動回應&gt;:"
-"</b></font> %s<br/>\n"
+msgstr "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;自動回應&gt;:</b></font> %s<br/>\n"
 
 #: ../libpurple/log.c:1368
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
-msgstr ""
-"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;自動回應&gt;:"
-"</b></font> %s<br/>\n"
-
-# XXX 暫譯
+msgstr "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;自動回應&gt;:</b></font> %s<br/>\n"
+
+# XXX 暫譯
 #: ../libpurple/log.c:1426 ../libpurple/log.c:1559
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>找不到日誌檔案!</b></font>"
@@ -2741,58 +2790,53 @@
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <自動回覆>:%s\n"
 
-#: ../libpurple/plugin.c:365
+#: ../libpurple/plugin.c:360
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "你目前使用的是 %s,但這模組需要 %s。"
 
-#: ../libpurple/plugin.c:380
-#, c-format
+#: ../libpurple/plugin.c:375
 msgid "This plugin has not defined an ID."
 msgstr "這個模組未有定義它的 ID。"
 
-#: ../libpurple/plugin.c:448
+#: ../libpurple/plugin.c:443
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
 msgstr "模組不符 %d (需要 %d)"
 
-#: ../libpurple/plugin.c:465
+#: ../libpurple/plugin.c:460
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr "ABI 版本不符 %d.%d.x (需要%d.%d.x)"
 
-#: ../libpurple/plugin.c:482
+#: ../libpurple/plugin.c:477
 msgid "Plugin does not implement all required functions"
 msgstr "模組並未實作所有必要的功能"
 
-#: ../libpurple/plugin.c:547
+#: ../libpurple/plugin.c:542
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 msgstr "找不到需要的模組「%s」。請重新安裝這個模組之後重試。"
 
-#: ../libpurple/plugin.c:552
+#: ../libpurple/plugin.c:547
 msgid "Unable to load the plugin"
 msgstr "無法載入模組"
 
-#: ../libpurple/plugin.c:574
+#: ../libpurple/plugin.c:569
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "無法載入需要的模組「%s」。"
 
-#: ../libpurple/plugin.c:578
+#: ../libpurple/plugin.c:573
 msgid "Unable to load your plugin."
 msgstr "無法載入你所提供的模組。"
 
-#: ../libpurple/plugin.c:677
-#, c-format
-msgid "The dependent plugin %s failed to unload."
-msgstr "關聯模組 %s 卸載失敗。"
-
-#: ../libpurple/plugin.c:681
-msgid "There were errors unloading the plugin."
-msgstr "卸載模組途中遭遇錯誤。"
+#: ../libpurple/plugin.c:663
+#, c-format
+msgid "%s requires %s, but it failed to unload."
+msgstr "模組「%s」需要模組「%s」,但後者卸載失敗。"
 
 #: ../libpurple/plugins/autoaccept.c:23
 msgid "Autoaccept"
@@ -2827,18 +2871,19 @@
 
 #: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
 #: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
-#: ../libpurple/protocols/oscar/oscar.c:1453
-#: ../libpurple/protocols/oscar/oscar.c:2233
-#: ../libpurple/protocols/oscar/oscar.c:2282
-#: ../libpurple/protocols/oscar/oscar.c:5886
-#: ../libpurple/protocols/oscar/oscar.c:5941
-#: ../libpurple/protocols/oscar/oscar.c:6167
-#: ../libpurple/protocols/oscar/oscar.c:6237 ../libpurple/request.h:1388
-#: ../libpurple/request.h:1398
+#: ../libpurple/protocols/oscar/oscar.c:1451
+#: ../libpurple/protocols/oscar/oscar.c:2243
+#: ../libpurple/protocols/oscar/oscar.c:2292
+#: ../libpurple/protocols/oscar/oscar.c:5936
+#: ../libpurple/protocols/oscar/oscar.c:5991
+#: ../libpurple/protocols/oscar/oscar.c:6217
+#: ../libpurple/protocols/oscar/oscar.c:6287 ../libpurple/request.h:1828
+#: ../libpurple/request.h:1841 ../libpurple/request.h:1854
+#: ../libpurple/request.h:1867 ../pidgin/gtkblist.c:546
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#  TODO: 不通順 - 20070414
+#  TODO: 不通順 - 20070414
 #: ../libpurple/plugins/autoaccept.c:168
 msgid "Ask"
 msgstr "問一問我"
@@ -2865,7 +2910,7 @@
 msgid "Auto Reject"
 msgstr "自動拒絶"
 
-#  NOTE 這些都是視窗標題
+#  NOTE 這些都是視窗標題
 #: ../libpurple/plugins/autoaccept.c:185
 msgid "Autoaccept File Transfers..."
 msgstr "自動接受檔案傳輸..."
@@ -2891,8 +2936,10 @@
 "當完成自動接受檔案傳輸時跳出視窗通知\n"
 "(只發生在未與傳送者進行交談的情況下)"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1660
-#: ../libpurple/protocols/msn/msn.c:1690
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1808
+#: ../libpurple/protocols/msn/msn.c:1838
+#: ../libpurple/protocols/msnp9/msn.c:1661
+#: ../libpurple/protocols/msnp9/msn.c:1691
 msgid "Notes"
 msgstr "備註"
 
@@ -2982,8 +3029,8 @@
 msgid "Allows control by entering commands in a file."
 msgstr "提供透過在檔案中輸入指令來控制本程式的功能。"
 
-#  NOTE 這是是輸入欄位左邊的標籤,「幾多分鐘」、「分鐘數」的意思
-#  FIXME 譯文有待改進
+#  NOTE 這是是輸入欄位左邊的標籤,「幾多分鐘」、「分鐘數」的意思
+#  FIXME 譯文有待改進
 #: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:218
 msgid "Minutes"
 msgstr "分鐘數"
@@ -3044,16 +3091,15 @@
 msgid "Test plugin IPC support, as a client."
 msgstr "以用戶端身份測試插件系統的 IPC 支援。"
 
-# FIXME 務必要覆核這段譯文!!!
-# NOTE 譯文更動 by Paladin
+# FIXME 務必要覆核這段譯文!!!
+# NOTE 譯文更動 by Paladin
 # NOTE Patch by Kevin Leung
 #. *  description
 #: ../libpurple/plugins/ipc-test-client.c:92
 msgid ""
 "Test plugin IPC support, as a client. This locates the server plugin and "
 "calls the commands registered."
-msgstr ""
-"以用戶端身份測試模組系統的 IPC 支援,即是找尋伺服器模組後呼叫事先掛載的指令。"
+msgstr "以用戶端身份測試模組系統的 IPC 支援,即是找尋伺服器模組後呼叫事先掛載的指令。"
 
 #. *< type
 #. *< ui_requirement
@@ -3072,15 +3118,15 @@
 msgid "Test plugin IPC support, as a server."
 msgstr "以伺服器身份測試插件系統的 IPC 支援。"
 
-# FIXME 務必要覆核這段譯文!!!
-# NOTE 譯文更動 by Paladin
+# FIXME 務必要覆核這段譯文!!!
+# NOTE 譯文更動 by Paladin
 # NOTE Patch by Kevin Leung
 #. *  description
 #: ../libpurple/plugins/ipc-test-server.c:79
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr "以伺服器身份測試模組系統的 IPC 支援,即是掛載測試用的 IPC 指令。"
 
-#  XXX 不通順
+#  XXX 不通順
 #: ../libpurple/plugins/joinpart.c:229
 msgid "Join/Part Hiding Configuration"
 msgstr "設定如何隱藏「加入/離開聊天室」的訊息"
@@ -3093,7 +3139,7 @@
 msgid "User Inactivity Timeout (in minutes)"
 msgstr "閒置時間下限(分鐘)"
 
-#  XXX 不通順
+#  XXX 不通順
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -3104,7 +3150,7 @@
 msgid "Join/Part Hiding"
 msgstr "隱藏「加入/離開聊天室」訊息"
 
-#  XXX 不通順
+#  XXX 不通順
 #. *< name
 #. *< version
 #. *  summary
@@ -3117,123 +3163,127 @@
 msgid ""
 "This plugin hides join/part messages in large rooms, except for those users "
 "actively taking part in a conversation."
-msgstr ""
-"這個模組係針對大型聊天室內不停出現「加入/離開聊天室」訊息的問題而設。除非是正"
-"在聊天的使用者加入/離開聊天室,否則所有其他的「加入/離開聊天室」訊息將一概于"
-"以隱藏。"
+msgstr "這個模組係針對大型聊天室內不停出現「加入/離開聊天室」訊息的問題而設。除非是正在聊天的使用者加入/離開聊天室,否則所有其他的「加入/離開聊天室」訊息將一概于以隱藏。"
 
 #. This is used in the place of a timezone abbreviation if the
 #. * offset is way off.  The user should never really see it, but
 #. * it's here just in case.  The parens are to make it clear it's
 #. * not a real timezone.
-#: ../libpurple/plugins/log_reader.c:493
+#: ../libpurple/plugins/log_reader.c:499
 msgid "(UTC)"
 msgstr "(UTC)"
 
-#: ../libpurple/plugins/log_reader.c:1577
+#: ../libpurple/plugins/log_reader.c:1554
 msgid "User is offline."
 msgstr "使用者是離線的。"
 
-#: ../libpurple/plugins/log_reader.c:1583
+#: ../libpurple/plugins/log_reader.c:1560
 msgid "Auto-response sent:"
 msgstr "自動回應送出:"
 
-#: ../libpurple/plugins/log_reader.c:1593
-#: ../libpurple/plugins/log_reader.c:1596
+#: ../libpurple/plugins/log_reader.c:1570
+#: ../libpurple/plugins/log_reader.c:1573
 #: ../libpurple/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s 已經登出。"
 
-#: ../libpurple/plugins/log_reader.c:1610
+#: ../libpurple/plugins/log_reader.c:1587
 msgid "One or more messages may have been undeliverable."
 msgstr "一個或多個訊息可能傳送失敗。"
 
-#: ../libpurple/plugins/log_reader.c:1620
+#: ../libpurple/plugins/log_reader.c:1597
 msgid "You were disconnected from the server."
 msgstr "你已經停止與伺服器的連線。"
 
-#: ../libpurple/plugins/log_reader.c:1628
+#: ../libpurple/plugins/log_reader.c:1605
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
 msgstr "你目前是離線狀態。在你重新登入前,將無法收到任何訊息。"
 
-#: ../libpurple/plugins/log_reader.c:1643
+#: ../libpurple/plugins/log_reader.c:1620
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr "由於達到長度上限,所以訊息無法送出。"
 
-#: ../libpurple/plugins/log_reader.c:1648
+#: ../libpurple/plugins/log_reader.c:1625
 msgid "Message could not be sent."
 msgstr "訊息無法送出。"
 
-# #NOTE 根據「plugins/log_reader.c#1971」的訊息來判斷,應該是指一種新式的通訊協定。
+# #NOTE 根據「plugins/log_reader.c#1971」的訊息來判斷,應該是指一種新式的通訊協定。
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2349
-#: ../libpurple/plugins/log_reader.c:2472
+#: ../libpurple/plugins/log_reader.c:2699
+#: ../libpurple/plugins/log_reader.c:2835
 msgid "Adium"
 msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2362
-#: ../libpurple/plugins/log_reader.c:2477
+#: ../libpurple/plugins/log_reader.c:2712
+#: ../libpurple/plugins/log_reader.c:2840
 msgid "Fire"
 msgstr "Fire"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2374
-#: ../libpurple/plugins/log_reader.c:2481
+#: ../libpurple/plugins/log_reader.c:2724
+#: ../libpurple/plugins/log_reader.c:2844
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2388
-#: ../libpurple/plugins/log_reader.c:2486
+#: ../libpurple/plugins/log_reader.c:2738
+#: ../libpurple/plugins/log_reader.c:2849
 msgid "QIP"
-msgstr ""
+msgstr "QIP"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../libpurple/plugins/log_reader.c:2750
+#: ../libpurple/plugins/log_reader.c:2853
+msgid "MSN Messenger"
+msgstr "MSN Messenger"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2400
-#: ../libpurple/plugins/log_reader.c:2490
-msgid "MSN Messenger"
-msgstr "MSN Messenger"
-
-# #NOTE 根據「plugins/log_reader.c#1971」的訊息來判斷,應該是指一種新式的通訊協定。
+#: ../libpurple/plugins/log_reader.c:2762
+#: ../libpurple/plugins/log_reader.c:2857
+msgid "Trillian"
+msgstr "Trillian"
+
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2412
-#: ../libpurple/plugins/log_reader.c:2494
-msgid "Trillian"
-msgstr "Trillian"
+#: ../libpurple/plugins/log_reader.c:2774
+#: ../libpurple/plugins/log_reader.c:2861
+msgid "aMSN"
+msgstr "aMSN"
 
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2454
+#: ../libpurple/plugins/log_reader.c:2817
 msgid "General Log Reading Configuration"
 msgstr "基本的日誌讀取設定"
 
-#: ../libpurple/plugins/log_reader.c:2458
+#: ../libpurple/plugins/log_reader.c:2821
 msgid "Fast size calculations"
 msgstr "快速計算日誌大小"
 
-#  XXX 譯文計有「啟發式XX」、「經驗法則」、「發現技法」、「探索法」、「探究法」等(後兩者似乎只限用於數學)
-#  XXX 這裏的「name heuristics」是指一些幫助 Pidgin「估計」帳號身分的經驗性規則;單從字義判斷,合用的譯文只有「經驗法則」
-#: ../libpurple/plugins/log_reader.c:2462
+#  XXX 譯文計有「啟發式XX」、「經驗法則」、「發現技法」、「探索法」、「探究法」等(後兩者似乎只限用於數學)
+#  XXX 這裏的「name heuristics」是指一些幫助 Pidgin「估計」帳號身分的經驗性規則;單從字義判斷,合用的譯文只有「經驗法則」
+#: ../libpurple/plugins/log_reader.c:2825
 msgid "Use name heuristics"
 msgstr "匹配帳號時使用經驗法則 (heuristics)"
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2468
+#: ../libpurple/plugins/log_reader.c:2831
 msgid "Log Directory"
 msgstr "日誌目錄"
 
@@ -3243,20 +3293,20 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2523
+#: ../libpurple/plugins/log_reader.c:2890
 msgid "Log Reader"
 msgstr "日誌檢視器"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2527
+#: ../libpurple/plugins/log_reader.c:2894
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "在日誌瀏覽器中包含其他即時訊息用戶端日誌。"
 
-# XXX 譯文有待改進(第二段) - 20061025
+# XXX 譯文有待改進(第二段) - 20061025
 #. * description
-#: ../libpurple/plugins/log_reader.c:2531
+#: ../libpurple/plugins/log_reader.c:2898
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -3264,8 +3314,7 @@
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
 msgstr ""
-"當瀏覽日誌時,這個模組會把其他即時訊息用戶端的日誌也包含進來。目前支援 "
-"Adium、Fire、Messenger Plus!、MSN Messenger,以及 Trillian。\n"
+"當瀏覽日誌時,這個模組會把其他即時訊息用戶端的日誌也包含進來。目前支援 Adium、Fire、Messenger Plus!、MSN Messenger,以及 Trillian。\n"
 "\n"
 "注意:這個模組仍處於開發初期,因此可能經常當掉。如果使用,後果自負!"
 
@@ -3316,18 +3365,14 @@
 msgid ""
 "The rest of the messages will be saved as pounce. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
-msgstr ""
-"未能送出的訊息將會儲存成「好友狀態捕捉」。如有需要,訊息可在「好友狀態捕捉」"
-"的對話視窗中編輯或刪除。"
+msgstr "未能送出的訊息將會儲存成「好友狀態捕捉」。如有需要,訊息可在「好友狀態捕捉」的對話視窗中編輯或刪除。"
 
 #: ../libpurple/plugins/offlinemsg.c:156
 #, c-format
 msgid ""
 "\"%s\" is currently offline. Do you want to save the rest of the messages in "
 "a pounce and automatically send them when \"%s\" logs back in?"
-msgstr ""
-"「%s」目前為離線,你要使用「好友狀態捕捉」功能儲存未能送出的訊息嗎?(儲存的"
-"訊息將在「%s」下次登入時自動送出)"
+msgstr "「%s」目前為離線,你要使用「好友狀態捕捉」功能儲存未能送出的訊息嗎?(儲存的訊息將在「%s」下次登入時自動送出)"
 
 #: ../libpurple/plugins/offlinemsg.c:160
 msgid "Offline Message"
@@ -3338,26 +3383,32 @@
 msgstr "你可以在「好友狀態捕捉」的對話視窗中編輯或刪除狀態捕捉"
 
 #: ../libpurple/plugins/offlinemsg.c:165
-#: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
-#: ../libpurple/protocols/novell/novell.c:1917
+#: ../libpurple/protocols/msn/dialog.c:141
+#: ../libpurple/protocols/msn/msn.c:665
+#: ../libpurple/protocols/msnp9/dialog.c:133
+#: ../libpurple/protocols/msnp9/msn.c:550
+#: ../libpurple/protocols/msnp9/msn.c:564
+#: ../libpurple/protocols/novell/novell.c:1928
 #: ../libpurple/protocols/silc/buddy.c:317
-#: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
+#: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:308
 #: ../libpurple/protocols/silc10/buddy.c:314
 #: ../libpurple/protocols/silc10/pk.c:119
-#: ../libpurple/protocols/silc10/wb.c:304 ../pidgin/gtkrequest.c:268
+#: ../libpurple/protocols/silc10/wb.c:307 ../pidgin/gtkrequest.c:318
 msgid "Yes"
 msgstr "是"
 
 #: ../libpurple/plugins/offlinemsg.c:166
-#: ../libpurple/protocols/msn/dialog.c:134
-#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
-#: ../libpurple/protocols/novell/novell.c:1918
+#: ../libpurple/protocols/msn/dialog.c:142
+#: ../libpurple/protocols/msn/msn.c:665
+#: ../libpurple/protocols/msnp9/dialog.c:134
+#: ../libpurple/protocols/msnp9/msn.c:550
+#: ../libpurple/protocols/msnp9/msn.c:564
+#: ../libpurple/protocols/novell/novell.c:1929
 #: ../libpurple/protocols/silc/buddy.c:318
-#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
+#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:309
 #: ../libpurple/protocols/silc10/buddy.c:315
 #: ../libpurple/protocols/silc10/pk.c:120
-#: ../libpurple/protocols/silc10/wb.c:305 ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/silc10/wb.c:308 ../pidgin/gtkrequest.c:319
 msgid "No"
 msgstr "否"
 
@@ -3398,9 +3449,7 @@
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
 "This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
-msgstr ""
-"對方一開始與你交談,就立即打開交談視窗。適用於 AIM、ICQ、XMPP、Sametime 及 "
-"Yahoo。"
+msgstr "對方一開始與你交談,就立即打開交談視窗。適用於 AIM、ICQ、XMPP、Sametime 及 Yahoo。"
 
 #: ../libpurple/plugins/psychic.c:72
 msgid "You feel a disturbance in the force..."
@@ -3414,7 +3463,7 @@
 msgid "Disable when away"
 msgstr "離開時停用"
 
-# FIXME 譯文有待改進 - 20061027
+# FIXME 譯文有待改進 - 20061027
 #: ../libpurple/plugins/psychic.c:100
 msgid "Display notification message in conversations"
 msgstr "在交談內顯示通知訊息"
@@ -3429,7 +3478,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/signals-test.c:711
+#: ../libpurple/plugins/signals-test.c:753
 msgid "Signals Test"
 msgstr "信號測試"
 
@@ -3437,8 +3486,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/signals-test.c:714
-#: ../libpurple/plugins/signals-test.c:716
+#: ../libpurple/plugins/signals-test.c:756
+#: ../libpurple/plugins/signals-test.c:758
 msgid "Test to see that all signals are working properly."
 msgstr "檢查各種信號是否都能正常運作。"
 
@@ -3461,10 +3510,10 @@
 msgstr "用來測試是否大部份的東西都能正常運作。"
 
 #. Scheme name
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:902
-#: ../libpurple/plugins/ssl/ssl-nss.c:725
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:911
+#: ../libpurple/plugins/ssl/ssl-nss.c:731
 msgid "X.509 Certificates"
-msgstr ""
+msgstr "X.509 證書"
 
 #. *< type
 #. *< ui_requirement
@@ -3472,7 +3521,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:986
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:995
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -3480,8 +3529,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:989
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:991
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:998
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:1000
 msgid "Provides SSL support through GNUTLS."
 msgstr "透過 GNUTLS 提供 SSL 的支援。"
 
@@ -3491,7 +3540,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:810
+#: ../libpurple/plugins/ssl/ssl-nss.c:816
 msgid "NSS"
 msgstr "NSS"
 
@@ -3499,8 +3548,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:813
-#: ../libpurple/plugins/ssl/ssl-nss.c:815
+#: ../libpurple/plugins/ssl/ssl-nss.c:819
+#: ../libpurple/plugins/ssl/ssl-nss.c:821
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "透過 Mozilla 的 NSS 提供 SSL 的支援。"
 
@@ -3584,67 +3633,72 @@
 "idle."
 msgstr "在交談視窗中顯示好友離開或是由離開(閒置)返回的通知訊息。"
 
-#: ../libpurple/plugins/tcl/tcl.c:421
+#: ../libpurple/plugins/tcl/tcl.c:423
 msgid "Tcl Plugin Loader"
 msgstr "Tcl 模組載入器"
 
-#: ../libpurple/plugins/tcl/tcl.c:423 ../libpurple/plugins/tcl/tcl.c:424
+#: ../libpurple/plugins/tcl/tcl.c:425 ../libpurple/plugins/tcl/tcl.c:426
 msgid "Provides support for loading Tcl plugins"
 msgstr "提供讀入 Tcl 模組的支援"
 
-#: ../libpurple/plugins/tcl/tcl.c:507
+#: ../libpurple/plugins/tcl/tcl.c:509
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
-msgstr ""
-"找不到 ActiveTCL;如果打算使用 TCL 寫成的模組,請到 http://www.activestate."
-"com 下載及安裝 ActiveTCL。\n"
-
-#. Send a message about the connection error
-#: ../libpurple/protocols/bonjour/bonjour.c:112
+msgstr "找不到 ActiveTCL;如果打算使用 TCL 寫成的模組,請到 http://www.activestate.com 下載及安裝 ActiveTCL。\n"
+
+# FIXME 沒有譯「toolkit」- 20071023 acli
+#: ../libpurple/protocols/bonjour/bonjour.c:107
+msgid ""
+"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://"
+"developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-"
+"LocalMessaging for more information."
+msgstr "找不到 Apple 的 Bonjour For Windows toolkit,詳情請到網址 http://developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-LocalMessaging 查閱 FAQ 部分。"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:126
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "無法接收連入的即時訊息連線\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:137
+#: ../libpurple/protocols/bonjour/bonjour.c:153
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr "無法與近端的 mDNS 伺服器建立連線。它在執行中嗎?"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:351
-#: ../libpurple/protocols/bonjour/bonjour.c:656
-#: ../libpurple/protocols/gg/gg.c:632
-#: ../libpurple/protocols/jabber/jabber.c:942
+#: ../libpurple/protocols/bonjour/bonjour.c:369
+#: ../libpurple/protocols/bonjour/bonjour.c:674
+#: ../libpurple/protocols/gg/gg.c:633
+#: ../libpurple/protocols/jabber/jabber.c:969
 msgid "First name"
 msgstr "名"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:353
-#: ../libpurple/protocols/bonjour/bonjour.c:659
-#: ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/jabber/jabber.c:947
+#: ../libpurple/protocols/bonjour/bonjour.c:371
+#: ../libpurple/protocols/bonjour/bonjour.c:677
+#: ../libpurple/protocols/gg/gg.c:628
+#: ../libpurple/protocols/jabber/jabber.c:974
 msgid "Last name"
 msgstr "姓"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:357
+#: ../libpurple/protocols/bonjour/bonjour.c:375
 #: ../libpurple/protocols/jabber/buddy.c:295
 #: ../libpurple/protocols/jabber/buddy.c:1325
 #: ../libpurple/protocols/jabber/buddy.c:1335
-#: ../libpurple/protocols/jabber/buddy.c:2216
+#: ../libpurple/protocols/jabber/buddy.c:2219
 #: ../libpurple/protocols/silc/ops.c:1041
-#: ../libpurple/protocols/silc/util.c:555
+#: ../libpurple/protocols/silc/util.c:561
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
 msgid "E-Mail"
 msgstr "電子郵件"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:360
-#: ../libpurple/protocols/bonjour/bonjour.c:665
+#: ../libpurple/protocols/bonjour/bonjour.c:378
+#: ../libpurple/protocols/bonjour/bonjour.c:683
 msgid "AIM Account"
 msgstr "AIM 帳號"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:363
-#: ../libpurple/protocols/bonjour/bonjour.c:668
+#: ../libpurple/protocols/bonjour/bonjour.c:381
+#: ../libpurple/protocols/bonjour/bonjour.c:686
 msgid "XMPP Account"
 msgstr "XMPP 帳號"
 
@@ -3658,113 +3712,114 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:467
-#: ../libpurple/protocols/bonjour/bonjour.c:469
+#: ../libpurple/protocols/bonjour/bonjour.c:485
+#: ../libpurple/protocols/bonjour/bonjour.c:487
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour 協定模組"
 
-#  XXX 這原文很奇怪 - ambrose 20070414
-#  NOTE 對應 evolution PO 檔之譯法,詳見上面「Local Addressbook」條
-#: ../libpurple/protocols/bonjour/bonjour.c:610
+#  XXX 這原文很奇怪 - ambrose 20070414
+#  NOTE 對應 evolution PO 檔之譯法,詳見上面「Local Addressbook」條
+#: ../libpurple/protocols/bonjour/bonjour.c:628
 msgid "Purple Person"
 msgstr "聯絡人"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:662
-#: ../libpurple/protocols/gg/gg.c:477
-#: ../libpurple/protocols/jabber/jabber.c:932
-#: ../libpurple/protocols/silc/silc.c:770
-#: ../libpurple/protocols/silc/silc.c:1011
+#: ../libpurple/protocols/bonjour/bonjour.c:680
+#: ../libpurple/protocols/gg/gg.c:478
+#: ../libpurple/protocols/jabber/jabber.c:959
+#: ../libpurple/protocols/silc/silc.c:913
+#: ../libpurple/protocols/silc/silc.c:1154
 #: ../libpurple/protocols/silc10/silc.c:681
 #: ../libpurple/protocols/silc10/silc.c:922
 msgid "E-mail"
 msgstr "電子郵件"
 
-# NOTE 這是通訊協定名稱,不是問候語
+# NOTE 這是通訊協定名稱,不是問候語
 #: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:380
+#: ../libpurple/protocols/bonjour/jabber.c:381
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s 已經關閉這個交談。"
 
-#: ../libpurple/protocols/bonjour/jabber.c:437
-#: ../libpurple/protocols/bonjour/jabber.c:660
-#: ../libpurple/protocols/bonjour/jabber.c:678
+#: ../libpurple/protocols/bonjour/jabber.c:439
+#: ../libpurple/protocols/bonjour/jabber.c:672
+#: ../libpurple/protocols/bonjour/jabber.c:690
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "無法送出訊息,交談無法開始。"
 
-#: ../libpurple/protocols/bonjour/jabber.c:583
+#: ../libpurple/protocols/bonjour/jabber.c:589
 msgid "Cannot open socket"
 msgstr "無法開啟Socket"
 
-#: ../libpurple/protocols/bonjour/jabber.c:591
+#: ../libpurple/protocols/bonjour/jabber.c:599
 msgid "Error setting socket options"
 msgstr "設定 Socket 選項時錯誤"
 
-#: ../libpurple/protocols/bonjour/jabber.c:615
+#: ../libpurple/protocols/bonjour/jabber.c:625
 msgid "Could not bind socket to port"
 msgstr "無法聯結 Socket 到通訊埠"
 
-#: ../libpurple/protocols/bonjour/jabber.c:623
+#: ../libpurple/protocols/bonjour/jabber.c:635
 msgid "Could not listen on socket"
 msgstr "無法監聽 Socket"
 
-#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1829
+#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1845
 msgid "Invalid proxy settings"
 msgstr "無效的代理伺服器設定"
 
-#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1829
+#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1845
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
-msgstr ""
-"對於你目前所設定的代理伺服器型態來說,你所指定的伺服器名稱及通訊埠是無效的"
+msgstr "對於你目前所設定的代理伺服器型態來說,你所指定的伺服器名稱及通訊埠是無效的"
 
 #: ../libpurple/protocols/gg/gg.c:115 ../libpurple/protocols/gg/gg.c:137
 #: ../libpurple/protocols/gg/gg.c:180
 msgid "Token Error"
-msgstr "Token 錯誤"
+msgstr "符記錯誤"
 
 #: ../libpurple/protocols/gg/gg.c:116 ../libpurple/protocols/gg/gg.c:138
 #: ../libpurple/protocols/gg/gg.c:181
 msgid "Unable to fetch the token.\n"
-msgstr "無法取得 Token。\n"
-
-#: ../libpurple/protocols/gg/gg.c:269 ../libpurple/protocols/gg/gg.c:288
+msgstr "無法取得符記。\n"
+
+#: ../libpurple/protocols/gg/gg.c:267 ../libpurple/protocols/gg/gg.c:274
+#: ../libpurple/protocols/gg/gg.c:280
 msgid "Save Buddylist..."
 msgstr "儲存好友清單..."
 
-#: ../libpurple/protocols/gg/gg.c:270
+#: ../libpurple/protocols/gg/gg.c:268
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr "你的好友清單是空的,所以沒有資料被寫入檔案中。"
 
-#: ../libpurple/protocols/gg/gg.c:276 ../libpurple/protocols/gg/gg.c:278
-msgid "Couldn't open file"
-msgstr "無法開啟檔案"
-
-#: ../libpurple/protocols/gg/gg.c:289
+#: ../libpurple/protocols/gg/gg.c:275
 msgid "Buddylist saved successfully!"
 msgstr "好友清單儲存成功!"
 
-#: ../libpurple/protocols/gg/gg.c:307 ../libpurple/protocols/gg/gg.c:308
+#: ../libpurple/protocols/gg/gg.c:278
+#, c-format
+msgid "Couldn't write buddy list for %s to %s"
+msgstr "無法把 %s 的好友清單寫入至檔案「%s」"
+
+#: ../libpurple/protocols/gg/gg.c:303 ../libpurple/protocols/gg/gg.c:304
 msgid "Couldn't load buddylist"
 msgstr "無法讀入好友清單"
 
-#: ../libpurple/protocols/gg/gg.c:324
+#: ../libpurple/protocols/gg/gg.c:320
 msgid "Load Buddylist..."
 msgstr "讀取好友清單..."
 
-#: ../libpurple/protocols/gg/gg.c:325
+#: ../libpurple/protocols/gg/gg.c:321
 msgid "Buddylist loaded successfully!"
 msgstr "好友清單讀取成功!"
 
-#: ../libpurple/protocols/gg/gg.c:336
+#: ../libpurple/protocols/gg/gg.c:332
 msgid "Save buddylist..."
 msgstr "儲存好友清單..."
 
-#: ../libpurple/protocols/gg/gg.c:384
+#: ../libpurple/protocols/gg/gg.c:382
 msgid "Fill in the registration fields."
 msgstr "填寫註冊資料欄位。"
 
@@ -3772,306 +3827,311 @@
 msgid "Passwords do not match."
 msgstr "新密碼並不相符。"
 
-#: ../libpurple/protocols/gg/gg.c:398
+#: ../libpurple/protocols/gg/gg.c:399
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "無法註冊新帳號。錯誤發生。\n"
 
-#: ../libpurple/protocols/gg/gg.c:411
-msgid "New Gadu-Gadu Account Registered"
-msgstr "新的 Gadu-Gadu 帳號已註冊"
-
 #: ../libpurple/protocols/gg/gg.c:412
+msgid "New Gadu-Gadu Account Registered"
+msgstr "新的 Gadu-Gadu 帳號已註冊"
+
+#: ../libpurple/protocols/gg/gg.c:413
 msgid "Registration completed successfully!"
 msgstr "註冊成功!"
 
-#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
-#: ../libpurple/protocols/jabber/jabber.c:913
-#: ../libpurple/protocols/jabber/jabber.c:916
-#: ../libpurple/protocols/jabber/jabber.c:1722
+#: ../libpurple/protocols/gg/gg.c:483 ../libpurple/protocols/gg/gg.c:776
+#: ../libpurple/protocols/jabber/jabber.c:940
+#: ../libpurple/protocols/jabber/jabber.c:943
+#: ../libpurple/protocols/jabber/jabber.c:1731
 msgid "Password"
 msgstr "密碼"
 
-#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
+#: ../libpurple/protocols/gg/gg.c:488 ../libpurple/protocols/gg/gg.c:781
 msgid "Password (retype)"
 msgstr "密碼(再次輸入)"
 
-#: ../libpurple/protocols/gg/gg.c:492 ../libpurple/protocols/gg/gg.c:785
+#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:786
 msgid "Enter current token"
 msgstr "輸入目前的密碼"
 
-#: ../libpurple/protocols/gg/gg.c:498 ../libpurple/protocols/gg/gg.c:791
+#: ../libpurple/protocols/gg/gg.c:499 ../libpurple/protocols/gg/gg.c:792
 msgid "Current token"
 msgstr "目前密碼"
 
-#: ../libpurple/protocols/gg/gg.c:502 ../libpurple/protocols/gg/gg.c:503
+#: ../libpurple/protocols/gg/gg.c:503 ../libpurple/protocols/gg/gg.c:504
 msgid "Register New Gadu-Gadu Account"
 msgstr "註冊新的 Gadu-Gadu 帳號"
 
-#: ../libpurple/protocols/gg/gg.c:504
+#: ../libpurple/protocols/gg/gg.c:505
 msgid "Please, fill in the following fields"
 msgstr "請輸入以下的欄位"
 
-#: ../libpurple/protocols/gg/gg.c:642 ../libpurple/protocols/gg/gg.c:1054
-#: ../libpurple/protocols/gg/gg.c:1126
-#: ../libpurple/protocols/jabber/jabber.c:957
-#: ../libpurple/protocols/oscar/oscar.c:3789
-#: ../libpurple/protocols/oscar/oscar.c:3802
+#: ../libpurple/protocols/gg/gg.c:643 ../libpurple/protocols/gg/gg.c:1056
+#: ../libpurple/protocols/gg/gg.c:1128
+#: ../libpurple/protocols/jabber/jabber.c:984
+#: ../libpurple/protocols/oscar/oscar.c:3799
+#: ../libpurple/protocols/oscar/oscar.c:3812
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "城市"
 
-#: ../libpurple/protocols/gg/gg.c:647
+#: ../libpurple/protocols/gg/gg.c:648
 msgid "Year of birth"
 msgstr "出生年"
 
-#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1589
-#: ../libpurple/protocols/myspace/user.c:115
-#: ../libpurple/protocols/oscar/oscar.c:3732
+#: ../libpurple/protocols/gg/gg.c:651 ../libpurple/protocols/msn/msn.c:1737
+#: ../libpurple/protocols/msnp9/msn.c:1590
+#: ../libpurple/protocols/myspace/user.c:119
+#: ../libpurple/protocols/oscar/oscar.c:3742
 #: ../libpurple/protocols/qq/buddy_info.c:46
-#: ../libpurple/protocols/qq/qq.c:226 ../libpurple/protocols/qq/qq.c:229
-#: ../libpurple/protocols/qq/qq.c:232 ../libpurple/protocols/qq/qq.c:236
+#: ../libpurple/protocols/qq/qq.c:227 ../libpurple/protocols/qq/qq.c:230
+#: ../libpurple/protocols/qq/qq.c:233 ../libpurple/protocols/qq/qq.c:237
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1091
 msgid "Gender"
 msgstr "性別"
 
-#: ../libpurple/protocols/gg/gg.c:651
+#: ../libpurple/protocols/gg/gg.c:652
 msgid "Male or female"
 msgstr "男性或女性"
 
-#: ../libpurple/protocols/gg/gg.c:652
-#: ../libpurple/protocols/oscar/oscar.c:3732
-#: ../libpurple/protocols/qq/buddy_info.c:83
-#: ../libpurple/protocols/qq/qq.c:226
-msgid "Male"
-msgstr "男"
-
 #: ../libpurple/protocols/gg/gg.c:653
-#: ../libpurple/protocols/oscar/oscar.c:3732
+#: ../libpurple/protocols/oscar/oscar.c:3742
+#: ../libpurple/protocols/qq/buddy_info.c:83
+#: ../libpurple/protocols/qq/qq.c:227
+msgid "Male"
+msgstr "男"
+
+#: ../libpurple/protocols/gg/gg.c:654
+#: ../libpurple/protocols/oscar/oscar.c:3742
 #: ../libpurple/protocols/qq/buddy_info.c:84
-#: ../libpurple/protocols/qq/qq.c:229
+#: ../libpurple/protocols/qq/qq.c:230
 msgid "Female"
 msgstr "女"
 
-#: ../libpurple/protocols/gg/gg.c:657
+#: ../libpurple/protocols/gg/gg.c:658
 msgid "Only online"
 msgstr "只有上線"
 
-#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:662
+#: ../libpurple/protocols/gg/gg.c:662 ../libpurple/protocols/gg/gg.c:663
 msgid "Find buddies"
 msgstr "搜尋好友"
 
-#: ../libpurple/protocols/gg/gg.c:663
+#: ../libpurple/protocols/gg/gg.c:664
 msgid "Please, enter your search criteria below"
 msgstr "請在下方輸入你的搜尋條件"
 
-#: ../libpurple/protocols/gg/gg.c:701
+#: ../libpurple/protocols/gg/gg.c:702
 msgid "Fill in the fields."
 msgstr "填到欄位中。"
 
-#: ../libpurple/protocols/gg/gg.c:713
+#: ../libpurple/protocols/gg/gg.c:714
 msgid "Your current password is different from the one that you specified."
 msgstr "你目前所提供的密碼與指定的帳號不符。"
 
-#: ../libpurple/protocols/gg/gg.c:727
+#: ../libpurple/protocols/gg/gg.c:728
 msgid "Unable to change password. Error occurred.\n"
 msgstr "無法修改密碼。錯誤發生。\n"
 
-#: ../libpurple/protocols/gg/gg.c:736
-msgid "Change password for the Gadu-Gadu account"
-msgstr "更改 Gadu-Gadu 帳號的密碼"
-
 #: ../libpurple/protocols/gg/gg.c:737
+msgid "Change password for the Gadu-Gadu account"
+msgstr "更改 Gadu-Gadu 帳號的密碼"
+
+#: ../libpurple/protocols/gg/gg.c:738
 msgid "Password was changed successfully!"
 msgstr "密碼修改成功!"
 
-#: ../libpurple/protocols/gg/gg.c:770
+#: ../libpurple/protocols/gg/gg.c:771
 msgid "Current password"
 msgstr "舊密碼"
 
-#: ../libpurple/protocols/gg/gg.c:795
+#: ../libpurple/protocols/gg/gg.c:796
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "請輸入你的舊密碼及你的新密碼:"
 
-#: ../libpurple/protocols/gg/gg.c:799 ../libpurple/protocols/gg/gg.c:800
+#: ../libpurple/protocols/gg/gg.c:800 ../libpurple/protocols/gg/gg.c:801
 msgid "Change Gadu-Gadu Password"
 msgstr "更改 Gadu-Gadu 密碼"
 
-#: ../libpurple/protocols/gg/gg.c:876
+#: ../libpurple/protocols/gg/gg.c:878
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "選取一個聊天室給好友;%s"
 
-#: ../libpurple/protocols/gg/gg.c:879 ../libpurple/protocols/gg/gg.c:880
+#: ../libpurple/protocols/gg/gg.c:881 ../libpurple/protocols/gg/gg.c:882
 msgid "Add to chat..."
 msgstr "新增到聊天室..."
 
-#: ../libpurple/protocols/gg/gg.c:1008
-#: ../libpurple/protocols/jabber/buddy.c:2031
-#: ../libpurple/protocols/novell/novell.c:2828
+#: ../libpurple/protocols/gg/gg.c:1010
+#: ../libpurple/protocols/jabber/buddy.c:2034
+#: ../libpurple/protocols/novell/novell.c:2845
 #: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:5604
-#: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
-#: ../libpurple/protocols/qq/qq.c:292
-#: ../libpurple/protocols/yahoo/yahoo.c:3099 ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:3104 ../pidgin/gtkblist.c:3436
-#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1061
+#: ../libpurple/protocols/oscar/oscar.c:5654
+#: ../libpurple/protocols/qq/qq.c:171 ../libpurple/protocols/qq/qq.c:178
+#: ../libpurple/protocols/qq/qq.c:293
+#: ../libpurple/protocols/yahoo/yahoo.c:3110 ../libpurple/status.c:154
+#: ../pidgin/gtkblist.c:3338 ../pidgin/gtkblist.c:3676
+#: ../pidgin/gtkdocklet.c:561 ../pidgin/gtkstatusbox.c:1061
 msgid "Offline"
 msgstr "離線"
 
-#: ../libpurple/protocols/gg/gg.c:1011
-#: ../libpurple/protocols/jabber/buddy.c:2033
+#: ../libpurple/protocols/gg/gg.c:1013
+#: ../libpurple/protocols/jabber/buddy.c:2036
 #: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
 #: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
-#: ../libpurple/protocols/novell/novell.c:2816
-#: ../libpurple/protocols/qq/qq.c:280
-#: ../libpurple/protocols/yahoo/yahoo.c:3101 ../libpurple/status.c:155
-#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1057
+#: ../libpurple/protocols/msnp9/state.c:29
+#: ../libpurple/protocols/msnp9/state.c:30
+#: ../libpurple/protocols/msnp9/state.c:37
+#: ../libpurple/protocols/msnp9/state.c:38
+#: ../libpurple/protocols/novell/novell.c:2833
+#: ../libpurple/protocols/qq/qq.c:281
+#: ../libpurple/protocols/yahoo/yahoo.c:3112 ../libpurple/status.c:155
+#: ../pidgin/gtkdocklet.c:545 ../pidgin/gtkstatusbox.c:1057
 msgid "Available"
 msgstr "上線"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#: ../libpurple/protocols/gg/gg.c:1014 ../libpurple/protocols/irc/irc.c:528
+#: ../libpurple/protocols/gg/gg.c:1016 ../libpurple/protocols/irc/irc.c:537
 #: ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/buddy.c:2037
-#: ../libpurple/protocols/novell/novell.c:2819
+#: ../libpurple/protocols/jabber/buddy.c:2040
+#: ../libpurple/protocols/novell/novell.c:2836
 #: ../libpurple/protocols/oscar/oscar.c:733
-#: ../libpurple/protocols/oscar/oscar.c:4547
-#: ../libpurple/protocols/oscar/oscar.c:5632
-#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/qq/qq.c:284
-#: ../libpurple/protocols/silc/buddy.c:1476
-#: ../libpurple/protocols/silc10/buddy.c:1476
-#: ../libpurple/protocols/yahoo/yahoo.c:3653
-#: ../libpurple/protocols/yahoo/yahoo.c:3727 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1939
+#: ../libpurple/protocols/oscar/oscar.c:4557
+#: ../libpurple/protocols/oscar/oscar.c:5682
+#: ../libpurple/protocols/qq/qq.c:181 ../libpurple/protocols/qq/qq.c:285
+#: ../libpurple/protocols/silc/buddy.c:1479
+#: ../libpurple/protocols/silc10/buddy.c:1479
+#: ../libpurple/protocols/yahoo/yahoo.c:3664
+#: ../libpurple/protocols/yahoo/yahoo.c:3738 ../libpurple/status.c:158
+#: ../pidgin/gtkdocklet.c:549 ../pidgin/gtkprefs.c:2040
 #: ../pidgin/gtkstatusbox.c:1058
-#, c-format
 msgid "Away"
 msgstr "離開"
 
-#: ../libpurple/protocols/gg/gg.c:1043 ../libpurple/protocols/gg/gg.c:1117
-#: ../libpurple/protocols/oscar/oscar.c:2699
-#: ../libpurple/protocols/oscar/oscar.c:3699
+#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1119
+#: ../libpurple/protocols/oscar/oscar.c:2709
+#: ../libpurple/protocols/oscar/oscar.c:3709
 msgid "UIN"
 msgstr "帳號"
 
-#: ../libpurple/protocols/gg/gg.c:1046 ../libpurple/protocols/gg/gg.c:1120
-#: ../libpurple/protocols/jabber/buddy.c:2210
-#: ../libpurple/protocols/jabber/buddy.c:2386
-#: ../libpurple/protocols/oscar/oscar.c:3710
+#: ../libpurple/protocols/gg/gg.c:1048 ../libpurple/protocols/gg/gg.c:1122
+#: ../libpurple/protocols/jabber/buddy.c:2213
+#: ../libpurple/protocols/jabber/buddy.c:2399
+#: ../libpurple/protocols/oscar/oscar.c:3720
 #: ../libpurple/protocols/silc/ops.c:990
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "名"
 
-#: ../libpurple/protocols/gg/gg.c:1059 ../libpurple/protocols/gg/gg.c:1129
+#: ../libpurple/protocols/gg/gg.c:1061 ../libpurple/protocols/gg/gg.c:1131
 msgid "Birth Year"
 msgstr "出生年"
 
-#: ../libpurple/protocols/gg/gg.c:1111 ../libpurple/protocols/gg/gg.c:1180
-#: ../libpurple/protocols/oscar/oscar.c:3911
+#: ../libpurple/protocols/gg/gg.c:1113 ../libpurple/protocols/gg/gg.c:1182
+#: ../libpurple/protocols/oscar/oscar.c:3921
 msgid "Unable to display the search results."
 msgstr "無法顯示搜尋結果。"
 
-# FIXME 這不像對,要覆查 - 20061028
-#: ../libpurple/protocols/gg/gg.c:1171
+# FIXME 這不像對,要覆查 - 20061028
+#: ../libpurple/protocols/gg/gg.c:1173
 msgid "Gadu-Gadu Public Directory"
 msgstr "Gadu-Gadu 公共字典"
 
-#: ../libpurple/protocols/gg/gg.c:1172
+#: ../libpurple/protocols/gg/gg.c:1174
 msgid "Search results"
 msgstr "搜尋結果"
 
-#: ../libpurple/protocols/gg/gg.c:1215
+#: ../libpurple/protocols/gg/gg.c:1217
 msgid "No matching users found"
 msgstr "找不到符合的使用者"
 
-#: ../libpurple/protocols/gg/gg.c:1216
+#: ../libpurple/protocols/gg/gg.c:1218
 msgid "There are no users matching your search criteria."
-msgstr "無法根據搜尋條件找到相符的使用者。"
-
-#: ../libpurple/protocols/gg/gg.c:1310 ../libpurple/protocols/gg/gg.c:1463
+msgstr "無法根據照搜尋條件找到相符的使用者。"
+
+#: ../libpurple/protocols/gg/gg.c:1314 ../libpurple/protocols/gg/gg.c:1469
 msgid "Unable to read socket"
 msgstr "無法讀取 Socket"
 
-#: ../libpurple/protocols/gg/gg.c:1395
+#: ../libpurple/protocols/gg/gg.c:1399
 msgid "Buddy list downloaded"
 msgstr "下載好友清單"
 
-#: ../libpurple/protocols/gg/gg.c:1396
+#: ../libpurple/protocols/gg/gg.c:1400
 msgid "Your buddy list was downloaded from the server."
 msgstr "你已從伺服器下載好友清單。"
 
-#: ../libpurple/protocols/gg/gg.c:1403
+#: ../libpurple/protocols/gg/gg.c:1407
 msgid "Buddy list uploaded"
 msgstr "上傳好友清單"
 
-#: ../libpurple/protocols/gg/gg.c:1404
+#: ../libpurple/protocols/gg/gg.c:1408
 msgid "Your buddy list was stored on the server."
 msgstr "你的好友清單已被存放於伺服器上。"
 
-#: ../libpurple/protocols/gg/gg.c:1509 ../libpurple/protocols/gg/gg.c:1715
+#: ../libpurple/protocols/gg/gg.c:1517 ../libpurple/protocols/gg/gg.c:1725
 msgid "Connection failed."
 msgstr "連線失敗。"
 
-#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/msn/msn.c:559
+#: ../libpurple/protocols/gg/gg.c:1629 ../libpurple/protocols/msn/msn.c:664
+#: ../libpurple/protocols/msnp9/msn.c:563
 msgid "Blocked"
 msgstr "封鎖"
 
-#: ../libpurple/protocols/gg/gg.c:1644
+#: ../libpurple/protocols/gg/gg.c:1652
 msgid "Add to chat"
 msgstr "新增到聊天室"
 
-#: ../libpurple/protocols/gg/gg.c:1653
+#: ../libpurple/protocols/gg/gg.c:1661
 msgid "Unblock"
 msgstr "解除封鎖"
 
-#: ../libpurple/protocols/gg/gg.c:1657
+#: ../libpurple/protocols/gg/gg.c:1665
 msgid "Block"
 msgstr "封鎖"
 
-#: ../libpurple/protocols/gg/gg.c:1674
+#: ../libpurple/protocols/gg/gg.c:1682
 msgid "Chat _name:"
 msgstr "聊天室名稱(_N):"
 
-#: ../libpurple/protocols/gg/gg.c:1914
+#: ../libpurple/protocols/gg/gg.c:1933
 msgid "Chat error"
 msgstr "聊天錯誤"
 
-#: ../libpurple/protocols/gg/gg.c:1915
+#: ../libpurple/protocols/gg/gg.c:1934
 msgid "This chat name is already in use"
 msgstr "聊天室名稱正在使用中"
 
-#: ../libpurple/protocols/gg/gg.c:1998
+#: ../libpurple/protocols/gg/gg.c:2019
 msgid "Not connected to the server."
 msgstr "尚未連線到伺服器。"
 
-#: ../libpurple/protocols/gg/gg.c:2021
+#: ../libpurple/protocols/gg/gg.c:2042
 msgid "Find buddies..."
 msgstr "尋找好友..."
 
-#: ../libpurple/protocols/gg/gg.c:2027
+#: ../libpurple/protocols/gg/gg.c:2048
 msgid "Change password..."
 msgstr "修改密碼..."
 
-#: ../libpurple/protocols/gg/gg.c:2033
+#: ../libpurple/protocols/gg/gg.c:2054
 msgid "Upload buddylist to Server"
 msgstr "上傳好友清單到伺服器"
 
-#: ../libpurple/protocols/gg/gg.c:2037
+#: ../libpurple/protocols/gg/gg.c:2058
 msgid "Download buddylist from Server"
 msgstr "自伺服器下載好友清單"
 
-#: ../libpurple/protocols/gg/gg.c:2041
+#: ../libpurple/protocols/gg/gg.c:2062
 msgid "Delete buddylist from Server"
 msgstr "將伺服器上的好友清單刪除"
 
-#: ../libpurple/protocols/gg/gg.c:2045
+#: ../libpurple/protocols/gg/gg.c:2066
 msgid "Save buddylist to file..."
 msgstr "儲存好友清單到檔案中..."
 
-#: ../libpurple/protocols/gg/gg.c:2049
+#: ../libpurple/protocols/gg/gg.c:2070
 msgid "Load buddylist from file..."
 msgstr "自檔案讀取好友清單..."
 
@@ -4086,38 +4146,38 @@
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2153
+#: ../libpurple/protocols/gg/gg.c:2174
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu 協定模組"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2154
+#: ../libpurple/protocols/gg/gg.c:2175
 msgid "Polish popular IM"
 msgstr "波蘭廣受歡迎的即時通訊程式"
 
-#: ../libpurple/protocols/gg/gg.c:2208
+#: ../libpurple/protocols/gg/gg.c:2229
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu 使用者"
 
 #: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1637
-#: ../libpurple/protocols/silc10/silc.c:1566
+#: ../libpurple/protocols/silc/silc.c:1780
+#: ../libpurple/protocols/silc10/silc.c:1569
 #, c-format
 msgid "Unknown command: %s"
 msgstr "未知的指令:%s"
 
 #: ../libpurple/protocols/irc/cmds.c:503
 #: ../libpurple/protocols/jabber/chat.c:591
-#: ../libpurple/protocols/silc/silc.c:1345
-#: ../libpurple/protocols/silc10/silc.c:1274
+#: ../libpurple/protocols/silc/silc.c:1488
+#: ../libpurple/protocols/silc10/silc.c:1277
 #, c-format
 msgid "current topic is: %s"
 msgstr "現在的主題為:%s"
 
 #: ../libpurple/protocols/irc/cmds.c:507
 #: ../libpurple/protocols/jabber/chat.c:595
-#: ../libpurple/protocols/silc/silc.c:1349
-#: ../libpurple/protocols/silc10/silc.c:1278
+#: ../libpurple/protocols/silc/silc.c:1492
+#: ../libpurple/protocols/silc10/silc.c:1281
 msgid "No topic is set"
 msgstr "沒有設定主題"
 
@@ -4151,85 +4211,83 @@
 msgid "MOTD for %s"
 msgstr "%s 的是日訊息"
 
-#: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
-#: ../libpurple/protocols/irc/irc.c:612 ../libpurple/protocols/irc/irc.c:637
-#: ../libpurple/protocols/myspace/myspace.c:2356
+#: ../libpurple/protocols/irc/irc.c:129 ../libpurple/protocols/irc/irc.c:169
+#: ../libpurple/protocols/irc/irc.c:625 ../libpurple/protocols/irc/irc.c:654
+#: ../libpurple/protocols/myspace/myspace.c:2378
 msgid "Server has disconnected"
 msgstr "伺服器已停止連線"
 
-#: ../libpurple/protocols/irc/irc.c:249
+#: ../libpurple/protocols/irc/irc.c:253
 msgid "View MOTD"
 msgstr "顯示是日訊息 (MOTD)"
 
-#: ../libpurple/protocols/irc/irc.c:261 ../libpurple/protocols/silc/chat.c:33
+#: ../libpurple/protocols/irc/irc.c:265 ../libpurple/protocols/silc/chat.c:33
 #: ../libpurple/protocols/silc10/chat.c:33
 msgid "_Channel:"
 msgstr "頻道(_C):"
 
-#: ../libpurple/protocols/irc/irc.c:267
-#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:524
+#: ../libpurple/protocols/irc/irc.c:271
+#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:527
 msgid "_Password:"
 msgstr "密碼(_P):"
 
-#: ../libpurple/protocols/irc/irc.c:298
+#: ../libpurple/protocols/irc/irc.c:304
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC 網名不可含有空白字符"
 
 #. 1. connect to server
 #. connect to the server
-#: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1280
-#: ../libpurple/protocols/msn/session.c:345
-#: ../libpurple/protocols/myspace/myspace.c:301
-#: ../libpurple/protocols/novell/novell.c:2182
-#: ../libpurple/protocols/oscar/oscar.c:1287
+#: ../libpurple/protocols/irc/irc.c:325
+#: ../libpurple/protocols/jabber/jabber.c:1311
+#: ../libpurple/protocols/msn/session.c:402
+#: ../libpurple/protocols/msnp9/session.c:355
+#: ../libpurple/protocols/myspace/myspace.c:302
+#: ../libpurple/protocols/novell/novell.c:2198
+#: ../libpurple/protocols/oscar/oscar.c:1290
 #: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3723
-#: ../libpurple/protocols/simple/simple.c:1716
-#: ../libpurple/protocols/yahoo/yahoo.c:2939
+#: ../libpurple/protocols/sametime/sametime.c:3768
+#: ../libpurple/protocols/simple/simple.c:1893
+#: ../libpurple/protocols/yahoo/yahoo.c:2948
 #: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:662
 msgid "Connecting"
 msgstr "連線中"
 
-# XXX 暫譯
-#: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:610
-#: ../libpurple/protocols/jabber/jabber.c:1095
+# XXX 暫譯
+#: ../libpurple/protocols/irc/irc.c:335
+#: ../libpurple/protocols/jabber/jabber.c:637
+#: ../libpurple/protocols/jabber/jabber.c:1126
 msgid "SSL support unavailable"
 msgstr "沒有 SSL 支援"
 
-#. TODO: try other ports if in auto mode, then save
-#. * working port and try that first next time.
-#: ../libpurple/protocols/irc/irc.c:338
-#: ../libpurple/protocols/myspace/myspace.c:317
-#: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1631
+#: ../libpurple/protocols/irc/irc.c:348
+#: ../libpurple/protocols/myspace/myspace.c:320
+#: ../libpurple/protocols/simple/simple.c:469
+#: ../libpurple/protocols/simple/simple.c:1803
 msgid "Couldn't create socket"
 msgstr "無法建立 Socket"
 
-#: ../libpurple/protocols/irc/irc.c:421
-#: ../libpurple/protocols/myspace/myspace.c:2469
-#: ../libpurple/protocols/oscar/oscar.c:1283
+#: ../libpurple/protocols/irc/irc.c:430
+#: ../libpurple/protocols/oscar/oscar.c:1286
 msgid "Couldn't connect to host"
 msgstr "無法連到伺服器"
 
-# NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
-#: ../libpurple/protocols/irc/irc.c:609 ../libpurple/protocols/irc/irc.c:634
-#: ../libpurple/protocols/myspace/myspace.c:2352
+# NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
+#: ../libpurple/protocols/irc/irc.c:620 ../libpurple/protocols/irc/irc.c:649
+#: ../libpurple/protocols/myspace/myspace.c:2372
 msgid "Read error"
 msgstr "讀取錯誤"
 
-#: ../libpurple/protocols/irc/irc.c:773
-#: ../libpurple/protocols/silc/chat.c:1412
+#: ../libpurple/protocols/irc/irc.c:790
+#: ../libpurple/protocols/silc/chat.c:1398
 #: ../libpurple/protocols/silc10/chat.c:1426
 #: ../libpurple/protocols/yahoo/yahoochat.c:1497
 msgid "Users"
 msgstr "使用者"
 
-#: ../libpurple/protocols/irc/irc.c:776
-#: ../libpurple/protocols/sametime/sametime.c:3374
-#: ../libpurple/protocols/silc/chat.c:1415
-#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/irc/irc.c:793
+#: ../libpurple/protocols/sametime/sametime.c:3416
+#: ../libpurple/protocols/silc/chat.c:1401
+#: ../libpurple/protocols/silc/ops.c:1393
 #: ../libpurple/protocols/silc10/chat.c:1429
 #: ../libpurple/protocols/silc10/ops.c:1382
 #: ../libpurple/protocols/yahoo/yahoochat.c:1506
@@ -4244,55 +4302,57 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:914
+#: ../libpurple/protocols/irc/irc.c:931
 msgid "IRC Protocol Plugin"
 msgstr "IRC 協定模組"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:915
+#: ../libpurple/protocols/irc/irc.c:932
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "較好的 IRC 協定模組"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:940 ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2185
-#: ../libpurple/protocols/oscar/oscar.c:6671
-#: ../libpurple/protocols/qq/qq.c:755
-#: ../libpurple/protocols/sametime/sametime.c:5727
+#: ../libpurple/protocols/irc/irc.c:957 ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/msn/msn.c:2335
+#: ../libpurple/protocols/msnp9/msn.c:2186
+#: ../libpurple/protocols/oscar/oscar.c:6721
+#: ../libpurple/protocols/qq/qq.c:756
+#: ../libpurple/protocols/sametime/sametime.c:5773
 #: ../libpurple/protocols/silc/ops.c:1249
-#: ../libpurple/protocols/silc/ops.c:1341
+#: ../libpurple/protocols/silc/ops.c:1343
 #: ../libpurple/protocols/silc10/ops.c:1244
 #: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1896
+#: ../libpurple/protocols/simple/simple.c:2083
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "伺服器"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2190
-#: ../libpurple/protocols/oscar/oscar.c:6674
-#: ../libpurple/protocols/qq/qq.c:758
-#: ../libpurple/protocols/sametime/sametime.c:5732
-#: ../libpurple/protocols/silc/silc.c:1918
-#: ../libpurple/protocols/silc10/silc.c:1861
+#: ../libpurple/protocols/irc/irc.c:960 ../libpurple/protocols/msn/msn.c:2340
+#: ../libpurple/protocols/msnp9/msn.c:2191
+#: ../libpurple/protocols/oscar/oscar.c:6724
+#: ../libpurple/protocols/qq/qq.c:759
+#: ../libpurple/protocols/sametime/sametime.c:5778
+#: ../libpurple/protocols/silc/silc.c:2061
+#: ../libpurple/protocols/silc10/silc.c:1864
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "通訊埠"
 
-#: ../libpurple/protocols/irc/irc.c:946
+#: ../libpurple/protocols/irc/irc.c:963
 msgid "Encodings"
 msgstr "編碼"
 
-#: ../libpurple/protocols/irc/irc.c:949 ../libpurple/protocols/irc/msgs.c:316
-#: ../libpurple/protocols/jabber/jabber.c:904
-#: ../libpurple/protocols/jabber/jabber.c:907
-#: ../libpurple/protocols/silc/buddy.c:1539
+#: ../libpurple/protocols/irc/irc.c:966 ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/jabber/jabber.c:931
+#: ../libpurple/protocols/jabber/jabber.c:934
+#: ../libpurple/protocols/silc/buddy.c:1542
 #: ../libpurple/protocols/silc/ops.c:1197
 #: ../libpurple/protocols/silc/ops.c:1200
-#: ../libpurple/protocols/silc/ops.c:1334
-#: ../libpurple/protocols/silc/ops.c:1337
-#: ../libpurple/protocols/silc/silc.c:1005
-#: ../libpurple/protocols/silc10/buddy.c:1539
+#: ../libpurple/protocols/silc/ops.c:1336
+#: ../libpurple/protocols/silc/ops.c:1339
+#: ../libpurple/protocols/silc/silc.c:1148
+#: ../libpurple/protocols/silc10/buddy.c:1542
 #: ../libpurple/protocols/silc10/ops.c:1191
 #: ../libpurple/protocols/silc10/ops.c:1194
 #: ../libpurple/protocols/silc10/ops.c:1340
@@ -4301,8 +4361,8 @@
 msgid "Username"
 msgstr "使用者"
 
-#: ../libpurple/protocols/irc/irc.c:952 ../libpurple/protocols/irc/msgs.c:317
-#: ../libpurple/protocols/silc/silc.c:1009
+#: ../libpurple/protocols/irc/irc.c:969 ../libpurple/protocols/irc/msgs.c:317
+#: ../libpurple/protocols/silc/silc.c:1152
 #: ../libpurple/protocols/silc10/silc.c:920
 msgid "Real name"
 msgstr "姓名"
@@ -4311,7 +4371,7 @@
 #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libpurple/protocols/irc/irc.c:960
+#: ../libpurple/protocols/irc/irc.c:977
 msgid "Use SSL"
 msgstr "使用 SSL"
 
@@ -4319,14 +4379,14 @@
 msgid "Bad mode"
 msgstr "模式無效"
 
-# FIXME 這是暫譯
+# FIXME 這是暫譯
 #: ../libpurple/protocols/irc/msgs.c:198
 #, c-format
 msgid "You are banned from %s."
 msgstr "你被禁於 %s 了。"
 
-# FIXME 這是暫譯
-# NOTE 譯文更動 by Paladin
+# FIXME 這是暫譯
+# NOTE 譯文更動 by Paladin
 #: ../libpurple/protocols/irc/msgs.c:199
 msgid "Banned"
 msgstr "被禁止"
@@ -4345,8 +4405,8 @@
 msgstr " <i>(已驗證)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3700
-#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/oscar/oscar.c:3710
+#: ../libpurple/protocols/silc/ops.c:1422
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr "網名"
@@ -4365,7 +4425,7 @@
 msgid "Online since"
 msgstr "上線自"
 
-#  XXX 其實譯得不太對,可以改進一點
+#  XXX 其實譯得不太對,可以改進一點
 #: ../libpurple/protocols/irc/msgs.c:341
 msgid "<b>Defining adjective:</b>"
 msgstr "<b>描述:</b>"
@@ -4374,13 +4434,13 @@
 msgid "Glorious"
 msgstr "光宗耀祖"
 
-# NOTE 新版的IRC prpl起動時不顯示這個;直譯「修改」沒有問題
+# NOTE 新版的IRC prpl起動時不顯示這個;直譯「修改」沒有問題
 #: ../libpurple/protocols/irc/msgs.c:420
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s 把聊天主題修改為:%s"
 
-# NOTE 新版的IRC prpl起動時不顯示這個;直譯「修改」沒有問題
+# NOTE 新版的IRC prpl起動時不顯示這個;直譯「修改」沒有問題
 #: ../libpurple/protocols/irc/msgs.c:422
 #, c-format
 msgid "%s has cleared the topic."
@@ -4449,78 +4509,78 @@
 msgid "Invitation only"
 msgstr "只限被邀請者"
 
-#: ../libpurple/protocols/irc/msgs.c:795
+#: ../libpurple/protocols/irc/msgs.c:798
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "你被 %s 踢出:(%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:800 ../libpurple/protocols/silc/ops.c:699
+#: ../libpurple/protocols/irc/msgs.c:803 ../libpurple/protocols/silc/ops.c:699
 #: ../libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "被 %s 踢出 (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:823
+#: ../libpurple/protocols/irc/msgs.c:826
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "模式 (%s %s) 被 %s 設定"
 
-#: ../libpurple/protocols/irc/msgs.c:908 ../libpurple/protocols/irc/msgs.c:909
+#: ../libpurple/protocols/irc/msgs.c:911 ../libpurple/protocols/irc/msgs.c:912
 msgid "Invalid nickname"
 msgstr "網名無效"
 
-#: ../libpurple/protocols/irc/msgs.c:910
+#: ../libpurple/protocols/irc/msgs.c:913
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr "伺服器拒絕了你所指定的網名,網名中大概含有無效字符。"
 
-#: ../libpurple/protocols/irc/msgs.c:915
+#: ../libpurple/protocols/irc/msgs.c:918
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr "伺服器拒絕了你所指定的帳號名稱,名稱中大概含有無效字符。"
 
-#: ../libpurple/protocols/irc/msgs.c:954
+#: ../libpurple/protocols/irc/msgs.c:957
 msgid "Cannot change nick"
 msgstr "無法更改網名"
 
-#: ../libpurple/protocols/irc/msgs.c:954
+#: ../libpurple/protocols/irc/msgs.c:957
 msgid "Could not change nick"
 msgstr "無法更改網名"
 
-#: ../libpurple/protocols/irc/msgs.c:975
+#: ../libpurple/protocols/irc/msgs.c:978
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "你離開了頻道%s%s"
 
-#: ../libpurple/protocols/irc/msgs.c:1017
+#: ../libpurple/protocols/irc/msgs.c:1020
 msgid "Error: invalid PONG from server"
 msgstr "錯誤:來自伺服器的 PONG 無效"
 
-#: ../libpurple/protocols/irc/msgs.c:1019
+#: ../libpurple/protocols/irc/msgs.c:1022
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING 回答──延遲:%lu秒"
 
-#: ../libpurple/protocols/irc/msgs.c:1110
+#: ../libpurple/protocols/irc/msgs.c:1113
 #, c-format
 msgid "Cannot join %s: Registration is required."
 msgstr "無法加入 %s:必須註冊。"
 
-#: ../libpurple/protocols/irc/msgs.c:1111
+#: ../libpurple/protocols/irc/msgs.c:1114
 #: ../libpurple/protocols/silc/ops.c:1093
 #: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "無法加入頻道"
 
-#  NOTE「暫時無法使用」應該比「暫時不存在」通順
-#: ../libpurple/protocols/irc/msgs.c:1145
+#  NOTE「暫時無法使用」應該比「暫時不存在」通順
+#: ../libpurple/protocols/irc/msgs.c:1148
 msgid "Nick or channel is temporarily unavailable."
 msgstr "暫時無法使用該個網名或頻道。"
 
-#: ../libpurple/protocols/irc/msgs.c:1157
+#: ../libpurple/protocols/irc/msgs.c:1160
 #, c-format
 msgid "Wallops from %s"
 msgstr "來自 %s 的 Wallops"
@@ -4539,63 +4599,49 @@
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv:送出一個指令到 chanserv"
 
-# XXX 暫譯
+# XXX 暫譯
 #: ../libpurple/protocols/irc/parse.c:125
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
-msgstr ""
-"deop &lt;網名1&gt; [網名2] ...:移除某個人的「頻道管理者」權限。你必須具有"
-"「頻道管理者」的權限才能夠執行這個動作。"
+msgstr "deop &lt;網名1&gt; [網名2] ...:移除某個人的「頻道管理者」權限。你必須具有「頻道管理者」的權限才能夠執行這個動作。"
 
 #: ../libpurple/protocols/irc/parse.c:126
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
 "must be a channel operator to do this."
-msgstr ""
-"devoice &lt;網名1&gt; [網名2] ...:移除某個人的「發言」權限。禁止某些人在頻道"
-"中發表不當的言論。你必須具有「頻道管理者」的權限才能夠執行這個動作。"
+msgstr "devoice &lt;網名1&gt; [網名2] ...:移除某個人的「發言」權限。禁止某些人在頻道中發表不當的言論。你必須具有「頻道管理者」的權限才能夠執行這個動作。"
 
 #: ../libpurple/protocols/irc/parse.c:127
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
-msgstr ""
-"invite &lt網名&gt; [聊天室]:邀請某個人來加入你所指定的頻道,或是目前你所在的"
-"頻道。"
+msgstr "invite &lt網名&gt; [聊天室]:邀請某個人來加入你所指定的頻道,或是目前你所在的頻道。"
 
 #: ../libpurple/protocols/irc/parse.c:128
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
-msgstr ""
-"j &lt;聊天室1&gt;[,聊天室2][,...] [密碼匙1[,密碼匙2][,...]]:以指定的密碼匙"
-"(如有給予並有需要)加入所指定的聊天室。"
+msgstr "j &lt;聊天室1&gt;[,聊天室2][,...] [密碼匙1[,密碼匙2][,...]]:以指定的密碼匙(如有給予並有需要)加入所指定的聊天室。"
 
 #: ../libpurple/protocols/irc/parse.c:129
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
-msgstr ""
-"join &lt;聊天室1&gt;[,聊天室2][,...] [密碼匙1[,密碼匙2][,...]]:以指定的密碼"
-"匙(如有給予並有需要)加入所指定的聊天室。"
+msgstr "join &lt;聊天室1&gt;[,聊天室2][,...] [密碼匙1[,密碼匙2][,...]]:以指定的密碼匙(如有給予並有需要)加入所指定的聊天室。"
 
 #: ../libpurple/protocols/irc/parse.c:130
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
-msgstr ""
-"kick &lt;網名&gt; [訊息]:將某個使用者踢出頻道。你必需具有「頻道管理者」權限"
-"才能夠執行這個動作。"
+msgstr "kick &lt;網名&gt; [訊息]:將某個使用者踢出頻道。你必需具有「頻道管理者」權限才能夠執行這個動作。"
 
 #: ../libpurple/protocols/irc/parse.c:131
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
-msgstr ""
-"list:列出目前在網絡上的聊天室清單。<i>請注意,有些伺服器會在你執行了這個動作"
-"之後,強行中止你的連線。</i>"
+msgstr "list:列出目前在網絡上的聊天室清單。<i>請注意,有些伺服器會在你執行了這個動作之後,強行中止你的連線。</i>"
 
 #: ../libpurple/protocols/irc/parse.c:132
 msgid "me &lt;action to perform&gt;:  Perform an action."
@@ -4609,23 +4655,20 @@
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
-msgstr ""
-"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;網名|頻道&gt;:設定或解除頻道╱使用者模式。"
+msgstr "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;網名|頻道&gt;:設定或解除頻道╱使用者模式。"
 
 #: ../libpurple/protocols/irc/parse.c:135
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
-msgstr ""
-"msg &lt;網名&gt; &lt;訊息&gt;:送出一個私人訊息給指定的使用者(避免傳送到公眾"
-"頻道中)。"
+msgstr "msg &lt;網名&gt; &lt;訊息&gt;:送出一個私人訊息給指定的使用者(避免傳送到公眾頻道中)。"
 
 #: ../libpurple/protocols/irc/parse.c:136
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [頻道]:列出目前在頻道中的使用者清單。"
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:2261
+#: ../libpurple/protocols/jabber/jabber.c:2321
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;新網名&gt;:改變你的網名。"
 
@@ -4637,17 +4680,13 @@
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
-msgstr ""
-"op &lt;網名&gt; [網名] ...:賦與某個使用者「頻道管理者」權限。你必須具有「頻"
-"道管理者」權限才能執行這個動作。"
+msgstr "op &lt;網名&gt; [網名] ...:賦與某個使用者「頻道管理者」權限。你必須具有「頻道管理者」權限才能執行這個動作。"
 
 #: ../libpurple/protocols/irc/parse.c:140
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
-msgstr ""
-"operwall &lt;訊息&gt;:如果你不知道這是幹什麼用的,你可能沒有辦法使用這個指"
-"令。"
+msgstr "operwall &lt;訊息&gt;:如果你不知道這是幹什麼用的,你可能沒有辦法使用這個指令。"
 
 #: ../libpurple/protocols/irc/parse.c:141
 msgid "operserv: Send a command to operserv"
@@ -4657,31 +4696,25 @@
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
-msgstr ""
-"part [頻道] [訊息]:離開目前的頻道或指定的頻道。指定頻道時可同時指定送出的訊"
-"息。"
+msgstr "part [頻道] [訊息]:離開目前的頻道或指定的頻道。指定頻道時可同時指定送出的訊息。"
 
 #: ../libpurple/protocols/irc/parse.c:143
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
-msgstr ""
-"ping [網名]:查詢某一個使用者的網絡回應速度(或在沒有指定使用者時,查詢伺服器"
-"的回應速度)。"
+msgstr "ping [網名]:查詢某一個使用者的網絡回應速度(或在沒有指定使用者時,查詢伺服器的回應速度)。"
 
 #: ../libpurple/protocols/irc/parse.c:144
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
-msgstr ""
-"query &lt;網名&gt; &lt;訊息&gt;:送出一個私人訊息給指定的使用者(避免發送到公"
-"眾頻道)。"
+msgstr "query &lt;網名&gt; &lt;訊息&gt;:送出一個私人訊息給指定的使用者(避免發送到公眾頻道)。"
 
 #: ../libpurple/protocols/irc/parse.c:145
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [訊息]:自伺服器離線,並送出指定的訊息。"
 
-# XXX 暫譯
+# XXX 暫譯
 #: ../libpurple/protocols/irc/parse.c:146
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:送出一個 RAW 指令到伺服器。"
@@ -4690,9 +4723,7 @@
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
-msgstr ""
-"remove &lt;網名&gt; [訊息]:將某個使用者踢出頻道。你必須具有「頻道管理者」的"
-"權限才能夠執行這個動作。"
+msgstr "remove &lt;網名&gt; [訊息]:將某個使用者踢出頻道。你必須具有「頻道管理者」的權限才能夠執行這個動作。"
 
 #: ../libpurple/protocols/irc/parse.c:148
 msgid "time: Displays the current local time at the IRC server."
@@ -4714,17 +4745,13 @@
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
-msgstr ""
-"voice &lt;網名&gt; [網名] ...:賦與使用者的「發言」權限。你必須具有「頻道管理"
-"者」的權限才能執行這個動作。"
+msgstr "voice &lt;網名&gt; [網名] ...:賦與使用者的「發言」權限。你必須具有「頻道管理者」的權限才能執行這個動作。"
 
 #: ../libpurple/protocols/irc/parse.c:153
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
-msgstr ""
-"wallops &lt;message&gt;:如果你不知道這是幹什麼用的,你可能就沒有辦法使用它"
-"了。"
+msgstr "wallops &lt;message&gt;:如果你不知道這是幹什麼用的,你可能就沒有辦法使用它了。"
 
 #: ../libpurple/protocols/irc/parse.c:154
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
@@ -4734,108 +4761,103 @@
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
 msgstr "whowas &lt;網名&gt;:取得已離線的使用者的資訊。"
 
-#: ../libpurple/protocols/irc/parse.c:465
+#: ../libpurple/protocols/irc/parse.c:520
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "%s 回答需時:%lu 秒"
 
-#: ../libpurple/protocols/irc/parse.c:466
+#: ../libpurple/protocols/irc/parse.c:521
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:466
+#: ../libpurple/protocols/irc/parse.c:521
 msgid "CTCP PING reply"
 msgstr "CTCP PING 回答"
 
-#: ../libpurple/protocols/irc/parse.c:577
-#: ../libpurple/protocols/irc/parse.c:581 ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/irc/parse.c:633
+#: ../libpurple/protocols/irc/parse.c:640 ../libpurple/protocols/toc/toc.c:191
 #: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
 #: ../libpurple/protocols/toc/toc.c:786
 msgid "Disconnected."
 msgstr "停止連線。"
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:137
-#: ../libpurple/protocols/jabber/jabber.c:671
-#: ../libpurple/protocols/jabber/jabber.c:701
-#: ../libpurple/protocols/jabber/jabber.c:1887
+#: ../libpurple/protocols/jabber/adhoccommands.c:143
+#: ../libpurple/protocols/jabber/jabber.c:698
+#: ../libpurple/protocols/jabber/jabber.c:728
+#: ../libpurple/protocols/jabber/jabber.c:1901
 msgid "Unknown Error"
 msgstr "未知錯誤"
 
-#  XXX 暫譯
-#: ../libpurple/protocols/jabber/adhoccommands.c:139
-#: ../libpurple/protocols/jabber/adhoccommands.c:140
-#, fuzzy
+#: ../libpurple/protocols/jabber/adhoccommands.c:145
+#: ../libpurple/protocols/jabber/adhoccommands.c:146
 msgid "Ad-Hoc Command Failed"
-msgstr "指令被停用"
-
-# NOTE 參閱上列網站 (www.hypothetic.org) 第715號錯誤
-#: ../libpurple/protocols/jabber/adhoccommands.c:173
-#, fuzzy
+msgstr "臨時指令失敗"
+
+#: ../libpurple/protocols/jabber/adhoccommands.c:182
 msgid "execute"
-msgstr "沒有預期的無效參數"
-
-#: ../libpurple/protocols/jabber/auth.c:53
+msgstr "執行"
+
+#: ../libpurple/protocols/jabber/auth.c:55
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr "登入這個伺服器需要使用 TLS/SSL,但找不到 TLS/SSL 支援。"
 
-#: ../libpurple/protocols/jabber/auth.c:116
+#: ../libpurple/protocols/jabber/auth.c:120
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "伺服器需要經由未經加密的串流進行明文認證"
 
-#: ../libpurple/protocols/jabber/auth.c:319
-#: ../libpurple/protocols/jabber/auth.c:508
+#: ../libpurple/protocols/jabber/auth.c:323
+#: ../libpurple/protocols/jabber/auth.c:518
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
 "this and continue authentication?"
 msgstr "%s 需要經由未經加密的串流進行明文認證。允許並繼續進行認證?"
 
-#: ../libpurple/protocols/jabber/auth.c:321
-#: ../libpurple/protocols/jabber/auth.c:322
-#: ../libpurple/protocols/jabber/auth.c:510
-#: ../libpurple/protocols/jabber/auth.c:511
-#: ../libpurple/protocols/jabber/auth.c:598
-#: ../libpurple/protocols/jabber/auth.c:599
+#: ../libpurple/protocols/jabber/auth.c:325
+#: ../libpurple/protocols/jabber/auth.c:326
+#: ../libpurple/protocols/jabber/auth.c:520
+#: ../libpurple/protocols/jabber/auth.c:521
+#: ../libpurple/protocols/jabber/auth.c:614
+#: ../libpurple/protocols/jabber/auth.c:615
 msgid "Plaintext Authentication"
 msgstr "明文認證"
 
-#: ../libpurple/protocols/jabber/auth.c:334
-#: ../libpurple/protocols/jabber/auth.c:523
-#: ../libpurple/protocols/jabber/auth.c:610
+#: ../libpurple/protocols/jabber/auth.c:340
+#: ../libpurple/protocols/jabber/auth.c:534
+#: ../libpurple/protocols/jabber/auth.c:627
 msgid "Server does not use any supported authentication method"
 msgstr "伺服器並不提供任何一種被支援的認證方式"
 
-#. This should never happen!
-#: ../libpurple/protocols/jabber/auth.c:462
-#: ../libpurple/protocols/jabber/auth.c:561
-#: ../libpurple/protocols/jabber/auth.c:776
-#: ../libpurple/protocols/jabber/auth.c:917
-#: ../libpurple/protocols/jabber/auth.c:942
-#: ../libpurple/protocols/jabber/auth.c:961
-#: ../libpurple/protocols/jabber/jabber.c:123
+#: ../libpurple/protocols/jabber/auth.c:472
+#: ../libpurple/protocols/jabber/auth.c:576
+#: ../libpurple/protocols/jabber/auth.c:795
+#: ../libpurple/protocols/jabber/auth.c:944
+#: ../libpurple/protocols/jabber/auth.c:971
+#: ../libpurple/protocols/jabber/auth.c:993
+#: ../libpurple/protocols/jabber/jabber.c:127
 msgid "Invalid response from server."
 msgstr "伺服器送來了無效的回應。"
 
-#: ../libpurple/protocols/jabber/auth.c:600
+#: ../libpurple/protocols/jabber/auth.c:616
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
 msgstr "伺服器需要經由未經加密的串流進行明文認證。允許並繼續進行認證?"
 
-# XXX 好像有些怪,譯文有待改進
-#: ../libpurple/protocols/jabber/auth.c:797
-#: ../libpurple/protocols/jabber/auth.c:820
+# XXX 好像有些怪,譯文有待改進
+#: ../libpurple/protocols/jabber/auth.c:818
+#: ../libpurple/protocols/jabber/auth.c:843
 msgid "Invalid challenge from server"
 msgstr "伺服器送來了無效的驗證挑戰"
 
-# NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
-#: ../libpurple/protocols/jabber/auth.c:892
+# NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
+#: ../libpurple/protocols/jabber/auth.c:917
 msgid "SASL error"
 msgstr "SASL 錯誤"
 
 #: ../libpurple/protocols/jabber/buddy.c:283
 #: ../libpurple/protocols/jabber/buddy.c:1219
-#: ../libpurple/protocols/sametime/sametime.c:4128
+#: ../libpurple/protocols/sametime/sametime.c:4174
 #: ../libpurple/protocols/silc/ops.c:986
 #: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
@@ -4854,7 +4876,7 @@
 msgstr "名"
 
 #: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/jabber.c:977
+#: ../libpurple/protocols/jabber/jabber.c:1004
 msgid "URL"
 msgstr "URL"
 
@@ -4885,7 +4907,7 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:293
 #: ../libpurple/protocols/jabber/buddy.c:1295
-#: ../libpurple/protocols/silc/silc.c:1015
+#: ../libpurple/protocols/silc/silc.c:1158
 #: ../libpurple/protocols/silc10/silc.c:926
 msgid "Country"
 msgstr "國家"
@@ -4913,16 +4935,17 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:300
 #: ../libpurple/protocols/jabber/buddy.c:1250
-#: ../libpurple/protocols/msn/msn.c:1658
-#: ../libpurple/protocols/oscar/oscar.c:3749
+#: ../libpurple/protocols/msn/msn.c:1806
+#: ../libpurple/protocols/msnp9/msn.c:1659
+#: ../libpurple/protocols/oscar/oscar.c:3759
 msgid "Birthday"
 msgstr "生日"
 
 #: ../libpurple/protocols/jabber/buddy.c:301
 #: ../libpurple/protocols/jabber/buddy.c:1365
 #: ../libpurple/protocols/jabber/chat.c:775
-#: ../libpurple/protocols/jabber/usermood.c:175 ../pidgin/gtkblist.c:3116
-#: ../pidgin/gtkprefs.c:739
+#: ../libpurple/protocols/jabber/usermood.c:193 ../pidgin/gtkblist.c:3350
+#: ../pidgin/gtkprefs.c:740
 msgid "Description"
 msgstr "描述"
 
@@ -4937,7 +4960,7 @@
 "comfortable."
 msgstr "以下所有的欄位都是選擇性的。你只要輸入你想輸入你想填入的訊息即可。"
 
-# NOTE「Client」是指該使用者使用那一個「用戶端」訊息程式(例:gaim)
+# NOTE「Client」是指該使用者使用那一個「用戶端」訊息程式(例:Pidgin)
 #: ../libpurple/protocols/jabber/buddy.c:795
 #: ../libpurple/protocols/jabber/buddy.c:960
 msgid "Client"
@@ -4948,190 +4971,185 @@
 msgid "Operating System"
 msgstr "作業系統"
 
+# NOTE 這是功能名稱(直譯)
 #: ../libpurple/protocols/jabber/buddy.c:815
 #: ../libpurple/protocols/jabber/buddy.c:975
 msgid "Last Activity"
-msgstr ""
+msgstr "最近活動"
 
 #: ../libpurple/protocols/jabber/buddy.c:817
 #: ../libpurple/protocols/jabber/buddy.c:977
-#, fuzzy
 msgid "Service Discovery Info"
-msgstr "設定使用者個人資料"
-
+msgstr "服務探尋資訊"
+
+#  FIXME acli 2070914
 #: ../libpurple/protocols/jabber/buddy.c:819
 #: ../libpurple/protocols/jabber/buddy.c:979
 msgid "Service Discovery Items"
-msgstr ""
-
+msgstr "服務探尋項目"
+
+# NOTE 這是功能名稱(直譯)
 #: ../libpurple/protocols/jabber/buddy.c:821
 #: ../libpurple/protocols/jabber/buddy.c:981
-#, fuzzy
 msgid "Extended Stanza Addressing"
-msgstr "地址(續)"
-
+msgstr "延伸段落定址"
+
+# NOTE 這是功能名稱
 #: ../libpurple/protocols/jabber/buddy.c:823
 #: ../libpurple/protocols/jabber/buddy.c:983
-#, fuzzy
 msgid "Multi-User Chat"
-msgstr "給聊天室改別名"
-
+msgstr "多用戶聊天"
+
+# NOTE 這是功能名稱(直譯)
 #: ../libpurple/protocols/jabber/buddy.c:825
 #: ../libpurple/protocols/jabber/buddy.c:985
-#, fuzzy
 msgid "Multi-User Chat Extended Presence Information"
-msgstr "這個使用者沒有他的相關資訊。"
-
+msgstr "多用戶聊天延伸上線狀態資訊"
+
+# NOTE Cf http://host.cc.ntu.edu.tw/iicm/term/termb_I.htm
 #: ../libpurple/protocols/jabber/buddy.c:827
 #: ../libpurple/protocols/jabber/buddy.c:987
 msgid "In-Band Bytestreams"
-msgstr ""
+msgstr "帶內位元組串流"
 
 #: ../libpurple/protocols/jabber/buddy.c:829
 #: ../libpurple/protocols/jabber/buddy.c:989
-#, fuzzy
 msgid "Ad-Hoc Commands"
-msgstr "指令"
+msgstr "臨時指令"
 
 #: ../libpurple/protocols/jabber/buddy.c:831
 #: ../libpurple/protocols/jabber/buddy.c:991
 msgid "PubSub Service"
-msgstr ""
+msgstr "PubSub 服務"
 
 #: ../libpurple/protocols/jabber/buddy.c:833
 #: ../libpurple/protocols/jabber/buddy.c:993
 msgid "SOCKS5 Bytestreams"
-msgstr ""
+msgstr "SOCKS5 位元組串流"
 
 #: ../libpurple/protocols/jabber/buddy.c:835
 #: ../libpurple/protocols/jabber/buddy.c:995
 msgid "Out of Band Data"
-msgstr ""
-
+msgstr "帶外數據"
+
+#  NOTE Untranslated
 #: ../libpurple/protocols/jabber/buddy.c:837
 #: ../libpurple/protocols/jabber/buddy.c:997
-#, fuzzy
 msgid "XHTML-IM"
-msgstr "HTML"
+msgstr "XHTML-IM"
 
 #: ../libpurple/protocols/jabber/buddy.c:839
 #: ../libpurple/protocols/jabber/buddy.c:999
-#, fuzzy
 msgid "In-Band Registration"
-msgstr "註冊錯誤"
+msgstr "帶內註冊"
 
 #: ../libpurple/protocols/jabber/buddy.c:841
 #: ../libpurple/protocols/jabber/buddy.c:1001
-#, fuzzy
 msgid "User Location"
-msgstr "所在位置"
+msgstr "使用者所在位置"
 
 #: ../libpurple/protocols/jabber/buddy.c:843
 #: ../libpurple/protocols/jabber/buddy.c:1003
-#, fuzzy
 msgid "User Avatar"
-msgstr "使用者搜尋"
+msgstr "使用者化身"
 
 #: ../libpurple/protocols/jabber/buddy.c:845
 #: ../libpurple/protocols/jabber/buddy.c:1005
-#, fuzzy
 msgid "Chat State Notifications"
-msgstr "好友狀態通知"
-
-# NOTE Jabber 協定中 Stream Error 的一種,即 <unsupported-version/>
-# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
+msgstr "聊天狀態通知"
+
+# NOTE Jabber 協定中 Stream Error 的一種,即 <unsupported-version/>
+# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
 #: ../libpurple/protocols/jabber/buddy.c:847
 #: ../libpurple/protocols/jabber/buddy.c:1007
-#, fuzzy
 msgid "Software Version"
-msgstr "不支援指定的 XMPP 版本"
+msgstr "軟件版本"
 
 #: ../libpurple/protocols/jabber/buddy.c:849
 #: ../libpurple/protocols/jabber/buddy.c:1009
-#, fuzzy
 msgid "Stream Initiation"
-msgstr "方向"
+msgstr "開始串流"
 
 #: ../libpurple/protocols/jabber/buddy.c:851
 #: ../libpurple/protocols/jabber/buddy.c:1011
-#: ../libpurple/protocols/sametime/sametime.c:3235
+#: ../libpurple/protocols/sametime/sametime.c:3277
 msgid "File Transfer"
 msgstr "檔案傳輸"
 
 #: ../libpurple/protocols/jabber/buddy.c:853
 #: ../libpurple/protocols/jabber/buddy.c:1013
-#, fuzzy
 msgid "User Mood"
-msgstr "使用者模式"
+msgstr "使用者情緒"
 
 # XXX may be wrong
 #: ../libpurple/protocols/jabber/buddy.c:855
 #: ../libpurple/protocols/jabber/buddy.c:1015
-#, fuzzy
 msgid "User Activity"
-msgstr "使用者數目上限"
-
+msgstr "使用者活動狀態"
+
+#  NOTE 直譯:個體能力
+#  FIXME 譯文有待改進 - acli 20070918
 #: ../libpurple/protocols/jabber/buddy.c:857
 #: ../libpurple/protocols/jabber/buddy.c:1017
-#, fuzzy
 msgid "Entity Capabilities"
-msgstr "兼容性"
-
+msgstr "個體能力"
+
+#  FIXME 這聽來不對 - acli 20070913
 #: ../libpurple/protocols/jabber/buddy.c:859
 #: ../libpurple/protocols/jabber/buddy.c:1019
 msgid "Encrypted Session Negotiations"
-msgstr ""
+msgstr "加密工作階段協商"
 
 #: ../libpurple/protocols/jabber/buddy.c:861
 #: ../libpurple/protocols/jabber/buddy.c:1021
-#, fuzzy
 msgid "User Tune"
-msgstr "使用者"
-
+msgstr "使用者樂曲"
+
+#  NOTE「Roster」指「名冊」,但Open Source software似乎一般譯「好友清單」、「成員列表」等
+#  FIXME 譯文有待改進 - acli 20070918
 #: ../libpurple/protocols/jabber/buddy.c:863
 #: ../libpurple/protocols/jabber/buddy.c:1023
-#, fuzzy
 msgid "Roster Item Exchange"
-msgstr "要交換密碼匙之即時訊息"
-
+msgstr "好友清單項目交換"
+
+#  NOTE 參見 http://jabber.org/protocol/reach
+#  NOTE「Reachability Address」指即時通訊以外的通訊方式所用的「位址」(例如電話號碼)
+#  NOTE 直譯:可抵達性位址
+#  XXX 是否譯「其他通訊方法」較好?但要先看上下文 - acli 20070918
 #: ../libpurple/protocols/jabber/buddy.c:865
 #: ../libpurple/protocols/jabber/buddy.c:1025
-#, fuzzy
 msgid "Reachability Address"
-msgstr "電子郵件"
+msgstr "可抵達性位址"
 
 #: ../libpurple/protocols/jabber/buddy.c:867
 #: ../libpurple/protocols/jabber/buddy.c:1027
-#, fuzzy
 msgid "User Profile"
-msgstr "個人資料"
+msgstr "使用者資料"
 
 #: ../libpurple/protocols/jabber/buddy.c:869
 #: ../libpurple/protocols/jabber/buddy.c:1029
-#, fuzzy
 msgid "Jingle"
-msgstr "加入"
+msgstr "Jingle"
 
 #: ../libpurple/protocols/jabber/buddy.c:871
 #: ../libpurple/protocols/jabber/buddy.c:1031
 msgid "Jingle Audio"
-msgstr ""
+msgstr "Jingle 音訊"
 
 #: ../libpurple/protocols/jabber/buddy.c:873
 #: ../libpurple/protocols/jabber/buddy.c:1033
-#, fuzzy
 msgid "User Nickname"
-msgstr "使用者名稱"
+msgstr "使用者網名"
 
 #: ../libpurple/protocols/jabber/buddy.c:875
 #: ../libpurple/protocols/jabber/buddy.c:1035
 msgid "Jingle ICE UDP"
-msgstr ""
+msgstr "Jingle ICE UDP"
 
 #: ../libpurple/protocols/jabber/buddy.c:877
 #: ../libpurple/protocols/jabber/buddy.c:1037
 msgid "Jingle ICE TCP"
-msgstr ""
+msgstr "Jingle ICE TCP"
 
 #: ../libpurple/protocols/jabber/buddy.c:879
 #: ../libpurple/protocols/jabber/buddy.c:1039
@@ -5140,56 +5158,51 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:881
 #: ../libpurple/protocols/jabber/buddy.c:1041
-#, fuzzy
 msgid "Jingle Video"
-msgstr "動態視像"
+msgstr "Jingle 視像"
 
 #: ../libpurple/protocols/jabber/buddy.c:883
 #: ../libpurple/protocols/jabber/buddy.c:1043
 msgid "Jingle DTMF"
-msgstr ""
+msgstr "Jingle DTMF"
 
 #: ../libpurple/protocols/jabber/buddy.c:885
 #: ../libpurple/protocols/jabber/buddy.c:1045
-#, fuzzy
 msgid "Message Receipts"
-msgstr "收到訊息"
+msgstr "收到的訊息"
 
 #: ../libpurple/protocols/jabber/buddy.c:887
 #: ../libpurple/protocols/jabber/buddy.c:1047
-#, fuzzy
 msgid "Public Key Publishing"
-msgstr "公開密碼匙指紋可讀版本 (Babbleprint)"
-
+msgstr "發佈公開密碼匙"
+
+# NOTE Jabber 新功能規格
 #: ../libpurple/protocols/jabber/buddy.c:889
 #: ../libpurple/protocols/jabber/buddy.c:1049
-#, fuzzy
 msgid "User Chatting"
-msgstr "使用者自定選項"
+msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:891
 #: ../libpurple/protocols/jabber/buddy.c:1051
-#, fuzzy
 msgid "User Browsing"
-msgstr "使用者模式"
-
+msgstr "使用者瀏覽"
+
+# NOTE Jabber 新功能規格
 #: ../libpurple/protocols/jabber/buddy.c:893
 #: ../libpurple/protocols/jabber/buddy.c:1053
-#, fuzzy
 msgid "User Gaming"
-msgstr "使用者名稱"
-
-# XXX may be wrong
+msgstr ""
+
+# NOTE Jabber 新功能規格
 #: ../libpurple/protocols/jabber/buddy.c:895
 #: ../libpurple/protocols/jabber/buddy.c:1055
-#, fuzzy
 msgid "User Viewing"
-msgstr "使用者數目上限"
+msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:897
 #: ../libpurple/protocols/jabber/buddy.c:1057
-#: ../libpurple/protocols/silc/ops.c:1596
-#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc/ops.c:1600
+#: ../libpurple/protocols/silc/ops.c:1605
 #: ../libpurple/protocols/silc10/ops.c:1612
 #: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping"
@@ -5197,19 +5210,19 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:899
 #: ../libpurple/protocols/jabber/buddy.c:1059
-#, fuzzy
 msgid "Stanza Encryption"
-msgstr "Trillian 加密"
+msgstr "段落加密"
 
 #: ../libpurple/protocols/jabber/buddy.c:901
 #: ../libpurple/protocols/jabber/buddy.c:1061
 msgid "Entity Time"
 msgstr ""
 
+#  XXX 暫譯- acli 20070913
 #: ../libpurple/protocols/jabber/buddy.c:903
 #: ../libpurple/protocols/jabber/buddy.c:1063
 msgid "Delayed Delivery"
-msgstr ""
+msgstr "延遲送出"
 
 #: ../libpurple/protocols/jabber/buddy.c:905
 #: ../libpurple/protocols/jabber/buddy.c:1065
@@ -5224,46 +5237,47 @@
 #: ../libpurple/protocols/jabber/buddy.c:909
 #: ../libpurple/protocols/jabber/buddy.c:1069
 msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
+msgstr "Jingle 用的 STUN 服務偵測"
+
+# FIXME 這聽來不對
 #: ../libpurple/protocols/jabber/buddy.c:911
 #: ../libpurple/protocols/jabber/buddy.c:1071
 msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
+msgstr "簡化加密工作階段協商"
 
 #: ../libpurple/protocols/jabber/buddy.c:913
 #: ../libpurple/protocols/jabber/buddy.c:1073
 msgid "Hop Check"
-msgstr ""
+msgstr "中繼段檢查"
 
 #: ../libpurple/protocols/jabber/buddy.c:921
 #: ../libpurple/protocols/jabber/buddy.c:1081
-#: ../libpurple/protocols/oscar/oscar.c:2906
+#: ../libpurple/protocols/oscar/oscar.c:2916
 msgid "Capabilities"
 msgstr "兼容性"
 
 # TODO Untranslated
-# NOTE 譯文刪除 by Ambrose
-# NOTE Jabber 協定的「Resource」一詞通常係指一種使用者自定的字串,
-# NOTE 用以表示在多處地方同時登入了的情形下,目前的實在位置
-# NOTE 見 http://www.jabber.org/user/userguide.html
+# NOTE 譯文刪除 by Ambrose
+# NOTE Jabber 協定的「Resource」一詞通常係指一種使用者自定的字串,
+# NOTE 用以表示在多處地方同時登入了的情形下,目前的實在位置
+# NOTE 見 http://www.jabber.org/user/userguide.html
 #: ../libpurple/protocols/jabber/buddy.c:933
-#: ../libpurple/protocols/jabber/libxmpp.c:206
+#: ../libpurple/protocols/jabber/libxmpp.c:209
 #: ../libpurple/protocols/jabber/si.c:859
 msgid "Resource"
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:935
-#: ../libpurple/protocols/jabber/jabber.c:1531
-#: ../libpurple/protocols/jabber/jabber.c:1554
-#: ../libpurple/protocols/jabber/jabber.c:1577
-#: ../libpurple/protocols/jabber/jabber.c:1600
-#: ../libpurple/protocols/jabber/jabber.c:1623
+#: ../libpurple/protocols/jabber/jabber.c:1569
+#: ../libpurple/protocols/jabber/jabber.c:1583
+#: ../libpurple/protocols/jabber/jabber.c:1597
+#: ../libpurple/protocols/jabber/jabber.c:1611
+#: ../libpurple/protocols/jabber/jabber.c:1625
 msgid "Priority"
 msgstr "優先次序"
 
-# NOTE: 法、德文均譯「第二個名」,芬蘭文譯「其他名」,日文音譯了事
-# NOTE: 在網上幾間台灣大學寫「英文別名」,現套用,也跟芬蘭文PO檔處理手法相同
+# NOTE: 法、德文均譯「第二個名」,芬蘭文譯「其他名」,日文音譯了事
+# NOTE: 在網上幾間台灣大學寫「英文別名」,現套用,也跟芬蘭文PO檔處理手法相同
 #: ../libpurple/protocols/jabber/buddy.c:1237
 #: ../libpurple/protocols/silc/ops.c:994
 #: ../libpurple/protocols/silc10/ops.c:1028
@@ -5271,9 +5285,9 @@
 msgstr "英文別名"
 
 #: ../libpurple/protocols/jabber/buddy.c:1270
-#: ../libpurple/protocols/jabber/jabber.c:952
-#: ../libpurple/protocols/oscar/oscar.c:3788
-#: ../libpurple/protocols/oscar/oscar.c:3801
+#: ../libpurple/protocols/jabber/jabber.c:979
+#: ../libpurple/protocols/oscar/oscar.c:3798
+#: ../libpurple/protocols/oscar/oscar.c:3811
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1030
 #: ../libpurple/protocols/silc10/ops.c:1064
@@ -5288,151 +5302,146 @@
 msgid "Photo"
 msgstr "照片"
 
-# NOTE 見 http://www.jabber.org/jeps/jep-0054.html
+# NOTE 見 http://www.jabber.org/jeps/jep-0054.html
 #: ../libpurple/protocols/jabber/buddy.c:1386
 msgid "Logo"
 msgstr "標誌"
 
-#: ../libpurple/protocols/jabber/buddy.c:1942
+#: ../libpurple/protocols/jabber/buddy.c:1945
 msgid "Un-hide From"
 msgstr "現身給"
 
-#: ../libpurple/protocols/jabber/buddy.c:1946
+#: ../libpurple/protocols/jabber/buddy.c:1949
 msgid "Temporarily Hide From"
 msgstr "暫時隱身於"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1954
+#: ../libpurple/protocols/jabber/buddy.c:1957
 msgid "Cancel Presence Notification"
 msgstr "取消上線狀態通知"
 
-#: ../libpurple/protocols/jabber/buddy.c:1961
+#: ../libpurple/protocols/jabber/buddy.c:1964
 msgid "(Re-)Request authorization"
 msgstr "要求或重新要求認證"
 
-# NOTE Jabber協定的「Subscribe」一詞乃「加入好友名單」的意思
-# NOTE 見 http://www.jabber.org/user/userguide.html
+# NOTE Jabber協定的「Subscribe」一詞乃「加入好友名單」的意思
+# NOTE 見 http://www.jabber.org/user/userguide.html
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1970
+#: ../libpurple/protocols/jabber/buddy.c:1973
 msgid "Unsubscribe"
 msgstr "從好友名單中移除"
 
-#: ../libpurple/protocols/jabber/buddy.c:1985
-#, fuzzy
+#: ../libpurple/protocols/jabber/buddy.c:1988
 msgid "Log In"
-msgstr "已登入"
-
-#: ../libpurple/protocols/jabber/buddy.c:1989
-#, fuzzy
+msgstr "登入"
+
+#: ../libpurple/protocols/jabber/buddy.c:1992
 msgid "Log Out"
-msgstr "記錄所有聊天內容"
-
-#: ../libpurple/protocols/jabber/buddy.c:2035
-#: ../libpurple/protocols/jabber/jabber.c:1553
+msgstr "登出"
+
+#: ../libpurple/protocols/jabber/buddy.c:2038
+#: ../libpurple/protocols/jabber/jabber.c:1582
 msgid "Chatty"
 msgstr "想聊天"
 
-#: ../libpurple/protocols/jabber/buddy.c:2039
+#: ../libpurple/protocols/jabber/buddy.c:2042
 msgid "Extended Away"
 msgstr "長時間離開"
 
-#: ../libpurple/protocols/jabber/buddy.c:2041
-#: ../libpurple/protocols/jabber/jabber.c:1622
+#: ../libpurple/protocols/jabber/buddy.c:2044
+#: ../libpurple/protocols/jabber/jabber.c:1624
 #: ../libpurple/protocols/oscar/oscar.c:727
-#: ../libpurple/protocols/oscar/oscar.c:5808
-#: ../libpurple/protocols/sametime/sametime.c:3297
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:5858
+#: ../libpurple/protocols/sametime/sametime.c:3339
 msgid "Do Not Disturb"
 msgstr "請勿打擾"
 
-#: ../libpurple/protocols/jabber/buddy.c:2208
+#: ../libpurple/protocols/jabber/buddy.c:2211
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:2212
-#: ../libpurple/protocols/jabber/buddy.c:2391
-#: ../libpurple/protocols/oscar/oscar.c:3711
+#: ../libpurple/protocols/jabber/buddy.c:2215
+#: ../libpurple/protocols/jabber/buddy.c:2404
+#: ../libpurple/protocols/oscar/oscar.c:3721
 msgid "Last Name"
 msgstr "姓"
 
-#: ../libpurple/protocols/jabber/buddy.c:2244
+#: ../libpurple/protocols/jabber/buddy.c:2247
 msgid "The following are the results of your search"
 msgstr "以下為搜尋結果"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:2319
+#: ../libpurple/protocols/jabber/buddy.c:2332
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
-msgstr ""
-"請在適用欄位填寫搜尋條件,以便搜尋想找的聯絡人。注意:所有欄位均支援以萬用字"
-"符 (%) 搜尋"
-
-#: ../libpurple/protocols/jabber/buddy.c:2339
+msgstr "請在適用欄位填寫搜尋條件,以便搜尋想找的聯絡人。注意:所有欄位均支援以萬用字符 (%) 搜尋"
+
+#: ../libpurple/protocols/jabber/buddy.c:2352
 msgid "Directory Query Failed"
 msgstr "查詢目錄伺服器失敗"
 
-#: ../libpurple/protocols/jabber/buddy.c:2340
+#: ../libpurple/protocols/jabber/buddy.c:2353
 msgid "Could not query the directory server."
 msgstr "無法查詢目錄伺服器"
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:2374
+#: ../libpurple/protocols/jabber/buddy.c:2387
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "伺服器指令:%s"
 
-#: ../libpurple/protocols/jabber/buddy.c:2381
+#: ../libpurple/protocols/jabber/buddy.c:2394
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr "填入一個或多個欄位,以搜尋XMPP使用者。"
 
-#: ../libpurple/protocols/jabber/buddy.c:2401
-#: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3714
-#: ../libpurple/protocols/oscar/oscar.c:3723
+#: ../libpurple/protocols/jabber/buddy.c:2414
+#: ../libpurple/protocols/novell/novell.c:1497
+#: ../libpurple/protocols/oscar/oscar.c:3724
+#: ../libpurple/protocols/oscar/oscar.c:3733
 msgid "E-Mail Address"
 msgstr "電子郵件"
 
-#: ../libpurple/protocols/jabber/buddy.c:2410
-#: ../libpurple/protocols/jabber/buddy.c:2411
+#: ../libpurple/protocols/jabber/buddy.c:2423
+#: ../libpurple/protocols/jabber/buddy.c:2424
 msgid "Search for XMPP users"
 msgstr "搜尋XMPP使用者"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:2412
+#: ../libpurple/protocols/jabber/buddy.c:2425
 #: ../libpurple/protocols/qq/group.c:123
 #: ../libpurple/protocols/qq/group_im.c:147
 #: ../libpurple/protocols/qq/sys_msg.c:174
 #: ../libpurple/protocols/qq/sys_msg.c:250
 #: ../libpurple/protocols/qq/sys_msg.c:268
-#: ../libpurple/protocols/sametime/sametime.c:5611
+#: ../libpurple/protocols/sametime/sametime.c:5657
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
 msgstr "搜尋"
 
-# NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
-#: ../libpurple/protocols/jabber/buddy.c:2427
+# NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
+#: ../libpurple/protocols/jabber/buddy.c:2440
 msgid "Invalid Directory"
 msgstr "無效目錄"
 
-#: ../libpurple/protocols/jabber/buddy.c:2444
+#: ../libpurple/protocols/jabber/buddy.c:2457
 msgid "Enter a User Directory"
 msgstr "進入使用者目錄。"
 
-#: ../libpurple/protocols/jabber/buddy.c:2445
+#: ../libpurple/protocols/jabber/buddy.c:2458
 msgid "Select a user directory to search"
 msgstr "選擇一個使用者目錄以進行搜尋"
 
-#: ../libpurple/protocols/jabber/buddy.c:2448
+#: ../libpurple/protocols/jabber/buddy.c:2461
 msgid "Search Directory"
 msgstr "搜尋目錄"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5294
+#: ../libpurple/protocols/oscar/oscar.c:5342
 #: ../libpurple/protocols/yahoo/yahoochat.c:1048
 msgid "_Room:"
 msgstr "聊天室(_R):"
@@ -5464,13 +5473,13 @@
 msgid "Invalid Server Name"
 msgstr "伺服器名稱無效"
 
-# NOTE Arto Alakulju 發現「room handle」即是聊天室內使用者所用的暱稱而已
+# NOTE Arto Alakulju 發現「room handle」即是聊天室內使用者所用的暱稱而已
 #: ../libpurple/protocols/jabber/chat.c:235
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s 不是一個有效的網名"
 
-# NOTE Arto Alakulju 發現「room handle」即是聊天室內使用者所用的暱稱而已
+# NOTE Arto Alakulju 發現「room handle」即是聊天室內使用者所用的暱稱而已
 #: ../libpurple/protocols/jabber/chat.c:236
 #: ../libpurple/protocols/jabber/chat.c:237
 msgid "Invalid Room Handle"
@@ -5489,7 +5498,7 @@
 msgid "Room Configuration Error"
 msgstr "聊天室設定錯誤"
 
-# XXX 暫譯,譯文有問題,要改善
+# XXX 暫譯,譯文有問題,要改善
 #: ../libpurple/protocols/jabber/chat.c:421
 msgid "This room is not capable of being configured"
 msgstr "這個聊天室不支援設定"
@@ -5499,16 +5508,16 @@
 msgid "Registration error"
 msgstr "註冊錯誤"
 
-# XXX 暫譯
-# NOTE 據 faceprint (模組作者) 稱,MUC 是一種新的聊天室協定,
-# NOTE 較舊式的「Group Chat」有更多功能
+# XXX 暫譯
+# NOTE 據 faceprint (模組作者) 稱,MUC 是一種新的聊天室協定,
+# NOTE 較舊式的「Group Chat」有更多功能
 #: ../libpurple/protocols/jabber/chat.c:627
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "在非 MUC 模式的聊天室內不支援修改網名"
 
 #: ../libpurple/protocols/jabber/chat.c:678
 #: ../libpurple/protocols/jabber/chat.c:689
-#: ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/silc/ops.c:1460
 #: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "讀取聊天室清單時發生錯誤"
@@ -5517,7 +5526,7 @@
 msgid "Invalid Server"
 msgstr "無效的伺服器名"
 
-# NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
+# NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
 # XXX
 #: ../libpurple/protocols/jabber/chat.c:781
 msgid "Enter a Conference Server"
@@ -5531,30 +5540,25 @@
 msgid "Find Rooms"
 msgstr "尋找聊天室"
 
-# XXX 譯文有待改進
-#: ../libpurple/protocols/jabber/jabber.c:92
-msgid "Error initializing session"
-msgstr "對工作階段進行初始化時發生了錯誤"
-
-#: ../libpurple/protocols/jabber/jabber.c:145
+#: ../libpurple/protocols/jabber/jabber.c:151
 msgid "You require encryption, but it is not available on this server."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:259
-#: ../libpurple/protocols/jabber/jabber.c:312
-#: ../libpurple/protocols/jabber/jabber.c:340
+msgstr "你指定必須加密,但這伺服器沒有加密功能。"
+
+#: ../libpurple/protocols/jabber/jabber.c:269
+#: ../libpurple/protocols/jabber/jabber.c:324
+#: ../libpurple/protocols/jabber/jabber.c:354
 msgid "Write error"
 msgstr "寫入錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:408
-#: ../libpurple/protocols/jabber/jabber.c:445
+#: ../libpurple/protocols/jabber/jabber.c:424
+#: ../libpurple/protocols/jabber/jabber.c:463
 msgid "Read Error"
 msgstr "讀取錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:482
-#: ../libpurple/protocols/oscar/flap_connection.c:394
-#: ../libpurple/protocols/yahoo/yahoo.c:2558
-#: ../libpurple/protocols/yahoo/yahoo.c:2590
+#: ../libpurple/protocols/jabber/jabber.c:500
+#: ../libpurple/protocols/oscar/flap_connection.c:398
+#: ../libpurple/protocols/yahoo/yahoo.c:2562
+#: ../libpurple/protocols/yahoo/yahoo.c:2594
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -5563,741 +5567,718 @@
 "無法與伺服器建立連線:\n"
 "%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:529
+#: ../libpurple/protocols/jabber/jabber.c:550
 msgid "Unable to create socket"
 msgstr "無法建立 Socket"
 
-#: ../libpurple/protocols/jabber/jabber.c:575
-#: ../libpurple/protocols/jabber/jabber.c:1063
+#: ../libpurple/protocols/jabber/jabber.c:598
+#: ../libpurple/protocols/jabber/jabber.c:1092
 msgid "Invalid XMPP ID"
 msgstr "XMPP 帳號無效"
 
-#: ../libpurple/protocols/jabber/jabber.c:580
+#: ../libpurple/protocols/jabber/jabber.c:605
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "XMPP 帳號無效,域名是必須設定的。"
 
-#: ../libpurple/protocols/jabber/jabber.c:656
+#: ../libpurple/protocols/jabber/jabber.c:683
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "成功註冊 %s@%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:662
-#, fuzzy, c-format
+#: ../libpurple/protocols/jabber/jabber.c:689
+#, c-format
 msgid "Registration to %s successful"
-msgstr "成功註冊 %s@%s"
-
-#: ../libpurple/protocols/jabber/jabber.c:664
-#: ../libpurple/protocols/jabber/jabber.c:665
+msgstr "成功註冊 %s"
+
+#: ../libpurple/protocols/jabber/jabber.c:691
+#: ../libpurple/protocols/jabber/jabber.c:692
 msgid "Registration Successful"
 msgstr "註冊成功"
 
-#: ../libpurple/protocols/jabber/jabber.c:673
-#: ../libpurple/protocols/jabber/jabber.c:674
+#: ../libpurple/protocols/jabber/jabber.c:700
+#: ../libpurple/protocols/jabber/jabber.c:701
 msgid "Registration Failed"
 msgstr "註冊失敗"
 
-#: ../libpurple/protocols/jabber/jabber.c:692
-#, fuzzy, c-format
+#: ../libpurple/protocols/jabber/jabber.c:719
+#, c-format
 msgid "Registration from %s successfully removed"
-msgstr "成功註冊 %s@%s"
-
-#: ../libpurple/protocols/jabber/jabber.c:694
-#: ../libpurple/protocols/jabber/jabber.c:695
-#, fuzzy
+msgstr "成功移除 %s 的註冊"
+
+#: ../libpurple/protocols/jabber/jabber.c:721
+#: ../libpurple/protocols/jabber/jabber.c:722
 msgid "Unregistration Successful"
-msgstr "註冊成功"
-
-#: ../libpurple/protocols/jabber/jabber.c:703
-#: ../libpurple/protocols/jabber/jabber.c:704
-#, fuzzy
+msgstr "移除註冊成功"
+
+#: ../libpurple/protocols/jabber/jabber.c:730
+#: ../libpurple/protocols/jabber/jabber.c:731
 msgid "Unregistration Failed"
-msgstr "註冊失敗"
-
-#: ../libpurple/protocols/jabber/jabber.c:864
-#: ../libpurple/protocols/jabber/jabber.c:865
+msgstr "移除註冊失敗"
+
+#: ../libpurple/protocols/jabber/jabber.c:891
+#: ../libpurple/protocols/jabber/jabber.c:892
 msgid "Already Registered"
 msgstr "已經註冊"
 
-#: ../libpurple/protocols/jabber/jabber.c:962
-#: ../libpurple/protocols/oscar/oscar.c:3790
-#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/jabber/jabber.c:989
+#: ../libpurple/protocols/oscar/oscar.c:3800
+#: ../libpurple/protocols/oscar/oscar.c:3813
 msgid "State"
 msgstr "省/州"
 
-#: ../libpurple/protocols/jabber/jabber.c:967
+#: ../libpurple/protocols/jabber/jabber.c:994
 msgid "Postal code"
 msgstr "郵遞區號"
 
-#: ../libpurple/protocols/jabber/jabber.c:972
+#: ../libpurple/protocols/jabber/jabber.c:999
 #: ../libpurple/protocols/silc/ops.c:1035
-#: ../libpurple/protocols/silc/silc.c:772
-#: ../libpurple/protocols/silc/util.c:557
+#: ../libpurple/protocols/silc/silc.c:915
+#: ../libpurple/protocols/silc/util.c:563
 #: ../libpurple/protocols/silc10/ops.c:1069
 #: ../libpurple/protocols/silc10/silc.c:683
 #: ../libpurple/protocols/silc10/util.c:553
 msgid "Phone"
 msgstr "電話"
 
-#: ../libpurple/protocols/jabber/jabber.c:982
+#: ../libpurple/protocols/jabber/jabber.c:1009
 msgid "Date"
 msgstr "日期"
 
-#: ../libpurple/protocols/jabber/jabber.c:987
-#, fuzzy
+#: ../libpurple/protocols/jabber/jabber.c:1014
 msgid "Unregister"
-msgstr "註冊"
-
-#: ../libpurple/protocols/jabber/jabber.c:994
-#, fuzzy
+msgstr "移除註冊"
+
+#: ../libpurple/protocols/jabber/jabber.c:1021
 msgid ""
 "Please fill out the information below to change your account registration."
-msgstr "為你的新帳戶註冊,請填寫下列資料:"
-
-#: ../libpurple/protocols/jabber/jabber.c:997
+msgstr "請填寫以下資料以更新你的註冊資料。"
+
+#: ../libpurple/protocols/jabber/jabber.c:1024
 msgid "Please fill out the information below to register your new account."
 msgstr "為你的新帳戶註冊,請填寫下列資料:"
 
-#: ../libpurple/protocols/jabber/jabber.c:1005
-#: ../libpurple/protocols/jabber/jabber.c:1006
+#: ../libpurple/protocols/jabber/jabber.c:1032
+#: ../libpurple/protocols/jabber/jabber.c:1033
 msgid "Register New XMPP Account"
 msgstr "註冊新的 XMPP 帳戶"
 
-#: ../libpurple/protocols/jabber/jabber.c:1007
-#: ../libpurple/protocols/jabber/jabber.c:1016
+#: ../libpurple/protocols/jabber/jabber.c:1034
+#: ../libpurple/protocols/jabber/jabber.c:1043
 msgid "Register"
 msgstr "註冊"
 
-#: ../libpurple/protocols/jabber/jabber.c:1012
-#, fuzzy, c-format
+#: ../libpurple/protocols/jabber/jabber.c:1039
+#, c-format
 msgid "Change Account Registration at %s"
-msgstr "更改 %s 的個人資料"
-
-#: ../libpurple/protocols/jabber/jabber.c:1013
-#, fuzzy, c-format
+msgstr "更改 %s 上的註冊資訊"
+
+#: ../libpurple/protocols/jabber/jabber.c:1040
+#, c-format
 msgid "Register New Account at %s"
-msgstr "註冊新的 XMPP 帳戶"
-
-#: ../libpurple/protocols/jabber/jabber.c:1016
-#, fuzzy
+msgstr "註冊在 %s 的新帳號"
+
+#: ../libpurple/protocols/jabber/jabber.c:1043
 msgid "Change Registration"
-msgstr "註冊錯誤"
-
-#: ../libpurple/protocols/jabber/jabber.c:1120
-#: ../libpurple/protocols/jabber/jabber.c:1121
-#, fuzzy
+msgstr "更改註冊資訊"
+
+#: ../libpurple/protocols/jabber/jabber.c:1151
+#: ../libpurple/protocols/jabber/jabber.c:1152
 msgid "Error unregistering account"
-msgstr "更改帳號資訊錯誤"
-
-#: ../libpurple/protocols/jabber/jabber.c:1126
-#: ../libpurple/protocols/jabber/jabber.c:1127
-#, fuzzy
+msgstr "移除帳號註冊錯誤"
+
+#: ../libpurple/protocols/jabber/jabber.c:1157
+#: ../libpurple/protocols/jabber/jabber.c:1158
 msgid "Account successfully unregistered"
-msgstr "成功建立了一個羣 (Qun)"
-
-#: ../libpurple/protocols/jabber/jabber.c:1284
+msgstr "移除帳號註冊成功"
+
+#: ../libpurple/protocols/jabber/jabber.c:1315
 msgid "Initializing Stream"
 msgstr "串流初始中"
 
-#: ../libpurple/protocols/jabber/jabber.c:1289
-#, fuzzy
+#: ../libpurple/protocols/jabber/jabber.c:1320
 msgid "Initializing SSL/TLS"
-msgstr "串流初始中"
-
-#: ../libpurple/protocols/jabber/jabber.c:1293
-#: ../libpurple/protocols/msn/session.c:351
+msgstr "SSL/TLS 初始中"
+
+#: ../libpurple/protocols/jabber/jabber.c:1324
+#: ../libpurple/protocols/msn/session.c:408
+#: ../libpurple/protocols/msnp9/session.c:361
 msgid "Authenticating"
 msgstr "認證中"
 
-#: ../libpurple/protocols/jabber/jabber.c:1302
+#: ../libpurple/protocols/jabber/jabber.c:1333
 msgid "Re-initializing Stream"
 msgstr "串流重新初始中"
 
-#: ../libpurple/protocols/jabber/jabber.c:1396
-#: ../libpurple/protocols/jabber/jabber.c:1865
-#: ../libpurple/protocols/jabber/jabber.c:1909
-#: ../libpurple/protocols/jabber/jabber.c:1945
+#: ../libpurple/protocols/jabber/jabber.c:1427
+#: ../libpurple/protocols/jabber/jabber.c:1879
+#: ../libpurple/protocols/jabber/jabber.c:1922
+#: ../libpurple/protocols/jabber/jabber.c:1960
 #: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:5602
+#: ../libpurple/protocols/oscar/oscar.c:5652
 msgid "Not Authorized"
 msgstr "未認證"
 
-# NOTE 這些奇怪 Jabber 術語(至「Subscription」條)的解釋由 faceprint 提供
-# NOTE LSchiere2 的補充如下:
+# NOTE 這些奇怪 Jabber 術語(至「Subscription」條)的解釋由 faceprint 提供
+# NOTE LSchiere2 的補充如下:
 # NOTE in jabber each user has control over both who is in his/her buddy list and who has him/her in that other person's buddy list
 # NOTE ie each "subscription" represents the fact that either you send status notifications to someone, or that you recieve them, or both
 # NOTE thus "from" means you only recieve status notification, "to" means you only send status notification and "both" is thus obviously that you both send and recieve status notification
-#: ../libpurple/protocols/jabber/jabber.c:1442
+#: ../libpurple/protocols/jabber/jabber.c:1475
 msgid "Both"
 msgstr "已互相認證"
 
-#  NOTE Jabber 術語,見「Both」條
-#: ../libpurple/protocols/jabber/jabber.c:1444
+#  NOTE Jabber 術語,見「Both」條
+#: ../libpurple/protocols/jabber/jabber.c:1477
 msgid "From (To pending)"
 msgstr "已認證對方(但仍等待對方認證你)"
 
-# FIXME 原文一詞兩義,根本無法翻譯
-#  NOTE gntnotify 字義為「發信人」
-#  NOTE Jabber 術語字義見「Both」條
-#: ../libpurple/protocols/jabber/jabber.c:1446
+# FIXME 原文一詞兩義,根本無法翻譯
+#  NOTE gntnotify 字義為「發信人」
+#  NOTE Jabber 術語字義見「Both」條
+#: ../libpurple/protocols/jabber/jabber.c:1479
 msgid "From"
 msgstr "已認證對方"
 
-#  NOTE Jabber 術語,見「Both」條
-#: ../libpurple/protocols/jabber/jabber.c:1449
+#  NOTE Jabber 術語,見「Both」條
+#: ../libpurple/protocols/jabber/jabber.c:1482
 msgid "To"
 msgstr "已獲對方認證"
 
-#  NOTE Jabber 術語,見「Both」條
-#: ../libpurple/protocols/jabber/jabber.c:1451
+#  NOTE Jabber 術語,見「Both」條
+#: ../libpurple/protocols/jabber/jabber.c:1484
 msgid "None (To pending)"
 msgstr "無(但正等待對方認證你)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1453
+#: ../libpurple/protocols/jabber/jabber.c:1486
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "無"
 
-#  NOTE Jabber 術語,見「Both」條
-#: ../libpurple/protocols/jabber/jabber.c:1456
+#  NOTE Jabber 術語,見「Both」條
+#: ../libpurple/protocols/jabber/jabber.c:1489
 msgid "Subscription"
 msgstr "認證狀態"
 
-#: ../libpurple/protocols/jabber/jabber.c:1466
-#: ../libpurple/protocols/jabber/jabber.c:1469
-#: ../libpurple/protocols/jabber/jabber.c:1533
-#: ../libpurple/protocols/jabber/jabber.c:1556
-#: ../libpurple/protocols/jabber/jabber.c:1579
-#: ../libpurple/protocols/jabber/jabber.c:1602
-#: ../libpurple/protocols/jabber/jabber.c:1625
-#: ../libpurple/protocols/jabber/usermood.c:166
-#: ../libpurple/protocols/silc/buddy.c:1557
+#: ../libpurple/protocols/jabber/jabber.c:1499
+#: ../libpurple/protocols/jabber/jabber.c:1502
+#: ../libpurple/protocols/jabber/jabber.c:1571
+#: ../libpurple/protocols/jabber/jabber.c:1585
+#: ../libpurple/protocols/jabber/jabber.c:1599
+#: ../libpurple/protocols/jabber/jabber.c:1613
+#: ../libpurple/protocols/jabber/jabber.c:1627
+#: ../libpurple/protocols/jabber/usermood.c:184
+#: ../libpurple/protocols/silc/buddy.c:1560
 #: ../libpurple/protocols/silc/ops.c:1212
-#: ../libpurple/protocols/silc10/buddy.c:1557
+#: ../libpurple/protocols/silc10/buddy.c:1560
 #: ../libpurple/protocols/silc10/ops.c:1207
 msgid "Mood"
 msgstr "心情"
 
-#: ../libpurple/protocols/jabber/jabber.c:1534
-#: ../libpurple/protocols/jabber/jabber.c:1557
-#: ../libpurple/protocols/jabber/jabber.c:1580
-#: ../libpurple/protocols/jabber/jabber.c:1603
-#: ../libpurple/protocols/jabber/jabber.c:1626
-#, fuzzy
+# NOTE from #pidgin, on 20070920:
+# NOTE (20時05分52秒) wing: what does "Current Media" in the new msn code mean?
+# NOTE (20時07分19秒) rekkanoryo: wing: it's more or less "Now Playing"
+#: ../libpurple/protocols/jabber/jabber.c:1507
+#: ../libpurple/protocols/msn/msn.c:647
+msgid "Current media"
+msgstr "正在播放"
+
+# XXX 要覆查 - acli 20070914
+#: ../libpurple/protocols/jabber/jabber.c:1572
+#: ../libpurple/protocols/jabber/jabber.c:1586
+#: ../libpurple/protocols/jabber/jabber.c:1600
+#: ../libpurple/protocols/jabber/jabber.c:1614
+#: ../libpurple/protocols/jabber/jabber.c:1628
 msgid "Mood Text"
-msgstr "血型"
-
-#  NOTE 可譯「美工人員」,但那是很保守的譯法;Pidgin 的 Artist 是做設計圖示、重新整理介面等等這些很難做的工作的人,所以很明顯是「設計員」
-#: ../libpurple/protocols/jabber/jabber.c:1535
-#: ../libpurple/protocols/jabber/jabber.c:1558
-#: ../libpurple/protocols/jabber/jabber.c:1581
-#: ../libpurple/protocols/jabber/jabber.c:1604
-#: ../libpurple/protocols/jabber/jabber.c:1627
-#, fuzzy
+msgstr "描述情緒"
+
+#: ../libpurple/protocols/jabber/jabber.c:1574
+#: ../libpurple/protocols/jabber/jabber.c:1588
+#: ../libpurple/protocols/jabber/jabber.c:1602
+#: ../libpurple/protocols/jabber/jabber.c:1616
+#: ../libpurple/protocols/jabber/jabber.c:1630
+msgid "Allow Buzz"
+msgstr "允許「嗶」功能"
+
+#: ../libpurple/protocols/jabber/jabber.c:1648
 msgid "Tune Artist"
-msgstr "平面設計"
-
-# FIXME 原文一詞兩義,根本無法翻譯
-#: ../libpurple/protocols/jabber/jabber.c:1536
-#: ../libpurple/protocols/jabber/jabber.c:1559
-#: ../libpurple/protocols/jabber/jabber.c:1582
-#: ../libpurple/protocols/jabber/jabber.c:1605
-#: ../libpurple/protocols/jabber/jabber.c:1628
-#, fuzzy
+msgstr "樂手名稱"
+
+#: ../libpurple/protocols/jabber/jabber.c:1649
 msgid "Tune Title"
-msgstr "職銜"
-
-#: ../libpurple/protocols/jabber/jabber.c:1537
-#: ../libpurple/protocols/jabber/jabber.c:1560
-#: ../libpurple/protocols/jabber/jabber.c:1583
-#: ../libpurple/protocols/jabber/jabber.c:1606
-#: ../libpurple/protocols/jabber/jabber.c:1629
+msgstr "樂曲名稱"
+
+#: ../libpurple/protocols/jabber/jabber.c:1650
 msgid "Tune Album"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1538
-#: ../libpurple/protocols/jabber/jabber.c:1561
-#: ../libpurple/protocols/jabber/jabber.c:1584
-#: ../libpurple/protocols/jabber/jabber.c:1607
-#: ../libpurple/protocols/jabber/jabber.c:1630
+msgstr "專輯名稱"
+
+#: ../libpurple/protocols/jabber/jabber.c:1651
 msgid "Tune Genre"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1539
-#: ../libpurple/protocols/jabber/jabber.c:1562
-#: ../libpurple/protocols/jabber/jabber.c:1585
-#: ../libpurple/protocols/jabber/jabber.c:1608
-#: ../libpurple/protocols/jabber/jabber.c:1631
-#, fuzzy
+msgstr "樂曲種類"
+
+# XXX 譯文有待改進
+#: ../libpurple/protocols/jabber/jabber.c:1652
 msgid "Tune Comment"
-msgstr "好友說明"
-
-#: ../libpurple/protocols/jabber/jabber.c:1540
-#: ../libpurple/protocols/jabber/jabber.c:1563
-#: ../libpurple/protocols/jabber/jabber.c:1586
-#: ../libpurple/protocols/jabber/jabber.c:1609
-#: ../libpurple/protocols/jabber/jabber.c:1632
+msgstr "樂曲註釋"
+
+# NOTE 參見 http://www.xmpp.org/extensions/xep-0118.html
+# FIXME 
+#: ../libpurple/protocols/jabber/jabber.c:1653
 msgid "Tune Track"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1541
-#: ../libpurple/protocols/jabber/jabber.c:1564
-#: ../libpurple/protocols/jabber/jabber.c:1587
-#: ../libpurple/protocols/jabber/jabber.c:1610
-#: ../libpurple/protocols/jabber/jabber.c:1633
+msgstr "樂曲 ID"
+
+#: ../libpurple/protocols/jabber/jabber.c:1654
 msgid "Tune Time"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1542
-#: ../libpurple/protocols/jabber/jabber.c:1565
-#: ../libpurple/protocols/jabber/jabber.c:1588
-#: ../libpurple/protocols/jabber/jabber.c:1611
-#: ../libpurple/protocols/jabber/jabber.c:1634
+msgstr "樂曲長度"
+
+#: ../libpurple/protocols/jabber/jabber.c:1655
 msgid "Tune Year"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1543
-#: ../libpurple/protocols/jabber/jabber.c:1566
-#: ../libpurple/protocols/jabber/jabber.c:1589
-#: ../libpurple/protocols/jabber/jabber.c:1612
-#: ../libpurple/protocols/jabber/jabber.c:1635
+msgstr "作曲年份"
+
+#: ../libpurple/protocols/jabber/jabber.c:1656
 msgid "Tune URL"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1545
-#: ../libpurple/protocols/jabber/jabber.c:1568
-#: ../libpurple/protocols/jabber/jabber.c:1591
-#: ../libpurple/protocols/jabber/jabber.c:1614
-#: ../libpurple/protocols/jabber/jabber.c:1637
-#, fuzzy
-msgid "Allow Buzz"
-msgstr "允許"
-
-#: ../libpurple/protocols/jabber/jabber.c:1665
+msgstr "樂曲網址"
+
+#: ../libpurple/protocols/jabber/jabber.c:1672
 msgid "Password Changed"
 msgstr "密碼修改成功"
 
-#: ../libpurple/protocols/jabber/jabber.c:1666
+#: ../libpurple/protocols/jabber/jabber.c:1673
 msgid "Your password has been changed."
 msgstr "成功修改了你的密碼。"
 
-#: ../libpurple/protocols/jabber/jabber.c:1670
-#: ../libpurple/protocols/jabber/jabber.c:1671
+#: ../libpurple/protocols/jabber/jabber.c:1679
+#: ../libpurple/protocols/jabber/jabber.c:1680
 msgid "Error changing password"
 msgstr "修改密碼期間出現錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:1728
+#: ../libpurple/protocols/jabber/jabber.c:1737
 msgid "Password (again)"
 msgstr "舊密碼(再次確認)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1734
-#: ../libpurple/protocols/jabber/jabber.c:1735
+#: ../libpurple/protocols/jabber/jabber.c:1743
+#: ../libpurple/protocols/jabber/jabber.c:1744
 msgid "Change XMPP Password"
 msgstr "修改 XMPP 密碼"
 
-#: ../libpurple/protocols/jabber/jabber.c:1735
+#: ../libpurple/protocols/jabber/jabber.c:1744
 msgid "Please enter your new password"
 msgstr "請輸入你的新密碼"
 
-#: ../libpurple/protocols/jabber/jabber.c:1749
-#: ../libpurple/protocols/oscar/oscar.c:6388
-#: ../libpurple/protocols/silc/silc.c:1093
-#: ../libpurple/protocols/silc10/silc.c:1004
+#: ../libpurple/protocols/jabber/jabber.c:1758
+#: ../libpurple/protocols/oscar/oscar.c:6438
+#: ../libpurple/protocols/silc/silc.c:1236
+#: ../libpurple/protocols/silc10/silc.c:1007
 msgid "Set User Info..."
 msgstr "設定使用者資訊..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1754
-#: ../libpurple/protocols/oscar/oscar.c:6399
-#: ../libpurple/protocols/silc/silc.c:1089
-#: ../libpurple/protocols/silc10/silc.c:1000
+#: ../libpurple/protocols/jabber/jabber.c:1763
+#: ../libpurple/protocols/oscar/oscar.c:6449
+#: ../libpurple/protocols/silc/silc.c:1232
+#: ../libpurple/protocols/silc10/silc.c:1003
 msgid "Change Password..."
 msgstr "修改密碼..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1759
+#: ../libpurple/protocols/jabber/jabber.c:1768
 msgid "Search for Users..."
 msgstr "搜尋使用者..."
 
-# NOTE 見 http://www.jabber.org/jeps/jep-0103.html
-#: ../libpurple/protocols/jabber/jabber.c:1845
+# NOTE 見 http://www.jabber.org/jeps/jep-0103.html
+#: ../libpurple/protocols/jabber/jabber.c:1859
 msgid "Bad Request"
 msgstr "傳送網址時發生了不明的錯誤"
 
-#  NOTE Jabber 錯誤 <conflict/>,表示已透過同一名稱或在同一位址,以相同的 Resource
-#  NOTE(大概係指登入用的使用者自定字串)或工作階段登入,以致無法存取
-#  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#  NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1847
+#  NOTE Jabber 錯誤 <conflict/>,表示已透過同一名稱或在同一位址,以相同的 Resource
+#  NOTE(大概係指登入用的使用者自定字串)或工作階段登入,以致無法存取
+#  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
+#  NOTE 譯文更動 by Ambrose
+#: ../libpurple/protocols/jabber/jabber.c:1861
 msgid "Conflict"
 msgstr "名稱或位址衝突"
 
-#: ../libpurple/protocols/jabber/jabber.c:1849
+#: ../libpurple/protocols/jabber/jabber.c:1863
 msgid "Feature Not Implemented"
 msgstr "該功能尚未實作"
 
-#  NOTE Jabber 錯誤 <forbidden/>,意思正常(表示權限不夠)
-#  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libpurple/protocols/jabber/jabber.c:1851
+#  NOTE Jabber 錯誤 <forbidden/>,意思正常(表示權限不夠)
+#  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
+#: ../libpurple/protocols/jabber/jabber.c:1865
 msgid "Forbidden"
 msgstr "權限不夠"
 
-#  NOTE Jabber 錯誤 <gone/>,表示使用者或伺服器曾經上線,後來離了線
-#  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libpurple/protocols/jabber/jabber.c:1853
+#  NOTE Jabber 錯誤 <gone/>,表示使用者或伺服器曾經上線,後來離了線
+#  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
+#: ../libpurple/protocols/jabber/jabber.c:1867
 msgid "Gone"
 msgstr "已離線"
 
-#: ../libpurple/protocols/jabber/jabber.c:1855
-#: ../libpurple/protocols/jabber/jabber.c:1935
+#: ../libpurple/protocols/jabber/jabber.c:1869
+#: ../libpurple/protocols/jabber/jabber.c:1950
 msgid "Internal Server Error"
 msgstr "伺服器內部錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:1857
+#: ../libpurple/protocols/jabber/jabber.c:1871
 msgid "Item Not Found"
 msgstr "項目未找到"
 
-# FIXME 譯文聽來好像有點怪 20070518 acli
-#: ../libpurple/protocols/jabber/jabber.c:1859
+# FIXME 譯文聽來好像有點怪 20070518 acli
+#: ../libpurple/protocols/jabber/jabber.c:1873
 msgid "Malformed XMPP ID"
 msgstr "畸型的 XMPP 帳號"
 
-#  NOTE Jabber 錯誤 <not-acceptable/>,表示所送出的要求未能達到伺服器或收件人所訂下的
-#  NOTE 條件(例如訊息中含有禁字),以致無法存取
-#  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libpurple/protocols/jabber/jabber.c:1861
+#  NOTE Jabber 錯誤 <not-acceptable/>,表示所送出的要求未能達到伺服器或收件人所訂下的
+#  NOTE 條件(例如訊息中含有禁字),以致無法存取
+#  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
+#: ../libpurple/protocols/jabber/jabber.c:1875
 msgid "Not Acceptable"
 msgstr "無法接受"
 
-#: ../libpurple/protocols/jabber/jabber.c:1863
+#: ../libpurple/protocols/jabber/jabber.c:1877
 msgid "Not Allowed"
 msgstr "不被允許"
 
-#: ../libpurple/protocols/jabber/jabber.c:1867
+#: ../libpurple/protocols/jabber/jabber.c:1881
 msgid "Payment Required"
 msgstr "必須付款"
 
-#  NOTE Jabber 錯誤 <recipient-unavailable/>
-#  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#  NOTE「暫時無法聯絡」應該比「不存在」通順
-#  NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1869
+#  NOTE Jabber 錯誤 <recipient-unavailable/>
+#  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
+#  NOTE「暫時無法聯絡」應該比「不存在」通順
+#  NOTE 譯文更動 by Ambrose
+#: ../libpurple/protocols/jabber/jabber.c:1883
 msgid "Recipient Unavailable"
 msgstr "暫時無法聯絡接收者"
 
-#: ../libpurple/protocols/jabber/jabber.c:1873
+#: ../libpurple/protocols/jabber/jabber.c:1887
 msgid "Registration Required"
 msgstr "必須註冊"
 
-#: ../libpurple/protocols/jabber/jabber.c:1875
+#: ../libpurple/protocols/jabber/jabber.c:1889
 msgid "Remote Server Not Found"
 msgstr "遠端伺服器未找到"
 
-#: ../libpurple/protocols/jabber/jabber.c:1877
+#: ../libpurple/protocols/jabber/jabber.c:1891
 msgid "Remote Server Timeout"
 msgstr "遠端伺服器逾時"
 
-#: ../libpurple/protocols/jabber/jabber.c:1879
+#: ../libpurple/protocols/jabber/jabber.c:1893
 msgid "Server Overloaded"
 msgstr "伺服器超載"
 
-#  NOTE Jabber 錯誤 <service-unavailable/>,表示伺服器收到一個意義不明的指令
-#  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#  NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1881
+#  NOTE Jabber 錯誤 <service-unavailable/>,表示伺服器收到一個意義不明的指令
+#  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
+#  NOTE 譯文更動 by Ambrose
+#: ../libpurple/protocols/jabber/jabber.c:1895
 msgid "Service Unavailable"
 msgstr "不提供該項服務"
 
-#  NOTE Jabber 錯誤 <subscription-required/>,表示使用「服務」前
-#  NOTE 必須事先取得「Subscription」(認證)
-#  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libpurple/protocols/jabber/jabber.c:1883
+#  NOTE Jabber 錯誤 <subscription-required/>,表示使用「服務」前
+#  NOTE 必須事先取得「Subscription」(認證)
+#  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
+#: ../libpurple/protocols/jabber/jabber.c:1897
 msgid "Subscription Required"
 msgstr "必須認證"
 
-#: ../libpurple/protocols/jabber/jabber.c:1885
+#: ../libpurple/protocols/jabber/jabber.c:1899
 msgid "Unexpected Request"
 msgstr "未預期的要求"
 
-#: ../libpurple/protocols/jabber/jabber.c:1892
+#: ../libpurple/protocols/jabber/jabber.c:1907
 msgid "Authorization Aborted"
 msgstr "認證取消"
 
-#: ../libpurple/protocols/jabber/jabber.c:1894
+#: ../libpurple/protocols/jabber/jabber.c:1909
 msgid "Incorrect encoding in authorization"
 msgstr "認證含錯誤的編碼"
 
-#: ../libpurple/protocols/jabber/jabber.c:1897
+#: ../libpurple/protocols/jabber/jabber.c:1911
 msgid "Invalid authzid"
 msgstr "無效的 authzid"
 
-# XXX 要覆查譯文
-#: ../libpurple/protocols/jabber/jabber.c:1900
+# XXX 要覆查譯文
+#: ../libpurple/protocols/jabber/jabber.c:1913
 msgid "Invalid Authorization Mechanism"
 msgstr "無效的認證機制"
 
-#: ../libpurple/protocols/jabber/jabber.c:1903
+#: ../libpurple/protocols/jabber/jabber.c:1916
 msgid "Authorization mechanism too weak"
 msgstr "認證機制太薄弱了"
 
-#: ../libpurple/protocols/jabber/jabber.c:1911
+#: ../libpurple/protocols/jabber/jabber.c:1924
 msgid "Temporary Authentication Failure"
 msgstr "認證暫時失敗"
 
-#: ../libpurple/protocols/jabber/jabber.c:1914
+#: ../libpurple/protocols/jabber/jabber.c:1927
 msgid "Authentication Failure"
 msgstr "認證失敗"
 
-#: ../libpurple/protocols/jabber/jabber.c:1920
+#: ../libpurple/protocols/jabber/jabber.c:1935
 msgid "Bad Format"
 msgstr "無效的格式"
 
-#: ../libpurple/protocols/jabber/jabber.c:1922
+#: ../libpurple/protocols/jabber/jabber.c:1937
 msgid "Bad Namespace Prefix"
 msgstr "無效的 Namespace Prefix"
 
-# FIXME 很不通順,譯文有待改進
-# NOTE Jabber 協定的「Resource」一詞為使用者自定的一種字串,
-# NOTE 表示在多處地方同時登入了的情形下,目前的實在位置
-# NOTE 見 http://www.jabber.org/user/userguide.html
-# NOTE Jabber 協定中 Stanza Error 的一種,即 <conflict/>
-# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1925
+# FIXME 很不通順,譯文有待改進
+# NOTE Jabber 協定的「Resource」一詞為使用者自定的一種字串,
+# NOTE 表示在多處地方同時登入了的情形下,目前的實在位置
+# NOTE 見 http://www.jabber.org/user/userguide.html
+# NOTE Jabber 協定中 Stanza Error 的一種,即 <conflict/>
+# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
+#: ../libpurple/protocols/jabber/jabber.c:1940
 msgid "Resource Conflict"
 msgstr "已經以指定的 Resource 在其他地方登入"
 
-#: ../libpurple/protocols/jabber/jabber.c:1927
-#: ../libpurple/protocols/silc/silc.c:244
+#: ../libpurple/protocols/jabber/jabber.c:1942
+#: ../libpurple/protocols/silc/silc.c:350
 #: ../libpurple/protocols/silc10/ops.c:1720
 msgid "Connection Timeout"
 msgstr "連線已逾時"
 
-# NOTE Jabber 協定中 Stream Error 的一種,即 <host-gone/>
-# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1929
+# NOTE Jabber 協定中 Stream Error 的一種,即 <host-gone/>
+# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
+#: ../libpurple/protocols/jabber/jabber.c:1944
 msgid "Host Gone"
 msgstr "伺服器已不再支援所指定的伺服器名稱"
 
-# NOTE Jabber 協定中 Stream Error 的一種,即 <host-unknown/>
-# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1931
+# NOTE Jabber 協定中 Stream Error 的一種,即 <host-unknown/>
+# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
+#: ../libpurple/protocols/jabber/jabber.c:1946
 msgid "Host Unknown"
 msgstr "不明的伺服器名稱"
 
-#: ../libpurple/protocols/jabber/jabber.c:1933
+#: ../libpurple/protocols/jabber/jabber.c:1948
 msgid "Improper Addressing"
 msgstr "錯誤的定址"
 
-#: ../libpurple/protocols/jabber/jabber.c:1937
+#: ../libpurple/protocols/jabber/jabber.c:1952
 msgid "Invalid ID"
 msgstr "帳號無效"
 
-# FIXME 必須覆查譯文
-#: ../libpurple/protocols/jabber/jabber.c:1939
+# FIXME 必須覆查譯文
+#: ../libpurple/protocols/jabber/jabber.c:1954
 msgid "Invalid Namespace"
 msgstr "命名空間無效"
 
-#: ../libpurple/protocols/jabber/jabber.c:1941
+#: ../libpurple/protocols/jabber/jabber.c:1956
 msgid "Invalid XML"
 msgstr "無效的 XML"
 
-# XXX 這是暫譯,譯文有待改進
-# NOTE Jabber 協定中的「nonmatching-hosts」
-# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1943
+# XXX 這是暫譯,譯文有待改進
+# NOTE Jabber 協定中的「nonmatching-hosts」
+# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
+#: ../libpurple/protocols/jabber/jabber.c:1958
 msgid "Non-matching Hosts"
 msgstr "主機名稱不相乎"
 
-# XXX 這是暫譯,譯文有待改進。不過好像真的有人這樣寫,大概沒有太大的問題
-# NOTE Jabber 協定 xmpp-core 中 Stream Error 的一種,即 <policy-violation/>
-# NOTE 見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-19.html
-#: ../libpurple/protocols/jabber/jabber.c:1947
+# XXX 這是暫譯,譯文有待改進。不過好像真的有人這樣寫,大概沒有太大的問題
+# NOTE Jabber 協定 xmpp-core 中 Stream Error 的一種,即 <policy-violation/>
+# NOTE 見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-19.html
+#: ../libpurple/protocols/jabber/jabber.c:1962
 msgid "Policy Violation"
 msgstr "違反了服務政策"
 
-# NOTE Jabber 協定 Stream Error 的一種,即 <remote-connection-failed/>
-# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1949
+# NOTE Jabber 協定 Stream Error 的一種,即 <remote-connection-failed/>
+# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
+#: ../libpurple/protocols/jabber/jabber.c:1964
 msgid "Remote Connection Failed"
 msgstr "無法連線至認證所需的遠端資源"
 
-# NOTE Jabber 協定 Stream Error 的一種,即 <resource-constraint/>
-# NOTE 在這裏的 Resource 一詞與登入時使用者所用的 Resource 一詞意義並不相同
-# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1951
+# NOTE Jabber 協定 Stream Error 的一種,即 <resource-constraint/>
+# NOTE 在這裏的 Resource 一詞與登入時使用者所用的 Resource 一詞意義並不相同
+# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
+#: ../libpurple/protocols/jabber/jabber.c:1966
 msgid "Resource Constraint"
 msgstr "伺服器資源短缺"
 
-# NOTE Jabber 協定 xmpp-core 中 Stream Error 的一種,即 <restricted-xml/>
-# NOTE 見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-18.html
-#: ../libpurple/protocols/jabber/jabber.c:1953
+# NOTE Jabber 協定 xmpp-core 中 Stream Error 的一種,即 <restricted-xml/>
+# NOTE 見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-18.html
+#: ../libpurple/protocols/jabber/jabber.c:1968
 msgid "Restricted XML"
 msgstr "XML 中存在有 Jabber 協定不容許的 XML 元素"
 
-# NOTE Jabber 協定中 Stream Error 的一種,即 <see-other-host/>
-# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1955
+# NOTE Jabber 協定中 Stream Error 的一種,即 <see-other-host/>
+# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
+#: ../libpurple/protocols/jabber/jabber.c:1970
 msgid "See Other Host"
 msgstr "伺服器在認證期間要求了重新導向至另一伺服器"
 
-# NOTE Jabber 協定中 Stream Error 的一種,即 <system-shutdown/>
-# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1957
+# NOTE Jabber 協定中 Stream Error 的一種,即 <system-shutdown/>
+# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
+#: ../libpurple/protocols/jabber/jabber.c:1972
 msgid "System Shutdown"
 msgstr "伺服器目前在關機中"
 
-# NOTE 見 http://www.jabber.org/jeps/jep-0103.html
-#: ../libpurple/protocols/jabber/jabber.c:1959
+# NOTE 見 http://www.jabber.org/jeps/jep-0103.html
+#: ../libpurple/protocols/jabber/jabber.c:1974
 msgid "Undefined Condition"
 msgstr "傳送網址時發生了不明的錯誤"
 
-# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-August/001431.html
-#: ../libpurple/protocols/jabber/jabber.c:1961
+# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-August/001431.html
+#: ../libpurple/protocols/jabber/jabber.c:1976
 msgid "Unsupported Encoding"
 msgstr "伺服器不支援指定的字符編碼"
 
-# NOTE Jabber 協定中 Stream Error 的一種,即 <unsupported-stanza-type/>
-# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
-#: ../libpurple/protocols/jabber/jabber.c:1963
+# NOTE Jabber 協定中 Stream Error 的一種,即 <unsupported-stanza-type/>
+# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
+#: ../libpurple/protocols/jabber/jabber.c:1978
 msgid "Unsupported Stanza Type"
 msgstr "伺服器不支援指定的段落類別 (Stanza Type)"
 
-# NOTE Jabber 協定中 Stream Error 的一種,即 <unsupported-version/>
-# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
-#: ../libpurple/protocols/jabber/jabber.c:1965
+# NOTE Jabber 協定中 Stream Error 的一種,即 <unsupported-version/>
+# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
+#: ../libpurple/protocols/jabber/jabber.c:1980
 msgid "Unsupported Version"
 msgstr "不支援指定的 XMPP 版本"
 
-#: ../libpurple/protocols/jabber/jabber.c:1967
+#: ../libpurple/protocols/jabber/jabber.c:1982
 msgid "XML Not Well Formed"
 msgstr "XML 文件格式有問題"
 
-#: ../libpurple/protocols/jabber/jabber.c:1969
+#: ../libpurple/protocols/jabber/jabber.c:1984
 msgid "Stream Error"
 msgstr "串流錯誤"
 
-#: ../libpurple/protocols/jabber/jabber.c:2052
+#: ../libpurple/protocols/jabber/jabber.c:2069
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "無法禁止使用者 %s"
 
-#  XXX 暫譯「(會員)等級」 - ambrose 20070415
-#  NOTE: Unknown affiliation 指 owner、admin、member、outcast、none 五種以外的其他不明數值
-#: ../libpurple/protocols/jabber/jabber.c:2072
+#  XXX 暫譯「(會員)等級」 - ambrose 20070415
+#  NOTE: Unknown affiliation 指 owner、admin、member、outcast、none 五種以外的其他不明數值
+#: ../libpurple/protocols/jabber/jabber.c:2089
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "不明的等級:「%s」"
 
-#  XXX 暫譯 - ambrose 20070415
-#: ../libpurple/protocols/jabber/jabber.c:2077
+#  XXX 暫譯 - ambrose 20070415
+#: ../libpurple/protocols/jabber/jabber.c:2094
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "無法將使用者 %s 的等級設定為「%s」"
 
-#  XXX 暫譯 - ambrose 20070415
-#  NOTE: Unknown role 指 moderator、participant、visitor、none 四種以外的其他不明數值
-#: ../libpurple/protocols/jabber/jabber.c:2096
+#  XXX 暫譯 - ambrose 20070415
+#  NOTE: Unknown role 指 moderator、participant、visitor、none 四種以外的其他不明數值
+#: ../libpurple/protocols/jabber/jabber.c:2113
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "不明的身份:「%s」"
 
-#  XXX 暫譯 - ambrose 20070415
-#: ../libpurple/protocols/jabber/jabber.c:2101
+#  XXX 暫譯 - ambrose 20070415
+#: ../libpurple/protocols/jabber/jabber.c:2118
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "無法將使用者 %2$s 的身份設定為「%1$s」"
 
-#: ../libpurple/protocols/jabber/jabber.c:2154
+#: ../libpurple/protocols/jabber/jabber.c:2171
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "無法踢出使用者 %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2185
-#, fuzzy, c-format
+#: ../libpurple/protocols/jabber/jabber.c:2202
+#, c-format
 msgid "Unable to ping user %s"
-msgstr "無法禁止使用者 %s"
-
-#: ../libpurple/protocols/jabber/jabber.c:2207
-#: ../libpurple/protocols/jabber/jabber.c:2217
+msgstr "無法 Ping 使用者 %s"
+
+#: ../libpurple/protocols/jabber/jabber.c:2220
+#: ../libpurple/protocols/jabber/jabber.c:2231
 #, c-format
 msgid "Unable to buzz, because there is nothing known about user %s."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:2213
+msgstr "無法「嗶」使用者 %s ,因為沒有有關對方的任何資料。"
+
+#: ../libpurple/protocols/jabber/jabber.c:2226
 #, c-format
 msgid "Unable to buzz, because user %s might be offline."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:2239
-#, fuzzy, c-format
+msgstr "無法「嗶」使用者 %s ,因為對方目前可能離線。"
+
+#: ../libpurple/protocols/jabber/jabber.c:2257
+#, c-format
 msgid "Unable to buzz, because the user %s does not support it."
-msgstr "無法傳送檔案至 %s,因為對方不支援檔案傳輸"
-
-#: ../libpurple/protocols/jabber/jabber.c:2253
+msgstr "無法「嗶」使用者 %s ,因為對方的用戶端不支援這個功能。"
+
+#: ../libpurple/protocols/jabber/jabber.c:2279
+#: ../libpurple/protocols/yahoo/yahoo.c:4130
+msgid "Buzz"
+msgstr "嗶!"
+
+#: ../libpurple/protocols/jabber/jabber.c:2280
+#: ../libpurple/protocols/jabber/message.c:308
+#: ../libpurple/protocols/yahoo/yahoo.c:4131
+#, c-format
+msgid "%s has buzzed you!"
+msgstr "%s「嗶」了你一聲"
+
+# XXX 這是暫譯 - acli 20070913
+#: ../libpurple/protocols/jabber/jabber.c:2281
+#: ../libpurple/protocols/yahoo/yahoo.c:4132
+#, c-format
+msgid "Buzzing %s..."
+msgstr "正在給 %s 一個嗶..."
+
+#: ../libpurple/protocols/jabber/jabber.c:2313
 msgid "config:  Configure a chat room."
 msgstr "config:設定一個聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:2257
+#: ../libpurple/protocols/jabber/jabber.c:2317
 msgid "configure:  Configure a chat room."
 msgstr "configure:設定一個聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:2266
+#: ../libpurple/protocols/jabber/jabber.c:2326
 msgid "part [room]:  Leave the room."
 msgstr "part [聊天室]:離開聊天室。"
 
-#: ../libpurple/protocols/jabber/jabber.c:2271
+#: ../libpurple/protocols/jabber/jabber.c:2331
 msgid "register:  Register with a chat room."
 msgstr "register:加入一個聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:2277
+#: ../libpurple/protocols/jabber/jabber.c:2337
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [新主題]:檢視或修改聊天主題"
 
-#: ../libpurple/protocols/jabber/jabber.c:2283
+#: ../libpurple/protocols/jabber/jabber.c:2343
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;使用者&gt; [聊天室]:禁止某使用者進入聊天室"
 
-#  XXX 暫譯「(會員)等級」 - ambrose 20070415
-#: ../libpurple/protocols/jabber/jabber.c:2289
+#  XXX 暫譯「(會員)等級」 - ambrose 20070415
+#: ../libpurple/protocols/jabber/jabber.c:2349
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
-msgstr ""
-"affiliate &lt;使用者&gt; &lt;owner|admin|member|outcast|none&gt;: 設定使用者"
-"在這聊天室內的等級"
-
-#  NOTE 譯文改動 by ambrose
-#: ../libpurple/protocols/jabber/jabber.c:2295
+msgstr "affiliate &lt;使用者&gt; &lt;owner|admin|member|outcast|none&gt;: 設定使用者在這聊天室內的等級"
+
+#  NOTE 譯文改動 by ambrose
+#: ../libpurple/protocols/jabber/jabber.c:2355
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
-msgstr ""
-"role &lt;使用者&gt; &lt;moderator|participant|visitor|none&gt;: 設定使用者在"
-"這聊天室內的身份。"
-
-#: ../libpurple/protocols/jabber/jabber.c:2301
+msgstr "role &lt;使用者&gt; &lt;moderator|participant|visitor|none&gt;: 設定使用者在這聊天室內的身份。"
+
+#: ../libpurple/protocols/jabber/jabber.c:2361
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;使用者&gt; [訊息]:邀請使用者進入聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:2307
+#: ../libpurple/protocols/jabber/jabber.c:2367
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;聊天室&gt; [伺服器]:加入位於這個伺服器的一個聊天室"
 
-#: ../libpurple/protocols/jabber/jabber.c:2313
+#: ../libpurple/protocols/jabber/jabber.c:2373
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;使用者&gt; [聊天室]:將使用者從聊天室中踢出。"
 
-#: ../libpurple/protocols/jabber/jabber.c:2318
+#: ../libpurple/protocols/jabber/jabber.c:2378
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
-msgstr "msg &lt;使用者&gt; &lt;訊息&gt;:傳送私人訊息給另一個使用者"
-
-#: ../libpurple/protocols/jabber/jabber.c:2324
+msgstr "msg &lt;使用者&gt; &lt;訊息&gt;:傳送私人訊息給另一個使用者。"
+
+#: ../libpurple/protocols/jabber/jabber.c:2384
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:2329
-#: ../libpurple/protocols/yahoo/yahoo.c:4145
+msgstr "ping &lt;jid&gt;:Ping 一個使用者/組件/伺服器。"
+
+#: ../libpurple/protocols/jabber/jabber.c:2389
+#: ../libpurple/protocols/yahoo/yahoo.c:4156
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: 給好友一個「嗶」引他(她)注意"
 
@@ -6317,36 +6298,36 @@
 msgstr "XMPP 協定模組"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:202 ../pidgin/gtkaccount.c:506
+#: ../libpurple/protocols/jabber/libxmpp.c:205 ../pidgin/gtkaccount.c:509
 msgid "Domain"
 msgstr "域名"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:210
+#: ../libpurple/protocols/jabber/libxmpp.c:213
 msgid "Require SSL/TLS"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/libxmpp.c:214
+msgstr "需要 SSL/TLS"
+
+#: ../libpurple/protocols/jabber/libxmpp.c:217
 msgid "Force old (port 5223) SSL"
 msgstr "強迫使用舊式 SSL (port 5223)"
 
-#  NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/jabber/libxmpp.c:219
+#  NOTE 譯文更動 by Ambrose
+#: ../libpurple/protocols/jabber/libxmpp.c:222
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "允許使用明文,在未經加密的串流上進行認證"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:224
-#: ../libpurple/protocols/myspace/myspace.c:3277
-#: ../libpurple/protocols/simple/simple.c:1902
+#: ../libpurple/protocols/jabber/libxmpp.c:227
+#: ../libpurple/protocols/myspace/myspace.c:3305
+#: ../libpurple/protocols/simple/simple.c:2089
 msgid "Connect port"
 msgstr "連線埠"
 
 #. TODO: default to automatically try different ports. Make the user be
 #. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
-#: ../libpurple/protocols/jabber/libxmpp.c:228
-#: ../libpurple/protocols/myspace/myspace.c:3274
-#: ../libpurple/protocols/silc/silc.c:1914
-#: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
+#: ../libpurple/protocols/jabber/libxmpp.c:231
+#: ../libpurple/protocols/myspace/myspace.c:3302
+#: ../libpurple/protocols/silc/silc.c:2057
+#: ../libpurple/protocols/silc10/silc.c:1860 ../pidgin/gtkaccount.c:840
 msgid "Connect server"
 msgstr "連結伺服器"
 
@@ -6355,74 +6336,68 @@
 msgid "%s has left the conversation."
 msgstr "%s 已經離開這個交談。"
 
-#: ../libpurple/protocols/jabber/message.c:161
+#: ../libpurple/protocols/jabber/message.c:162
 #, c-format
 msgid "Message from %s"
 msgstr "由 %s 發出的訊息"
 
-#: ../libpurple/protocols/jabber/message.c:225
+#: ../libpurple/protocols/jabber/message.c:226
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s 把聊天主題設定為:%s"
 
-#: ../libpurple/protocols/jabber/message.c:227
+#: ../libpurple/protocols/jabber/message.c:228
 #, c-format
 msgid "The topic is: %s"
 msgstr "主題:%s"
 
-#: ../libpurple/protocols/jabber/message.c:275
+#: ../libpurple/protocols/jabber/message.c:276
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "無法傳送訊息到 %s:%s"
 
-#: ../libpurple/protocols/jabber/message.c:278
+#: ../libpurple/protocols/jabber/message.c:279
 msgid "XMPP Message Error"
 msgstr "XMPP 訊息錯誤"
 
-#: ../libpurple/protocols/jabber/message.c:307
-#: ../libpurple/protocols/yahoo/yahoo.c:4120
-#, fuzzy, c-format
-msgid "%s has buzzed you!"
-msgstr "%s 已將你 [%s] 加入到他(她)的好友清單"
-
-#: ../libpurple/protocols/jabber/message.c:407
+#: ../libpurple/protocols/jabber/message.c:408
 #, c-format
 msgid " (Code %s)"
 msgstr " (代碼 %s)"
 
-#: ../libpurple/protocols/jabber/parser.c:196
+#: ../libpurple/protocols/jabber/parser.c:198
 msgid "XML Parse error"
 msgstr "XML 分析錯誤"
 
-#: ../libpurple/protocols/jabber/presence.c:427
+#: ../libpurple/protocols/jabber/presence.c:435
 msgid "Unknown Error in presence"
 msgstr "不明的上線狀態錯誤"
 
-#: ../libpurple/protocols/jabber/presence.c:508
-#: ../libpurple/protocols/jabber/presence.c:509
+#: ../libpurple/protocols/jabber/presence.c:516
+#: ../libpurple/protocols/jabber/presence.c:517
 msgid "Create New Room"
 msgstr "建立新聊天室"
 
-#: ../libpurple/protocols/jabber/presence.c:510
+#: ../libpurple/protocols/jabber/presence.c:518
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr "你正要建立一個新的聊天室,你要設定它,還是使用預設值?"
 
-#: ../libpurple/protocols/jabber/presence.c:516
+#: ../libpurple/protocols/jabber/presence.c:524
 msgid "_Configure Room"
 msgstr "設定聊天室(_C)"
 
-#: ../libpurple/protocols/jabber/presence.c:517
+#: ../libpurple/protocols/jabber/presence.c:525
 msgid "_Accept Defaults"
 msgstr "使用預設值(_A)"
 
-#: ../libpurple/protocols/jabber/presence.c:559
+#: ../libpurple/protocols/jabber/presence.c:567
 #, c-format
 msgid "Error in chat %s"
 msgstr "聊天室 %s 發生錯誤"
 
-#: ../libpurple/protocols/jabber/presence.c:563
+#: ../libpurple/protocols/jabber/presence.c:571
 #, c-format
 msgid "Error joining chat %s"
 msgstr "加入聊天室 %s 時發生錯誤"
@@ -6439,785 +6414,855 @@
 msgstr "傳送檔案失敗"
 
 #: ../libpurple/protocols/jabber/si.c:838
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send file to %s, invalid JID"
-msgstr "無法送出訊息給 %s。"
+msgstr "無法送出訊息給 %s,因為這個 JID 是無效的"
 
 #: ../libpurple/protocols/jabber/si.c:840
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send file to %s, user is not online"
-msgstr "無法傳送檔案至 %s,因為對方不支援檔案傳輸"
-
+msgstr "無法傳送檔案至 %s,因為對方目前沒有連線"
+
+#  NOTE「not subscribed to user presence」是指沒有「SUB_TO」的 subscription
+#  FIXME 這很明顯是有問題的譯文,但這是這個 PO 檔現有的譯法(見「To」條);
+#  FIXME 如果這個要改,其他有關 presence 的譯文也要一齊改才行。-acli 20070614
 #: ../libpurple/protocols/jabber/si.c:842
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
-msgstr "無法傳送檔案至 %s,因為對方不支援檔案傳輸"
-
+msgstr "無法傳送檔案至 %s,因為未獲對方認證"
+
+#  FIXME 這不通順 - acli 20070614
 #: ../libpurple/protocols/jabber/si.c:857
 #, c-format
 msgid "Please select which resource of %s you would like to send a file to"
-msgstr ""
+msgstr "請指定檔案應該傳送至 %s 的那一個 Resource"
 
 #: ../libpurple/protocols/jabber/si.c:873
-#, fuzzy
 msgid "Select a Resource"
-msgstr "選擇檔案"
-
-#: ../libpurple/protocols/jabber/usermood.c:179
-#: ../libpurple/protocols/jabber/usermood.c:180
-#, fuzzy
+msgstr "選擇一個 Resource"
+
+#: ../libpurple/protocols/jabber/usermood.c:197
+#: ../libpurple/protocols/jabber/usermood.c:198
 msgid "Edit User Mood"
-msgstr "使用者模式"
-
-#: ../libpurple/protocols/jabber/usermood.c:181
+msgstr "編輯使用者情緒"
+
+#: ../libpurple/protocols/jabber/usermood.c:199
 msgid "Please select your mood from the list."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/usermood.c:183
+msgstr "請從列表選擇你目前的情緒。"
+
+#: ../libpurple/protocols/jabber/usermood.c:201
 #: ../libpurple/protocols/jabber/usernick.c:78
-#, fuzzy
 msgid "Set"
-msgstr "設定(_S)"
-
-#: ../libpurple/protocols/jabber/usermood.c:191
-#, fuzzy
+msgstr "設定"
+
+#: ../libpurple/protocols/jabber/usermood.c:209
 msgid "Set Mood..."
-msgstr "送出即時訊息..."
+msgstr "設定情緒..."
 
 #  XXX may be wrong
 #: ../libpurple/protocols/jabber/usernick.c:76
-#, fuzzy
 msgid "Set User Nickname"
-msgstr "設定使用者數目上限"
+msgstr "設定使用者網名"
 
 #: ../libpurple/protocols/jabber/usernick.c:76
-#, fuzzy
 msgid "Please specify a new nickname for you."
-msgstr "請輸入 %s 的新密碼"
+msgstr "請為你自己設定新的網名。"
 
 #: ../libpurple/protocols/jabber/usernick.c:77
 msgid ""
 "This information is visible to all contacts on your contact list, so choose "
 "something appropriate."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/usernick.c:99
-#, fuzzy
+msgstr "這是你好友清單上的全部好友都會看得見的,請作出適當的選擇"
+
+#: ../libpurple/protocols/jabber/usernick.c:100
 msgid "Set Nickname..."
-msgstr "網名"
+msgstr "設定網名..."
 
 #: ../libpurple/protocols/jabber/xdata.c:378
-#, fuzzy
 msgid "Actions"
-msgstr "執行動作"
-
+msgstr "動作"
+
+#  XXX 要覆查
 #: ../libpurple/protocols/jabber/xdata.c:380
-#, fuzzy
 msgid "Select an action"
-msgstr "選擇檔案"
-
-# XXX 暫譯
-#: ../libpurple/protocols/msn/dialog.c:110
+msgstr "選擇一個動作"
+
+#: ../libpurple/protocols/msn/contact.c:712
+msgid "Unable to retrieve MSN Address Book"
+msgstr "無法讀取 MSN 通訊錄"
+
+# XXX 暫譯
+#: ../libpurple/protocols/msn/dialog.c:118
+#: ../libpurple/protocols/msnp9/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "為 %s (%s) 的好友清單進行同步化途中出現問題"
 
-# XXX 暫譯
-#: ../libpurple/protocols/msn/dialog.c:116
+# XXX 暫譯
+#: ../libpurple/protocols/msn/dialog.c:124
+#: ../libpurple/protocols/msnp9/dialog.c:116
 #, c-format
 msgid ""
 "%s on the local list is inside the group \"%s\" but not on the server list. "
 "Do you want this buddy to be added?"
-msgstr ""
-"%s 在本地端的好友清單的「%s」羣組裏,卻不在伺服器上;你要新增這個好友至伺服器"
-"的好友清單嗎?"
-
-# XXX 暫譯
-#: ../libpurple/protocols/msn/dialog.c:124
+msgstr "%s 在本地端的好友清單的「%s」羣組裏,卻不在伺服器上;你要新增這個好友至伺服器的好友清單嗎?"
+
+# XXX 暫譯
+#: ../libpurple/protocols/msn/dialog.c:132
+#: ../libpurple/protocols/msnp9/dialog.c:124
 #, c-format
 msgid ""
 "%s is on the local list but not on the server list. Do you want this buddy "
 "to be added?"
-msgstr ""
-"%s 在本地端的好友清單,郤不在伺服器上;你要新增這個好友至伺服器的好友清單嗎?"
+msgstr "%s 在本地端的好友清單,郤不在伺服器上;你要新增這個好友至伺服器的好友清單嗎?"
 
 #: ../libpurple/protocols/msn/error.c:36
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:36
 msgid "Unable to parse message"
 msgstr "無法解析訊息"
 
-# NOTE MSN 錯誤訊息要參閱 http://www.hypothetic.org/docs/msn2/reference/error_list.php
+# NOTE MSN 錯誤訊息要參閱 http://www.hypothetic.org/docs/msn2/reference/error_list.php
 #: ../libpurple/protocols/msn/error.c:41
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:41
 msgid "Syntax Error (probably a client bug)"
 msgstr "語法錯誤(可能是用戶端的 Bug)"
 
 #: ../libpurple/protocols/msn/error.c:46
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:46
 msgid "Invalid e-mail address"
-msgstr "無效的電子郵件位址"
+msgstr "電子郵件位址無效"
 
 #: ../libpurple/protocols/msn/error.c:49
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:49
 msgid "User does not exist"
 msgstr "使用者不存在"
 
 #: ../libpurple/protocols/msn/error.c:53
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:53
 msgid "Fully qualified domain name missing"
 msgstr "沒給予完整領域名稱 (FQDN)"
 
 #: ../libpurple/protocols/msn/error.c:56
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:56
 msgid "Already logged in"
 msgstr "已經登入"
 
 #: ../libpurple/protocols/msn/error.c:59
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:59
 msgid "Invalid screen name"
 msgstr "帳號無效。"
 
 #: ../libpurple/protocols/msn/error.c:62
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:62
 msgid "Invalid friendly name"
 msgstr "網名無效"
 
 #: ../libpurple/protocols/msn/error.c:65
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:65
 msgid "List full"
 msgstr "好友清單已滿"
 
 #: ../libpurple/protocols/msn/error.c:68
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:68
 msgid "Already there"
 msgstr "已經在清單裏"
 
 #: ../libpurple/protocols/msn/error.c:72
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:72
 msgid "Not on list"
 msgstr "不在清單中"
 
 #: ../libpurple/protocols/msn/error.c:75
+#: ../libpurple/protocols/msnp9/error.c:75
 #: ../libpurple/protocols/zephyr/zephyr.c:756
-#, c-format
 msgid "User is offline"
 msgstr "使用者是離線的"
 
 #: ../libpurple/protocols/msn/error.c:78
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:78
 msgid "Already in the mode"
 msgstr "已經在這個模式中"
 
 #: ../libpurple/protocols/msn/error.c:82
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:82
 msgid "Already in opposite list"
 msgstr "已經在相對的清單中"
 
 #: ../libpurple/protocols/msn/error.c:86
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:86
 msgid "Too many groups"
 msgstr "太多羣組"
 
 #: ../libpurple/protocols/msn/error.c:89
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:89
 msgid "Invalid group"
-msgstr "無效的羣組"
+msgstr "羣組無效"
 
 #: ../libpurple/protocols/msn/error.c:92
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:92
 msgid "User not in group"
 msgstr "使用者不在羣組內"
 
 #: ../libpurple/protocols/msn/error.c:95
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:95
 msgid "Group name too long"
 msgstr "羣組名稱過長"
 
 #: ../libpurple/protocols/msn/error.c:98
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:98
 msgid "Cannot remove group zero"
 msgstr "無法移除「零」號羣組"
 
 #: ../libpurple/protocols/msn/error.c:103
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:103
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "嘗試將一個使用者加入不存在的羣組"
 
 #: ../libpurple/protocols/msn/error.c:107
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:107
 msgid "Switchboard failed"
 msgstr "Switchboard 失敗"
 
 #: ../libpurple/protocols/msn/error.c:111
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:111
 msgid "Notify transfer failed"
 msgstr "傳送通知失敗"
 
 #: ../libpurple/protocols/msn/error.c:116
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:116
 msgid "Required fields missing"
 msgstr "找不到所需要的欄位"
 
 #: ../libpurple/protocols/msn/error.c:120
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:120
 msgid "Too many hits to a FND"
 msgstr "FND 的結果有太多匹配"
 
 #: ../libpurple/protocols/msn/error.c:124
+#: ../libpurple/protocols/msnp9/error.c:124
 #: ../libpurple/protocols/oscar/oscar.c:120
-#, c-format
 msgid "Not logged in"
 msgstr "尚未登入"
 
-#  NOTE「暫時無法使用」應該比「暫時不存在」通順
-#  NOTE 譯文更動 by Ambrose
+#  NOTE「暫時無法使用」應該比「暫時不存在」通順
+#  NOTE 譯文更動 by Ambrose
 #: ../libpurple/protocols/msn/error.c:128
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:128
 msgid "Service temporarily unavailable"
 msgstr "暫時無法使用服務"
 
 #: ../libpurple/protocols/msn/error.c:131
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:131
 msgid "Database server error"
 msgstr "資料庫錯誤"
 
-#  XXX 暫譯
+#  XXX 暫譯
 #: ../libpurple/protocols/msn/error.c:135
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:135
 msgid "Command disabled"
 msgstr "指令被停用"
 
 #: ../libpurple/protocols/msn/error.c:139
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:139
 msgid "File operation error"
 msgstr "檔案操作錯誤"
 
 #: ../libpurple/protocols/msn/error.c:143
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:143
 msgid "Memory allocation error"
 msgstr "記憶體分配錯誤"
 
 #: ../libpurple/protocols/msn/error.c:147
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:147
 msgid "Wrong CHL value sent to server"
 msgstr "錯誤的 CHL 值傳送到了伺服器"
 
 #: ../libpurple/protocols/msn/error.c:152
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:152
 msgid "Server busy"
 msgstr "伺服器忙碌"
 
 #: ../libpurple/protocols/msn/error.c:155
 #: ../libpurple/protocols/msn/error.c:170
 #: ../libpurple/protocols/msn/error.c:230
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:155
+#: ../libpurple/protocols/msnp9/error.c:170
+#: ../libpurple/protocols/msnp9/error.c:230
 msgid "Server unavailable"
 msgstr "伺服器目前不提供服務"
 
 #: ../libpurple/protocols/msn/error.c:158
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:158
 msgid "Peer notification server down"
 msgstr "點對點通知伺服器暫停服務"
 
 #: ../libpurple/protocols/msn/error.c:162
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:162
 msgid "Database connect error"
 msgstr "資料庫連結錯誤"
 
 #: ../libpurple/protocols/msn/error.c:167
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:167
 msgid "Server is going down (abandon ship)"
 msgstr "伺服器將暫停服務"
 
 #: ../libpurple/protocols/msn/error.c:174
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:174
 msgid "Error creating connection"
 msgstr "連線開啟錯誤"
 
 #: ../libpurple/protocols/msn/error.c:179
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:179
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR 參數是未知或是不允許的"
 
 #: ../libpurple/protocols/msn/error.c:183
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:183
 msgid "Unable to write"
 msgstr "無法寫入"
 
 #: ../libpurple/protocols/msn/error.c:186
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:186
 msgid "Session overload"
 msgstr "工作階段超載"
 
 #: ../libpurple/protocols/msn/error.c:190
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:190
 msgid "User is too active"
 msgstr "使用者太過活躍"
 
 #: ../libpurple/protocols/msn/error.c:193
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:193
 msgid "Too many sessions"
 msgstr "太多工作階段"
 
 #: ../libpurple/protocols/msn/error.c:196
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:196
 msgid "Passport not verified"
 msgstr "護照帳號尚未經過驗證"
 
 #: ../libpurple/protocols/msn/error.c:199
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:199
 msgid "Bad friend file"
 msgstr "好友檔案無效"
 
-# NOTE 參閱上列網站 (www.hypothetic.org) 第715號錯誤
+# NOTE 參閱上列網站 (www.hypothetic.org) 第715號錯誤
 #: ../libpurple/protocols/msn/error.c:203
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:203
 msgid "Not expected"
 msgstr "沒有預期的無效參數"
 
 #: ../libpurple/protocols/msn/error.c:209
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:209
 msgid "Friendly name changes too rapidly"
 msgstr "網名的更改過於急速"
 
 #: ../libpurple/protocols/msn/error.c:218
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:218
 msgid "Server too busy"
 msgstr "伺服器太忙碌"
 
 #: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1380
-#: ../libpurple/protocols/silc/silc.c:233
+#: ../libpurple/protocols/msnp9/error.c:222
+#: ../libpurple/protocols/oscar/oscar.c:1377
+#: ../libpurple/protocols/silc/silc.c:338
 #: ../libpurple/protocols/silc10/ops.c:1709
-#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1380
-#, c-format
+#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1393
 msgid "Authentication failed"
 msgstr "認證失敗"
 
 #: ../libpurple/protocols/msn/error.c:225
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:225
 msgid "Not allowed when offline"
 msgstr "在離線時不允許這個指令"
 
 #: ../libpurple/protocols/msn/error.c:233
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:233
 msgid "Not accepting new users"
 msgstr "不接受新的使用者"
 
 #: ../libpurple/protocols/msn/error.c:237
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:237
 msgid "Kids Passport without parental consent"
 msgstr "未經家長同意下使用兒童護照"
 
 #: ../libpurple/protocols/msn/error.c:241
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:241
 msgid "Passport account not yet verified"
 msgstr "護照帳號尚未經過驗證"
 
-#  FIXME「ticket」暫無譯文,也許可譯「通行證」或「許可證」?
-#  NOTE MSN 錯誤代號 928
-#  NOTE 詳見 http://www.hypothetic.org/docs/msn/notification/authentication.php
+#  FIXME「ticket」暫無譯文,也許可譯「通行證」或「許可證」?
+#  NOTE MSN 錯誤代號 928
+#  NOTE 詳見 http://www.hypothetic.org/docs/msn/notification/authentication.php
 #: ../libpurple/protocols/msn/error.c:244
-#, c-format
+#: ../libpurple/protocols/msnp9/error.c:244
 msgid "Bad ticket"
 msgstr "無效的 ticket"
 
 #: ../libpurple/protocols/msn/error.c:249
+#: ../libpurple/protocols/msnp9/error.c:249
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "未知的錯誤代碼 %d"
 
 #: ../libpurple/protocols/msn/error.c:263
+#: ../libpurple/protocols/msnp9/error.c:263
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "MSN 錯誤:%s\n"
 
-#: ../libpurple/protocols/msn/msn.c:130
+#: ../libpurple/protocols/msn/msn.c:130 ../libpurple/protocols/msnp9/msn.c:130
 msgid "Nudge"
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:131
-#, fuzzy, c-format
+msgstr "呼叫"
+
+#: ../libpurple/protocols/msn/msn.c:131 ../libpurple/protocols/msnp9/msn.c:131
+#, c-format
 msgid "%s has nudged you!"
-msgstr "%s 已將你 [%s] 加入到他(她)的好友清單"
-
-#: ../libpurple/protocols/msn/msn.c:132
+msgstr "%s 呼叫你!"
+
+#: ../libpurple/protocols/msn/msn.c:132 ../libpurple/protocols/msnp9/msn.c:132
 #, c-format
 msgid "Nudging %s..."
-msgstr ""
-
-#: ../libpurple/protocols/msn/msn.c:174
+msgstr "呼叫 %s 中..."
+
+#: ../libpurple/protocols/msn/msn.c:174 ../libpurple/protocols/msnp9/msn.c:174
 msgid "Your new MSN friendly name is too long."
 msgstr "你的新 MSN 網名太長。"
 
-#: ../libpurple/protocols/msn/msn.c:282
+#: ../libpurple/protocols/msn/msn.c:286 ../libpurple/protocols/msnp9/msn.c:282
 msgid "Set your friendly name."
 msgstr "設定你的網名。"
 
-# NOTE MSN的暱稱不像Yahoo;使用者可以輸入任何的新暱稱,
-# NOTE 即使和使用者的帳號毫無關係,似乎也是有效的
-# XXX 這看來是一個鈙述句,事實上是對使用者發出的請求/問題
-#: ../libpurple/protocols/msn/msn.c:283
+# NOTE MSN的暱稱不像Yahoo;使用者可以輸入任何的新暱稱,
+# NOTE 即使和使用者的帳號毫無關係,似乎也是有效的
+# XXX 這看來是一個鈙述句,事實上是對使用者發出的請求/問題
+#: ../libpurple/protocols/msn/msn.c:287 ../libpurple/protocols/msnp9/msn.c:283
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "別人在 MSN 查閱你的個人資料時顯示這個網名。"
 
-#: ../libpurple/protocols/msn/msn.c:301
+#: ../libpurple/protocols/msn/msn.c:305 ../libpurple/protocols/msnp9/msn.c:301
 msgid "Set your home phone number."
 msgstr "設定你的家用電話號碼。"
 
-#: ../libpurple/protocols/msn/msn.c:318
+#: ../libpurple/protocols/msn/msn.c:322 ../libpurple/protocols/msnp9/msn.c:318
 msgid "Set your work phone number."
 msgstr "設定你的辦公室電話號碼。"
 
-#: ../libpurple/protocols/msn/msn.c:335
+#: ../libpurple/protocols/msn/msn.c:339 ../libpurple/protocols/msnp9/msn.c:335
 msgid "Set your mobile phone number."
 msgstr "設定你的流動電話號碼。"
 
-#: ../libpurple/protocols/msn/msn.c:350
+#: ../libpurple/protocols/msn/msn.c:354 ../libpurple/protocols/msnp9/msn.c:350
 msgid "Allow MSN Mobile pages?"
 msgstr "允許 MSN 傳呼?"
 
-#: ../libpurple/protocols/msn/msn.c:351
+#: ../libpurple/protocols/msn/msn.c:355 ../libpurple/protocols/msnp9/msn.c:351
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
-msgstr ""
-"你是否允許在你好友清單中的好友傳送 Mobile Page 到你的流動電話,或是其他的流動"
-"通訊器材上呢?"
-
-#: ../libpurple/protocols/msn/msn.c:357
+msgstr "你是否允許在你好友清單中的好友傳送 Mobile Page 到你的流動電話,或是其他的流動通訊器材上呢?"
+
+#: ../libpurple/protocols/msn/msn.c:361 ../libpurple/protocols/msnp9/msn.c:357
 msgid "Allow"
 msgstr "允許"
 
-#: ../libpurple/protocols/msn/msn.c:358
+#: ../libpurple/protocols/msn/msn.c:362 ../libpurple/protocols/msnp9/msn.c:358
 msgid "Disallow"
 msgstr "不允許"
 
-#: ../libpurple/protocols/msn/msn.c:374
+#: ../libpurple/protocols/msn/msn.c:378 ../libpurple/protocols/msnp9/msn.c:374
 msgid "This Hotmail account may not be active."
 msgstr "這個Hotmail帳號可能尚未被啟動。"
 
-#: ../libpurple/protocols/msn/msn.c:400
+#: ../libpurple/protocols/msn/msn.c:404 ../libpurple/protocols/msnp9/msn.c:400
 msgid "Send a mobile message."
 msgstr "送出行動訊息。"
 
-#: ../libpurple/protocols/msn/msn.c:402
+#: ../libpurple/protocols/msn/msn.c:406 ../libpurple/protocols/msnp9/msn.c:402
 msgid "Page"
 msgstr "傳呼"
 
-#: ../libpurple/protocols/msn/msn.c:549
-msgid "Has you"
-msgstr "你在他(她)的好友清單裏"
-
-#: ../libpurple/protocols/msn/msn.c:579 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:3077
-#: ../libpurple/protocols/yahoo/yahoo.c:3761
+#: ../libpurple/protocols/msn/msn.c:688 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/msnp9/msn.c:583
+#: ../libpurple/protocols/msnp9/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:3088
+#: ../libpurple/protocols/yahoo/yahoo.c:3772
 msgid "Be Right Back"
 msgstr "馬上回來"
 
-#: ../libpurple/protocols/msn/msn.c:583 ../libpurple/protocols/msn/state.c:31
-#: ../libpurple/protocols/novell/novell.c:2822
-#: ../libpurple/protocols/novell/novell.c:2952
-#: ../libpurple/protocols/silc/buddy.c:1480
+#: ../libpurple/protocols/msn/msn.c:694 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/msnp9/msn.c:587
+#: ../libpurple/protocols/msnp9/state.c:31
+#: ../libpurple/protocols/novell/novell.c:2839
+#: ../libpurple/protocols/novell/novell.c:2969
+#: ../libpurple/protocols/silc/buddy.c:1483
 #: ../libpurple/protocols/silc/silc.c:56
-#: ../libpurple/protocols/silc10/buddy.c:1480
+#: ../libpurple/protocols/silc10/buddy.c:1483
 #: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:3079
-#: ../libpurple/protocols/yahoo/yahoo.c:3764
+#: ../libpurple/protocols/yahoo/yahoo.c:3090
+#: ../libpurple/protocols/yahoo/yahoo.c:3775
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../libpurple/protocols/msn/msn.c:587
-#: ../libpurple/protocols/yahoo/yahoo.c:3087
-#: ../libpurple/protocols/yahoo/yahoo.c:3776
+#: ../libpurple/protocols/msn/msn.c:699 ../libpurple/protocols/msnp9/msn.c:591
+#: ../libpurple/protocols/yahoo/yahoo.c:3098
+#: ../libpurple/protocols/yahoo/yahoo.c:3787
 msgid "On the Phone"
 msgstr "電話中"
 
-#: ../libpurple/protocols/msn/msn.c:591
-#: ../libpurple/protocols/yahoo/yahoo.c:3091
-#: ../libpurple/protocols/yahoo/yahoo.c:3782
+#: ../libpurple/protocols/msn/msn.c:704 ../libpurple/protocols/msnp9/msn.c:595
+#: ../libpurple/protocols/yahoo/yahoo.c:3102
+#: ../libpurple/protocols/yahoo/yahoo.c:3793
 msgid "Out to Lunch"
 msgstr "外出用餐"
 
-#: ../libpurple/protocols/msn/msn.c:619
+#: ../libpurple/protocols/msn/msn.c:723
+msgid "Artist"
+msgstr "樂手名稱"
+
+#: ../libpurple/protocols/msn/msn.c:724
+msgid "Album"
+msgstr "專輯名稱"
+
+#: ../libpurple/protocols/msn/msn.c:742 ../libpurple/protocols/msnp9/msn.c:623
 msgid "Set Friendly Name..."
 msgstr "設定網名..."
 
-#: ../libpurple/protocols/msn/msn.c:624
+#: ../libpurple/protocols/msn/msn.c:747 ../libpurple/protocols/msnp9/msn.c:628
 msgid "Set Home Phone Number..."
 msgstr "設定家用電話號碼..."
 
-#: ../libpurple/protocols/msn/msn.c:628
+#: ../libpurple/protocols/msn/msn.c:751 ../libpurple/protocols/msnp9/msn.c:632
 msgid "Set Work Phone Number..."
 msgstr "設定工作電話號碼..."
 
-#: ../libpurple/protocols/msn/msn.c:632
+#: ../libpurple/protocols/msn/msn.c:755 ../libpurple/protocols/msnp9/msn.c:636
 msgid "Set Mobile Phone Number..."
 msgstr "設定流動電話號碼..."
 
-#: ../libpurple/protocols/msn/msn.c:638
+#: ../libpurple/protocols/msn/msn.c:761 ../libpurple/protocols/msnp9/msn.c:642
 msgid "Enable/Disable Mobile Devices..."
 msgstr "開啟 / 關閉流動通訊器材..."
 
-#: ../libpurple/protocols/msn/msn.c:643
+#: ../libpurple/protocols/msn/msn.c:766 ../libpurple/protocols/msnp9/msn.c:647
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "允許 / 不允許 Mobile Page..."
 
-#: ../libpurple/protocols/msn/msn.c:654
+#: ../libpurple/protocols/msn/msn.c:777 ../libpurple/protocols/msnp9/msn.c:658
 msgid "Open Hotmail Inbox"
 msgstr "開啟Hotmail收件匣"
 
-#: ../libpurple/protocols/msn/msn.c:678
+#: ../libpurple/protocols/msn/msn.c:801 ../libpurple/protocols/msnp9/msn.c:682
 msgid "Send to Mobile"
 msgstr "傳送至流動電話"
 
-#: ../libpurple/protocols/msn/msn.c:688
-#: ../libpurple/protocols/novell/novell.c:3408
+#: ../libpurple/protocols/msn/msn.c:811 ../libpurple/protocols/msnp9/msn.c:692
+#: ../libpurple/protocols/novell/novell.c:3425
 msgid "Initiate _Chat"
 msgstr "開啟聊天室(_C)"
 
-# XXX 暫譯
-#: ../libpurple/protocols/msn/msn.c:726
+# XXX 暫譯
+#: ../libpurple/protocols/msn/msn.c:849 ../libpurple/protocols/msnp9/msn.c:731
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN 需要 SSL 程式庫的支援,請安裝一個受支援的 SSL 程式庫。"
 
-#: ../libpurple/protocols/msn/msn.c:754
+#: ../libpurple/protocols/msn/msn.c:879 ../libpurple/protocols/msnp9/msn.c:761
 msgid "Failed to connect to server."
 msgstr "無法連線到伺服器。"
 
-#: ../libpurple/protocols/msn/msn.c:1510 ../libpurple/protocols/msn/msn.c:1858
+#: ../libpurple/protocols/msn/msn.c:1663 ../libpurple/protocols/msn/msn.c:2006
+#: ../libpurple/protocols/msnp9/msn.c:1516
+#: ../libpurple/protocols/msnp9/msn.c:1859
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "取得個人資料時發生錯誤"
 
-#: ../libpurple/protocols/msn/msn.c:1581 ../pidgin/plugins/convcolors.c:309
-#: ../pidgin/plugins/pidginrc.c:366
+#: ../libpurple/protocols/msn/msn.c:1729
+#: ../libpurple/protocols/msnp9/msn.c:1582 ../pidgin/plugins/convcolors.c:309
+#: ../pidgin/plugins/pidginrc.c:360
 msgid "General"
 msgstr "一般"
 
-#: ../libpurple/protocols/msn/msn.c:1588
-#: ../libpurple/protocols/myspace/user.c:110
-#: ../libpurple/protocols/oscar/oscar.c:3755
+#: ../libpurple/protocols/msn/msn.c:1736
+#: ../libpurple/protocols/msnp9/msn.c:1589
+#: ../libpurple/protocols/myspace/user.c:115
+#: ../libpurple/protocols/oscar/oscar.c:3765
 #: ../libpurple/protocols/qq/buddy_info.c:45
-#: ../libpurple/protocols/qq/qq.c:221
+#: ../libpurple/protocols/qq/qq.c:222
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "年齡"
 
-#: ../libpurple/protocols/msn/msn.c:1590
+#: ../libpurple/protocols/msn/msn.c:1738
+#: ../libpurple/protocols/msnp9/msn.c:1591
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr "職業"
 
-#: ../libpurple/protocols/msn/msn.c:1591
-#: ../libpurple/protocols/myspace/user.c:119
-#: ../libpurple/protocols/novell/novell.c:1478
+#: ../libpurple/protocols/msn/msn.c:1739
+#: ../libpurple/protocols/msnp9/msn.c:1592
+#: ../libpurple/protocols/myspace/user.c:123
+#: ../libpurple/protocols/novell/novell.c:1487
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
 #: ../libpurple/protocols/zephyr/zephyr.c:798
 #: ../libpurple/protocols/zephyr/zephyr.c:1215
 msgid "Location"
 msgstr "所在位置"
 
-#: ../libpurple/protocols/msn/msn.c:1596 ../libpurple/protocols/msn/msn.c:1788
-#: ../libpurple/protocols/msn/msn.c:1794 ../libpurple/protocols/msn/msn.c:1801
+#: ../libpurple/protocols/msn/msn.c:1744 ../libpurple/protocols/msn/msn.c:1936
+#: ../libpurple/protocols/msn/msn.c:1942 ../libpurple/protocols/msn/msn.c:1949
+#: ../libpurple/protocols/msnp9/msn.c:1597
+#: ../libpurple/protocols/msnp9/msn.c:1789
+#: ../libpurple/protocols/msnp9/msn.c:1795
+#: ../libpurple/protocols/msnp9/msn.c:1802
 msgid "Hobbies and Interests"
 msgstr "嗜好/興趣"
 
-#: ../libpurple/protocols/msn/msn.c:1602 ../libpurple/protocols/msn/msn.c:1722
-#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1735
-#: ../libpurple/protocols/msn/msn.c:1743 ../libpurple/protocols/msn/msn.c:1750
+#: ../libpurple/protocols/msn/msn.c:1750 ../libpurple/protocols/msn/msn.c:1870
+#: ../libpurple/protocols/msn/msn.c:1876 ../libpurple/protocols/msn/msn.c:1883
+#: ../libpurple/protocols/msn/msn.c:1891 ../libpurple/protocols/msn/msn.c:1898
+#: ../libpurple/protocols/msnp9/msn.c:1603
+#: ../libpurple/protocols/msnp9/msn.c:1723
+#: ../libpurple/protocols/msnp9/msn.c:1729
+#: ../libpurple/protocols/msnp9/msn.c:1736
+#: ../libpurple/protocols/msnp9/msn.c:1744
+#: ../libpurple/protocols/msnp9/msn.c:1751
 msgid "A Little About Me"
 msgstr "自我簡介"
 
-#: ../libpurple/protocols/msn/msn.c:1619
+#: ../libpurple/protocols/msn/msn.c:1767
+#: ../libpurple/protocols/msnp9/msn.c:1620
 msgid "Social"
 msgstr "社交"
 
-#: ../libpurple/protocols/msn/msn.c:1621
+#: ../libpurple/protocols/msn/msn.c:1769
+#: ../libpurple/protocols/msnp9/msn.c:1622
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "婚姻狀況"
 
-#: ../libpurple/protocols/msn/msn.c:1622
+#: ../libpurple/protocols/msn/msn.c:1770
+#: ../libpurple/protocols/msnp9/msn.c:1623
 msgid "Interests"
 msgstr "興趣"
 
-#: ../libpurple/protocols/msn/msn.c:1623
+#: ../libpurple/protocols/msn/msn.c:1771
+#: ../libpurple/protocols/msnp9/msn.c:1624
 msgid "Pets"
 msgstr "寵物"
 
-#: ../libpurple/protocols/msn/msn.c:1624
+#: ../libpurple/protocols/msn/msn.c:1772
+#: ../libpurple/protocols/msnp9/msn.c:1625
 msgid "Hometown"
 msgstr "故鄉"
 
-#: ../libpurple/protocols/msn/msn.c:1625
+#: ../libpurple/protocols/msn/msn.c:1773
+#: ../libpurple/protocols/msnp9/msn.c:1626
 msgid "Places Lived"
 msgstr "居住過的地方"
 
-#: ../libpurple/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/msn/msn.c:1774
+#: ../libpurple/protocols/msnp9/msn.c:1627
 msgid "Fashion"
 msgstr "時尚"
 
-#: ../libpurple/protocols/msn/msn.c:1627
+#: ../libpurple/protocols/msn/msn.c:1775
+#: ../libpurple/protocols/msnp9/msn.c:1628
 msgid "Humor"
 msgstr "幽默"
 
-#: ../libpurple/protocols/msn/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1776
+#: ../libpurple/protocols/msnp9/msn.c:1629
 msgid "Music"
 msgstr "音樂"
 
-# NOTE 日文po檔及MSN本身均譯「座右銘」
-#: ../libpurple/protocols/msn/msn.c:1629 ../libpurple/protocols/msn/msn.c:1810
-#: ../libpurple/protocols/msn/msn.c:1816
+# NOTE 日文po檔及MSN本身均譯「座右銘」
+#: ../libpurple/protocols/msn/msn.c:1777 ../libpurple/protocols/msn/msn.c:1958
+#: ../libpurple/protocols/msn/msn.c:1964
+#: ../libpurple/protocols/msnp9/msn.c:1630
+#: ../libpurple/protocols/msnp9/msn.c:1811
+#: ../libpurple/protocols/msnp9/msn.c:1817
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Favorite Quote"
 msgstr "座右銘"
 
-#: ../libpurple/protocols/msn/msn.c:1646
+#: ../libpurple/protocols/msn/msn.c:1794
+#: ../libpurple/protocols/msnp9/msn.c:1647
 msgid "Contact Info"
 msgstr "聯絡資訊"
 
-#: ../libpurple/protocols/msn/msn.c:1647
+#: ../libpurple/protocols/msn/msn.c:1795
+#: ../libpurple/protocols/msnp9/msn.c:1648
 msgid "Personal"
 msgstr "個人資料"
 
-#: ../libpurple/protocols/msn/msn.c:1650
+#: ../libpurple/protocols/msn/msn.c:1798
+#: ../libpurple/protocols/msnp9/msn.c:1651
 msgid "Significant Other"
 msgstr "另一半"
 
-#: ../libpurple/protocols/msn/msn.c:1651
+#: ../libpurple/protocols/msn/msn.c:1799
+#: ../libpurple/protocols/msnp9/msn.c:1652
 msgid "Home Phone"
 msgstr "家用電話"
 
-#: ../libpurple/protocols/msn/msn.c:1652
+#: ../libpurple/protocols/msn/msn.c:1800
+#: ../libpurple/protocols/msnp9/msn.c:1653
 msgid "Home Phone 2"
 msgstr "家用電話2"
 
-#: ../libpurple/protocols/msn/msn.c:1653
-#: ../libpurple/protocols/oscar/oscar.c:3793
+#: ../libpurple/protocols/msn/msn.c:1801
+#: ../libpurple/protocols/msnp9/msn.c:1654
+#: ../libpurple/protocols/oscar/oscar.c:3803
 msgid "Home Address"
 msgstr "住址"
 
-#: ../libpurple/protocols/msn/msn.c:1654
+#: ../libpurple/protocols/msn/msn.c:1802
+#: ../libpurple/protocols/msnp9/msn.c:1655
 msgid "Personal Mobile"
 msgstr "個人流動電話"
 
-#: ../libpurple/protocols/msn/msn.c:1655
+#: ../libpurple/protocols/msn/msn.c:1803
+#: ../libpurple/protocols/msnp9/msn.c:1656
 msgid "Home Fax"
 msgstr "家用傳真"
 
-#: ../libpurple/protocols/msn/msn.c:1656
+#: ../libpurple/protocols/msn/msn.c:1804
+#: ../libpurple/protocols/msnp9/msn.c:1657
 msgid "Personal E-Mail"
 msgstr "個人電子郵件"
 
-#: ../libpurple/protocols/msn/msn.c:1657
+#: ../libpurple/protocols/msn/msn.c:1805
+#: ../libpurple/protocols/msnp9/msn.c:1658
 msgid "Personal IM"
 msgstr "個人即時訊息帳號"
 
-#: ../libpurple/protocols/msn/msn.c:1659
+#: ../libpurple/protocols/msn/msn.c:1807
+#: ../libpurple/protocols/msnp9/msn.c:1660
 msgid "Anniversary"
 msgstr "週年紀念日"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1675
+#: ../libpurple/protocols/msn/msn.c:1823
+#: ../libpurple/protocols/msnp9/msn.c:1676
 msgid "Work"
 msgstr "工作資料"
 
-#: ../libpurple/protocols/msn/msn.c:1677
+#: ../libpurple/protocols/msn/msn.c:1825
+#: ../libpurple/protocols/msnp9/msn.c:1678
 #: ../libpurple/protocols/silc/ops.c:1010
 #: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "職銜"
 
-#: ../libpurple/protocols/msn/msn.c:1678
-#: ../libpurple/protocols/oscar/oscar.c:3814
+#: ../libpurple/protocols/msn/msn.c:1826
+#: ../libpurple/protocols/msnp9/msn.c:1679
+#: ../libpurple/protocols/oscar/oscar.c:3824
 msgid "Company"
 msgstr "公司名稱"
 
-#: ../libpurple/protocols/msn/msn.c:1679
-#: ../libpurple/protocols/novell/novell.c:1480
+#: ../libpurple/protocols/msn/msn.c:1827
+#: ../libpurple/protocols/msnp9/msn.c:1680
+#: ../libpurple/protocols/novell/novell.c:1489
 msgid "Department"
 msgstr "所屬部門"
 
-#: ../libpurple/protocols/msn/msn.c:1680
+#: ../libpurple/protocols/msn/msn.c:1828
+#: ../libpurple/protocols/msnp9/msn.c:1681
 msgid "Profession"
 msgstr "專業"
 
-#: ../libpurple/protocols/msn/msn.c:1681
+#: ../libpurple/protocols/msn/msn.c:1829
+#: ../libpurple/protocols/msnp9/msn.c:1682
 msgid "Work Phone"
 msgstr "商務電話"
 
-#: ../libpurple/protocols/msn/msn.c:1682
+#: ../libpurple/protocols/msn/msn.c:1830
+#: ../libpurple/protocols/msnp9/msn.c:1683
 msgid "Work Phone 2"
 msgstr "商務電話2"
 
-#: ../libpurple/protocols/msn/msn.c:1683
-#: ../libpurple/protocols/oscar/oscar.c:3806
+#: ../libpurple/protocols/msn/msn.c:1831
+#: ../libpurple/protocols/msnp9/msn.c:1684
+#: ../libpurple/protocols/oscar/oscar.c:3816
 msgid "Work Address"
 msgstr "工作地址"
 
-#: ../libpurple/protocols/msn/msn.c:1684
+#: ../libpurple/protocols/msn/msn.c:1832
+#: ../libpurple/protocols/msnp9/msn.c:1685
 msgid "Work Mobile"
 msgstr "商務流動電話"
 
-#: ../libpurple/protocols/msn/msn.c:1685
+#: ../libpurple/protocols/msn/msn.c:1833
+#: ../libpurple/protocols/msnp9/msn.c:1686
 msgid "Work Pager"
 msgstr "商務傳呼機"
 
-#: ../libpurple/protocols/msn/msn.c:1686
+#: ../libpurple/protocols/msn/msn.c:1834
+#: ../libpurple/protocols/msnp9/msn.c:1687
 msgid "Work Fax"
 msgstr "商務傳真"
 
-#: ../libpurple/protocols/msn/msn.c:1687
+#: ../libpurple/protocols/msn/msn.c:1835
+#: ../libpurple/protocols/msnp9/msn.c:1688
 msgid "Work E-Mail"
 msgstr "商務電子郵件"
 
-#: ../libpurple/protocols/msn/msn.c:1688
+#: ../libpurple/protocols/msn/msn.c:1836
+#: ../libpurple/protocols/msnp9/msn.c:1689
 msgid "Work IM"
 msgstr "商務即時訊息帳號"
 
-#: ../libpurple/protocols/msn/msn.c:1689
+#: ../libpurple/protocols/msn/msn.c:1837
+#: ../libpurple/protocols/msnp9/msn.c:1690
 msgid "Start Date"
 msgstr "開始日期"
 
-#: ../libpurple/protocols/msn/msn.c:1759 ../libpurple/protocols/msn/msn.c:1765
-#: ../libpurple/protocols/msn/msn.c:1772 ../libpurple/protocols/msn/msn.c:1779
+#: ../libpurple/protocols/msn/msn.c:1907 ../libpurple/protocols/msn/msn.c:1913
+#: ../libpurple/protocols/msn/msn.c:1920 ../libpurple/protocols/msn/msn.c:1927
+#: ../libpurple/protocols/msnp9/msn.c:1760
+#: ../libpurple/protocols/msnp9/msn.c:1766
+#: ../libpurple/protocols/msnp9/msn.c:1773
+#: ../libpurple/protocols/msnp9/msn.c:1780
 msgid "Favorite Things"
 msgstr "喜愛事物"
 
-#: ../libpurple/protocols/msn/msn.c:1824
+#: ../libpurple/protocols/msn/msn.c:1972
+#: ../libpurple/protocols/msnp9/msn.c:1825
 msgid "Last Updated"
 msgstr "更新日期"
 
-#: ../libpurple/protocols/msn/msn.c:1835
+#: ../libpurple/protocols/msn/msn.c:1983
+#: ../libpurple/protocols/msnp9/msn.c:1836
 #: ../libpurple/protocols/qq/buddy_info.c:60
 #: ../libpurple/protocols/silc/ops.c:1026
 #: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "網頁"
 
-#: ../libpurple/protocols/msn/msn.c:1859
+#: ../libpurple/protocols/msn/msn.c:2007
+#: ../libpurple/protocols/msnp9/msn.c:1860
 msgid "The user has not created a public profile."
 msgstr "這個使用者未有建立公開的個人資料。"
 
-#: ../libpurple/protocols/msn/msn.c:1860
+#: ../libpurple/protocols/msn/msn.c:2008
+#: ../libpurple/protocols/msnp9/msn.c:1861
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
 "public profile."
-msgstr ""
-"MSN 回報說找不到這個使用者的個人資料。這表示這個使用者可能不存在;亦有可能使"
-"用者存在,但沒有建立公開的個人資料。"
-
-#: ../libpurple/protocols/msn/msn.c:1864
+msgstr "MSN 回報說找不到這個使用者的個人資料。這表示這個使用者可能不存在;亦有可能使用者存在,但沒有建立公開的個人資料。"
+
+#: ../libpurple/protocols/msn/msn.c:2012
+#: ../libpurple/protocols/msnp9/msn.c:1865
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
-msgstr ""
-"在這個使用者的個人資料網頁找不到任何可用的資料。這個使用者極有可能並不存在。"
-
-#: ../libpurple/protocols/msn/msn.c:1872
+msgstr "在這個使用者的個人資料網頁找不到任何可用的資料。這個使用者極有可能並不存在。"
+
+#: ../libpurple/protocols/msn/msn.c:2020
+#: ../libpurple/protocols/msnp9/msn.c:1873
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "個人資料網址"
@@ -7232,110 +7277,138 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2158 ../libpurple/protocols/msn/msn.c:2160
-msgid "MSN Protocol Plugin"
-msgstr "MSN 協定模組"
-
-#: ../libpurple/protocols/msn/msn.c:2194
+#: ../libpurple/protocols/msn/msn.c:2307 ../libpurple/protocols/msn/msn.c:2309
+msgid "Windows Live Messenger Protocol Plugin"
+msgstr "Windows Live Messenger 協定模組"
+
+#: ../libpurple/protocols/msn/msn.c:2344
+#: ../libpurple/protocols/msnp9/msn.c:2195
 msgid "Use HTTP Method"
 msgstr "使用 HTTP 方式"
 
-#: ../libpurple/protocols/msn/msn.c:2199
-#, fuzzy
+# XXX 譯文有待改進 - acli 20070918
+#: ../libpurple/protocols/msn/msn.c:2349
+#: ../libpurple/protocols/msnp9/msn.c:2200
 msgid "HTTP Method Server"
-msgstr "IPC 測試伺服器"
-
-#: ../libpurple/protocols/msn/msn.c:2204
+msgstr "HTTP 方式專用伺服器"
+
+#: ../libpurple/protocols/msn/msn.c:2354
+#: ../libpurple/protocols/msnp9/msn.c:2205
 msgid "Show custom smileys"
 msgstr "顯示使用者圖示"
 
-#: ../libpurple/protocols/msn/msn.c:2212
+#: ../libpurple/protocols/msn/msn.c:2362
+#: ../libpurple/protocols/msnp9/msn.c:2213
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge:呼叫使用者,引起他們的注意"
 
-#: ../libpurple/protocols/msn/nexus.c:146
-#: ../libpurple/protocols/msn/servconn.c:135
-#: ../libpurple/protocols/qq/qq_proxy.c:242
-#: ../libpurple/protocols/qq/qq_proxy.c:321
-#: ../libpurple/protocols/qq/qq_proxy.c:366
-#: ../libpurple/protocols/qq/qq_proxy.c:399
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:63
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:163
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:187
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:200
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:229
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:243
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:268
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:302
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:332
-#: ../libpurple/protocols/yahoo/yahoochat.c:1416
-#: ../libpurple/protocols/yahoo/yahoochat.c:1442
-msgid "Unable to connect"
-msgstr "無法連線"
-
-#: ../libpurple/protocols/msn/notification.c:178
+#: ../libpurple/protocols/msn/nexus.c:70
+msgid "Windows Live ID authentication:Unable to connect"
+msgstr "Windows Live ID 認證:無法連線"
+
+#. we must have failed!
+#: ../libpurple/protocols/msn/nexus.c:126
+msgid ""
+"Windows Live ID authentication: cannot find authenticate token in server "
+"response"
+msgstr "Windows Live ID 認證:在伺服器傳來的回應無法找到認證符記"
+
+#: ../libpurple/protocols/msn/nexus.c:172
+msgid "Windows Live ID authentication Failed"
+msgstr "Windows Live ID 認證失敗"
+
+#: ../libpurple/protocols/msn/notification.c:185
+#: ../libpurple/protocols/msnp9/notification.c:178
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s 不是一個有效的羣組。"
 
-#: ../libpurple/protocols/msn/notification.c:184
-#: ../libpurple/protocols/msn/notification.c:532
-#: ../libpurple/protocols/msn/session.c:330
+#: ../libpurple/protocols/msn/notification.c:191
+#: ../libpurple/protocols/msn/notification.c:931
+#: ../libpurple/protocols/msn/session.c:387
+#: ../libpurple/protocols/msnp9/notification.c:184
+#: ../libpurple/protocols/msnp9/notification.c:532
+#: ../libpurple/protocols/msnp9/session.c:340
 msgid "Unknown error."
 msgstr "未知錯誤。"
 
-# NOTE: 第二個 %s 為使用者名稱,第三個 %s 為通訊協定名稱
-# NOTE: 第一個 %s 似乎係錯誤訊息摘要(整個字串為視窗標題)
-#: ../libpurple/protocols/msn/notification.c:187
+# NOTE: 第二個 %s 為使用者名稱,第三個 %s 為通訊協定名稱
+# NOTE: 第一個 %s 似乎係錯誤訊息摘要(整個字串為視窗標題)
+#: ../libpurple/protocols/msn/notification.c:194
+#: ../libpurple/protocols/msnp9/notification.c:187
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%2$s (%3$s):%1$s"
 
-#  TODO 請覆查,譯文有待改進
-#: ../libpurple/protocols/msn/notification.c:498
+#: ../libpurple/protocols/msn/notification.c:509
+#, c-format
+msgid "%s just sent you a Nudge!"
+msgstr "%s 在呼叫你!"
+
+#: ../libpurple/protocols/msn/notification.c:836
+#, c-format
+msgid "Unknown error (%d)"
+msgstr "不明錯誤(代碼 %d)"
+
+#: ../libpurple/protocols/msn/notification.c:837
+#: ../libpurple/protocols/sametime/sametime.c:4471
+msgid "Unable to add user"
+msgstr "無法新增使用者"
+
+#  TODO 請覆查,譯文有待改進
+#: ../libpurple/protocols/msn/notification.c:897
+#: ../libpurple/protocols/msnp9/notification.c:498
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "%s (%s) 新增使用者失敗"
 
-#  TODO 請覆查,譯文有待改進
-#: ../libpurple/protocols/msn/notification.c:502
+#  TODO 請覆查,譯文有待改進
+#: ../libpurple/protocols/msn/notification.c:901
+#: ../libpurple/protocols/msnp9/notification.c:502
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "%s (%s) 拒絕使用者失敗"
 
-#  TODO 請覆查,譯文有待改進
-#: ../libpurple/protocols/msn/notification.c:506
+#  TODO 請覆查,譯文有待改進
+#: ../libpurple/protocols/msn/notification.c:905
+#: ../libpurple/protocols/msnp9/notification.c:506
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "%s (%s) 允許使用者失敗"
 
-#: ../libpurple/protocols/msn/notification.c:514
+#: ../libpurple/protocols/msn/notification.c:913
+#: ../libpurple/protocols/msnp9/notification.c:514
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr "因為好友清單已滿,以致無法新增 %s"
 
-#: ../libpurple/protocols/msn/notification.c:523
+#: ../libpurple/protocols/msn/notification.c:922
+#: ../libpurple/protocols/msnp9/notification.c:523
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s 不是一個有效的 Passport 帳號"
 
-#  NOTE「暫時無法使用」應該比「暫時不存在」通順
-#  NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/msn/notification.c:528
+#  NOTE「暫時無法使用」應該比「暫時不存在」通順
+#  NOTE 譯文更動 by Ambrose
+#: ../libpurple/protocols/msn/notification.c:927
+#: ../libpurple/protocols/msnp9/notification.c:528
 msgid "Service Temporarily Unavailable."
 msgstr "暫時無法提供服務"
 
-#: ../libpurple/protocols/msn/notification.c:851
+#: ../libpurple/protocols/msn/notification.c:1263
+#: ../libpurple/protocols/msnp9/notification.c:851
 msgid "Unable to rename group"
 msgstr "無法更改羣組名稱"
 
-#: ../libpurple/protocols/msn/notification.c:906
+#: ../libpurple/protocols/msn/notification.c:1318
+#: ../libpurple/protocols/msnp9/notification.c:906
 msgid "Unable to delete group"
 msgstr "無法移除羣組"
 
-# NOTE "in %d minutes" 意為「在 %d 分鐘之內」的意思
-# NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/msn/notification.c:1325
+# NOTE "in %d minutes" 意為「在 %d 分鐘之內」的意思
+# NOTE 譯文更動 by Ambrose
+#: ../libpurple/protocols/msn/notification.c:1931
+#: ../libpurple/protocols/msnp9/notification.c:1325
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -7352,27 +7425,49 @@
 "After the maintenance has been completed, you will be able to successfully "
 "sign in."
 msgstr[0] ""
-"MSN 伺服器將要在 %d 分鐘內關閉以進行維護,屆時你將會由伺服器上自動登出。請儘"
-"快結束你目前的交談。\n"
+"MSN 伺服器將要在 %d 分鐘內關閉以進行維護,屆時你將會由伺服器上自動登出。請儘快結束你目前的交談。\n"
 "\n"
 "當維護工作結束,你將可以再度登入。"
 msgstr[1] ""
-"MSN 伺服器將要在 %d 分鐘內關閉以進行維護,屆時你將會由伺服器上自動登出。請儘"
-"快結束你目前的交談。\n"
+"MSN 伺服器將要在 %d 分鐘內關閉以進行維護,屆時你將會由伺服器上自動登出。請儘快結束你目前的交談。\n"
 "\n"
 "當維護工作結束,你將可以再度登入。"
 
+#: ../libpurple/protocols/msn/servconn.c:135
+#: ../libpurple/protocols/msnp9/nexus.c:146
+#: ../libpurple/protocols/msnp9/servconn.c:133
+#: ../libpurple/protocols/qq/qq_proxy.c:242
+#: ../libpurple/protocols/qq/qq_proxy.c:324
+#: ../libpurple/protocols/qq/qq_proxy.c:369
+#: ../libpurple/protocols/qq/qq_proxy.c:402
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:64
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:167
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:191
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:204
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:233
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:247
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:272
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:307
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:338
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
+msgid "Unable to connect"
+msgstr "無法連線"
+
 #: ../libpurple/protocols/msn/servconn.c:137
+#: ../libpurple/protocols/msnp9/servconn.c:135
 msgid "Writing error"
 msgstr "寫入錯誤"
 
-# NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
+# NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
 #: ../libpurple/protocols/msn/servconn.c:139
+#: ../libpurple/protocols/msnp9/servconn.c:137
 msgid "Reading error"
 msgstr "讀取錯誤"
 
-#  NOTE 首個 %s 為「Notification」或「Switchboard」其一,次為伺服器名稱,末者為錯誤訊息
+#  NOTE 首個 %s 為「Notification」或「Switchboard」其一,次為伺服器名稱,末者為錯誤訊息
 #: ../libpurple/protocols/msn/servconn.c:146
+#: ../libpurple/protocols/msnp9/servconn.c:144
 #, c-format
 msgid ""
 "Connection error from %s server:\n"
@@ -7381,369 +7476,400 @@
 "%s 伺服器傳來一個連線錯誤:\n"
 "%s"
 
-#: ../libpurple/protocols/msn/session.c:299
+#: ../libpurple/protocols/msn/session.c:349
+#: ../libpurple/protocols/msnp9/session.c:302
 msgid "Our protocol is not supported by the server."
 msgstr "這個伺服器不支援我們使用的通訊協定。"
 
-#: ../libpurple/protocols/msn/session.c:303
+#: ../libpurple/protocols/msn/session.c:354
+#: ../libpurple/protocols/msnp9/session.c:307
 msgid "Error parsing HTTP."
 msgstr "解析 HTTP 途中發生錯誤。"
 
-#: ../libpurple/protocols/msn/session.c:307
-#: ../libpurple/protocols/oscar/flap_connection.c:384
-#: ../libpurple/protocols/yahoo/yahoo.c:205
+#: ../libpurple/protocols/msn/session.c:358
+#: ../libpurple/protocols/msnp9/session.c:311
+#: ../libpurple/protocols/oscar/flap_connection.c:387
+#: ../libpurple/protocols/yahoo/yahoo.c:207
 msgid "You have signed on from another location."
 msgstr "你由其他的地方登入。"
 
 #  XXX
-#: ../libpurple/protocols/msn/session.c:310
+#: ../libpurple/protocols/msn/session.c:364
+#: ../libpurple/protocols/msnp9/session.c:317
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "暫時無法使用 MSN 使服器,請過一會後重試。"
 
-#: ../libpurple/protocols/msn/session.c:315
+#: ../libpurple/protocols/msn/session.c:370
+#: ../libpurple/protocols/msnp9/session.c:323
 msgid "The MSN servers are going down temporarily."
 msgstr "MSN 伺服器將暫時關閉。"
 
-#: ../libpurple/protocols/msn/session.c:320
+#: ../libpurple/protocols/msn/session.c:375
+#: ../libpurple/protocols/msnp9/session.c:328
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "無法認證:%s"
 
-#: ../libpurple/protocols/msn/session.c:325
+#: ../libpurple/protocols/msn/session.c:381
+#: ../libpurple/protocols/msnp9/session.c:334
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr "暫時無法取得你的好友清單,請過一會後重試。"
 
-#: ../libpurple/protocols/msn/session.c:346
-#: ../libpurple/protocols/msn/session.c:348
+# See cnscode.org.tw
+#: ../libpurple/protocols/msn/session.c:403
+#: ../libpurple/protocols/msn/session.c:405
+#: ../libpurple/protocols/msnp9/session.c:356
+#: ../libpurple/protocols/msnp9/session.c:358
 msgid "Handshaking"
-msgstr "交談中"
-
-#: ../libpurple/protocols/msn/session.c:349
+msgstr "交握中"
+
+#: ../libpurple/protocols/msn/session.c:406
+#: ../libpurple/protocols/msnp9/session.c:359
 msgid "Starting authentication"
 msgstr "認證開始中"
 
-#: ../libpurple/protocols/msn/session.c:350
+#: ../libpurple/protocols/msn/session.c:407
+#: ../libpurple/protocols/msnp9/session.c:360
 msgid "Getting cookie"
 msgstr "取得 Cookie 中"
 
-#: ../libpurple/protocols/msn/session.c:352
+#: ../libpurple/protocols/msn/session.c:409
+#: ../libpurple/protocols/msnp9/session.c:362
 msgid "Sending cookie"
 msgstr "傳送 Cookie 中"
 
-#: ../libpurple/protocols/msn/session.c:353
+#: ../libpurple/protocols/msn/session.c:410
+#: ../libpurple/protocols/msnp9/session.c:363
 msgid "Retrieving buddy list"
 msgstr "讀取好友清單中"
 
 #: ../libpurple/protocols/msn/state.c:34
+#: ../libpurple/protocols/msnp9/state.c:34
 msgid "Away From Computer"
 msgstr "不在電腦前"
 
 #: ../libpurple/protocols/msn/state.c:35
+#: ../libpurple/protocols/msnp9/state.c:35
 msgid "On The Phone"
 msgstr "電話中"
 
 #: ../libpurple/protocols/msn/state.c:36
+#: ../libpurple/protocols/msnp9/state.c:36
 msgid "Out To Lunch"
 msgstr "外出用餐"
 
-#: ../libpurple/protocols/msn/switchboard.c:400
+#: ../libpurple/protocols/msn/switchboard.c:398
+#: ../libpurple/protocols/msnp9/switchboard.c:400
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "送出訊息逾時,可能沒有送出訊息:"
 
-#: ../libpurple/protocols/msn/switchboard.c:408
+#: ../libpurple/protocols/msn/switchboard.c:406
+#: ../libpurple/protocols/msnp9/switchboard.c:408
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr "隱身時無法送出訊息:"
 
-#: ../libpurple/protocols/msn/switchboard.c:412
+#: ../libpurple/protocols/msn/switchboard.c:410
+#: ../libpurple/protocols/msnp9/switchboard.c:412
 msgid "Message could not be sent because the user is offline:"
 msgstr "因為使用者目前離線,所以無法送出訊息:"
 
-#: ../libpurple/protocols/msn/switchboard.c:416
+#: ../libpurple/protocols/msn/switchboard.c:414
+#: ../libpurple/protocols/msnp9/switchboard.c:416
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "因為連線發生錯誤,所以訊息無法送出:"
 
-#: ../libpurple/protocols/msn/switchboard.c:420
+#: ../libpurple/protocols/msn/switchboard.c:418
+#: ../libpurple/protocols/msnp9/switchboard.c:420
 msgid "Message could not be sent because we are sending too quickly:"
 msgstr "因為我們傳送訊息的速度太快,所以訊息無法送出:"
 
-#: ../libpurple/protocols/msn/switchboard.c:424
+#: ../libpurple/protocols/msn/switchboard.c:422
+#: ../libpurple/protocols/msnp9/switchboard.c:424
 msgid ""
 "Message could not be sent because we were unable to establish a session with "
 "the server. This is likely a server problem, try again in a few minutes:"
-msgstr ""
-
-#: ../libpurple/protocols/msn/switchboard.c:431
+msgstr "因為無法與伺服器建立工作階段,所以訊息無法送出(這大概是伺服器出現了問題,請幾分鐘後重試):"
+
+#: ../libpurple/protocols/msn/switchboard.c:429
+#: ../libpurple/protocols/msnp9/switchboard.c:431
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr "因為 Switchboard 發生錯誤,所以訊息無法送出"
 
-#: ../libpurple/protocols/msn/switchboard.c:439
+#: ../libpurple/protocols/msn/switchboard.c:437
+#: ../libpurple/protocols/msnp9/switchboard.c:439
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "因為發生不明的錯誤,訊息可能沒有送出:"
 
-#: ../libpurple/protocols/msn/userlist.c:252
+#: ../libpurple/protocols/msn/userlist.c:243
+#: ../libpurple/protocols/msnp9/userlist.c:252
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "%s 將你加入他(她)的好友清單。"
 
-#: ../libpurple/protocols/msn/userlist.c:321
+#: ../libpurple/protocols/msn/userlist.c:312
+#: ../libpurple/protocols/msnp9/userlist.c:321
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s 將你從他(她)的好友清單中移除。"
 
-#: ../libpurple/protocols/msn/userlist.c:643
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#: ../libpurple/protocols/msn/userlist.c:693
+#: ../libpurple/protocols/msnp9/userlist.c:643
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "無法新增「%s」。"
 
-#: ../libpurple/protocols/msn/userlist.c:645
+#: ../libpurple/protocols/msn/userlist.c:696
+#: ../libpurple/protocols/msnp9/userlist.c:645
 msgid "The screen name specified is invalid."
 msgstr "你所輸入的帳號無效。"
 
-# XXX 暫譯 - 20061025
+#: ../libpurple/protocols/msnp9/msn.c:549
+msgid "Has you"
+msgstr "你在他(她)的好友清單裏"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/protocols/msnp9/msn.c:2159
+#: ../libpurple/protocols/msnp9/msn.c:2161
+msgid "MSN Protocol Plugin"
+msgstr "MSN 協定模組"
+
+# XXX 暫譯 - 20061025/20070912
 #: ../libpurple/protocols/myspace/myspace.c:111
-#, fuzzy
 msgid "Missing Cipher"
-msgstr "加密方法"
-
+msgstr "欠缺需要的加密方法"
+
+# XXX 暫譯 - 20061025/20070912
 #: ../libpurple/protocols/myspace/myspace.c:112
 msgid "The RC4 cipher could not be found"
-msgstr ""
+msgstr "找不到 RC4 加密方法"
 
 #: ../libpurple/protocols/myspace/myspace.c:113
 msgid ""
 "Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
 "not be loaded."
-msgstr ""
+msgstr "無法載入 MySpaceIM 模組。請升級至有 RC4 支援的 libpurple(即 2.0.1 版或以上)。"
 
 #: ../libpurple/protocols/myspace/myspace.c:286
 #, c-format
 msgid ""
 "Sorry, passwords over %d characters in length (yours is %d) are not "
 "supported by MySpace."
-msgstr ""
+msgstr "MySpace 恕不支援長於 %d 個字符的密碼,而你的密碼已是 %d 個字符長。"
 
 #. Notify an error message also, because this is important!
 #: ../libpurple/protocols/myspace/myspace.c:292
-#: ../libpurple/protocols/myspace/myspace.c:1801
+#: ../libpurple/protocols/myspace/myspace.c:1820
 msgid "MySpaceIM Error"
-msgstr ""
-
-# NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
-#: ../libpurple/protocols/myspace/myspace.c:349
-#, fuzzy
+msgstr "MySpaceIM 錯誤"
+
+# NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
+#: ../libpurple/protocols/myspace/myspace.c:352
 msgid "Reading challenge"
-msgstr "讀取錯誤"
-
-# XXX 好像有些怪,譯文有待改進
-#: ../libpurple/protocols/myspace/myspace.c:355
-#, fuzzy
+msgstr "讀取驗證挑戰中"
+
+# XXX 好像有些怪,譯文有待改進
+#: ../libpurple/protocols/myspace/myspace.c:360
 msgid "Unexpected challenge length from server"
-msgstr "伺服器送來了無效的驗證挑戰"
-
-#: ../libpurple/protocols/myspace/myspace.c:359
-#, fuzzy
+msgstr "伺服器送來的驗證挑戰有意料之外的長度"
+
+#: ../libpurple/protocols/myspace/myspace.c:364
 msgid "Logging in"
-msgstr "日誌"
-
-#: ../libpurple/protocols/myspace/myspace.c:1286
+msgstr "登入中"
+
+#: ../libpurple/protocols/myspace/myspace.c:1296
 #, c-format
 msgid "Connection to server lost (no data received within %d seconds)"
-msgstr ""
+msgstr "與伺服器失去連線(%d 秒內收不到任何資料)"
 
 #. Can't write _()'d strings in array initializers. Workaround.
-#: ../libpurple/protocols/myspace/myspace.c:1328
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:1339
 msgid "New mail messages"
-msgstr "送出訊息"
-
-#: ../libpurple/protocols/myspace/myspace.c:1329
+msgstr "有新郵件"
+
+#: ../libpurple/protocols/myspace/myspace.c:1340
 msgid "New blog comments"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:1330
+msgstr "網誌有新留言"
+
+#: ../libpurple/protocols/myspace/myspace.c:1341
 msgid "New profile comments"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:1331
+msgstr "個人資料網頁有新留言"
+
+#  FIXME 譯文很不通順 - acli 20070913
+#: ../libpurple/protocols/myspace/myspace.c:1342
 msgid "New friend requests!"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:1332
+msgstr "有新的交友要求!"
+
+#: ../libpurple/protocols/myspace/myspace.c:1343
 msgid "New picture comments"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:1360
+msgstr "相片集有新留言"
+
+#: ../libpurple/protocols/myspace/myspace.c:1371
 msgid "MySpace"
-msgstr ""
-
-# TODO 要覆查 - 20061027
+msgstr "MySpace"
+
+# TODO 要覆查 - 20061027
 #. The session is now set up, ready to be connected. This emits the
 #. * signedOn signal, so clients can now do anything with msimprpl, and
 #. * we're ready for it (session key, userid, username all setup).
-#: ../libpurple/protocols/myspace/myspace.c:1543
-#: ../libpurple/protocols/sametime/sametime.c:1544
+#: ../libpurple/protocols/myspace/myspace.c:1554
+#: ../libpurple/protocols/sametime/sametime.c:1546
 msgid "Connected"
 msgstr "已連結"
 
-# NOTE 暫譯,或許有其他意義
-#: ../libpurple/protocols/myspace/myspace.c:1554
-#: ../libpurple/protocols/myspace/myspace.c:1556
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:1565
+#: ../libpurple/protocols/myspace/myspace.c:1568
 msgid "No username set"
-msgstr "未命名"
-
-#: ../libpurple/protocols/myspace/myspace.c:1555
+msgstr "未有設定使用者名稱"
+
+#: ../libpurple/protocols/myspace/myspace.c:1566
 msgid ""
 "Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
 "username and choose a username and try to login again."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:1782
-#, fuzzy, c-format
+msgstr "請到 http://editprofile.myspace.com/index.cfm?fuseaction=profile.username 選擇一個使用者名稱後,再嘗試重新登入。"
+
+#: ../libpurple/protocols/myspace/myspace.c:1794
+#, c-format
 msgid "Protocol error, code %d: %s"
-msgstr "回應處理錯誤代碼 %d"
-
-#: ../libpurple/protocols/myspace/myspace.c:1972
-#: ../libpurple/protocols/myspace/myspace.c:2006
-#, fuzzy
+msgstr "通訊協定錯誤,代碼 %d:%s"
+
+#: ../libpurple/protocols/myspace/myspace.c:1990
+#: ../libpurple/protocols/myspace/myspace.c:2024
 msgid "Failed to add buddy"
-msgstr "無法加入好友目前所在的聊天室"
-
-#: ../libpurple/protocols/myspace/myspace.c:1972
-#, fuzzy
+msgstr "無法新增好友"
+
+#: ../libpurple/protocols/myspace/myspace.c:1990
 msgid "'addbuddy' command failed."
-msgstr "自檔案讀取好友清單..."
-
-#: ../libpurple/protocols/myspace/myspace.c:2006
-#: ../libpurple/protocols/myspace/myspace.c:2247
-#, fuzzy
+msgstr "「addbuddy」指令失敗。"
+
+#: ../libpurple/protocols/myspace/myspace.c:2024
+#: ../libpurple/protocols/myspace/myspace.c:2261
 msgid "persist command failed"
-msgstr "Switchboard 失敗"
-
-#: ../libpurple/protocols/myspace/myspace.c:2115
+msgstr "「persist」指令失敗"
+
+#: ../libpurple/protocols/myspace/myspace.c:2129
 #, c-format
 msgid "No such user: %s"
-msgstr ""
-
-# NOTE wing: does "User Rooms" mean rooms created by users? i guess yes?
-# NOTE marv: wing: yeah, Yahoo has Yahoo rooms and user rooms
-# NOTE marv: marv: in the room list stuff? yeah it's a user created room as opposed to an official room
-#: ../libpurple/protocols/myspace/myspace.c:2116
-#, fuzzy
+msgstr "無此使用者:%s"
+
+#: ../libpurple/protocols/myspace/myspace.c:2130
 msgid "User lookup"
-msgstr "使用者建立之聊天室"
-
-#: ../libpurple/protocols/myspace/myspace.c:2228
-#: ../libpurple/protocols/myspace/myspace.c:2247
-#: ../libpurple/protocols/myspace/myspace.c:2269
-#, fuzzy
+msgstr "搜尋使用者"
+
+#: ../libpurple/protocols/myspace/myspace.c:2242
+#: ../libpurple/protocols/myspace/myspace.c:2261
+#: ../libpurple/protocols/myspace/myspace.c:2283
 msgid "Failed to remove buddy"
-msgstr "無法加入好友目前所在的聊天室"
-
-#: ../libpurple/protocols/myspace/myspace.c:2228
+msgstr "無法移除使用者"
+
+#: ../libpurple/protocols/myspace/myspace.c:2242
 msgid "'delbuddy' command failed"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:2269
-#, fuzzy
+msgstr "「delbuddy」指令失敗"
+
+#: ../libpurple/protocols/myspace/myspace.c:2283
 msgid "blocklist command failed"
-msgstr "Switchboard 失敗"
-
-#: ../libpurple/protocols/myspace/myspace.c:2315
-#, fuzzy
+msgstr "「blocklist」指令失敗"
+
+#  NOTE「condition」可能為「條件」或「狀況」
+#  NOTE 原始碼內這字串是指「cond != PURPLE_INPUT_READ && cond != PURPLE_INPUT_WRITE」
+#  NOTE 所以應是「狀況」而非「條件」
+#: ../libpurple/protocols/myspace/myspace.c:2331
 msgid "Invalid input condition"
-msgstr "完成連線"
-
-#. TODO: g_realloc like msn, yahoo, irc, jabber?
-#: ../libpurple/protocols/myspace/myspace.c:2333
-#: ../libpurple/protocols/myspace/myspace.c:2364
-#, fuzzy
+msgstr "輸入狀況無效"
+
+#: ../libpurple/protocols/myspace/myspace.c:2351
+#: ../libpurple/protocols/myspace/myspace.c:2388
 msgid "Read buffer full"
-msgstr "佇列滿了"
-
-#: ../libpurple/protocols/myspace/myspace.c:2402
-#, fuzzy
+msgstr "讀取用的暫存區滿了"
+
+#: ../libpurple/protocols/myspace/myspace.c:2430
 msgid "Unparseable message"
 msgstr "無法解析訊息"
 
-#: ../libpurple/protocols/myspace/myspace.c:2471
-#, fuzzy, c-format
+#: ../libpurple/protocols/myspace/myspace.c:2499
+#, c-format
 msgid "Couldn't connect to host: %s (%d)"
-msgstr "無法連到伺服器"
-
-#: ../libpurple/protocols/myspace/myspace.c:2642
-#, fuzzy
+msgstr "無法連到伺服器:%s (%d)"
+
+#  NOTE 這是群組名稱
+#: ../libpurple/protocols/myspace/myspace.c:2670
 msgid "IM Friends"
-msgstr "即時訊息視窗(_I)"
-
-#: ../libpurple/protocols/myspace/myspace.c:2741
+msgstr "即時訊息的好友"
+
+#: ../libpurple/protocols/myspace/myspace.c:2769
 #, c-format
 msgid ""
 "%d buddies were added or updated from the server (including buddies already "
 "on the server-side list)"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:2742
-#, fuzzy
+msgstr "從伺服器新增或更新了 %d 個好友(包括已在好友清單上的好友)"
+
+#: ../libpurple/protocols/myspace/myspace.c:2770
 msgid "Add contacts from server"
-msgstr "伺服器送來了無效的回應。"
-
-#: ../libpurple/protocols/myspace/myspace.c:2794
-#: ../libpurple/protocols/myspace/myspace.c:2859
+msgstr "從伺服器加入聯絡人"
+
+#: ../libpurple/protocols/myspace/myspace.c:2822
+#: ../libpurple/protocols/myspace/myspace.c:2887
 msgid "Add friends from MySpace.com"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:2795
-#, fuzzy
+msgstr "從 MySpace.com 新增好友"
+
+#: ../libpurple/protocols/myspace/myspace.c:2823
 msgid "Importing friends failed"
-msgstr "模組載入失敗"
+msgstr "匯入好友失敗"
 
 #. TODO: find out how
-#: ../libpurple/protocols/myspace/myspace.c:2851
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:2879
 msgid "Find people..."
 msgstr "尋找好友..."
 
-#: ../libpurple/protocols/myspace/myspace.c:2854
-#, fuzzy
+#: ../libpurple/protocols/myspace/myspace.c:2882
 msgid "Change IM name..."
-msgstr "修改密碼..."
-
-#: ../libpurple/protocols/myspace/myspace.c:3156
+msgstr "更改即時通訊名稱..."
+
+#  NOTE 這似乎是視窗標題
+#: ../libpurple/protocols/myspace/myspace.c:3184
 msgid "myim URL handler"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:3157
+msgstr "myim 網址處理器"
+
+#: ../libpurple/protocols/myspace/myspace.c:3185
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:3158
+msgstr "無法找可以開啟這個 myim 網址的 MySpaceIM 帳號。"
+
+#: ../libpurple/protocols/myspace/myspace.c:3186
 msgid "Enable the proper MySpaceIM account and try again."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:3281
+msgstr "請啟用合適的 MySpaceIM 帳號後再重試。"
+
+#: ../libpurple/protocols/myspace/myspace.c:3309
 msgid "Show display name in status text"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:3284
+msgstr "在狀態列顯示網名"
+
+#: ../libpurple/protocols/myspace/myspace.c:3312
 msgid "Show headline in status text"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:3289
-#, fuzzy
+msgstr "在狀態列顯示標題"
+
+#: ../libpurple/protocols/myspace/myspace.c:3317
 msgid "Send emoticons"
-msgstr "音效選項"
-
-#: ../libpurple/protocols/myspace/myspace.c:3294
+msgstr "傳送表情圖示"
+
+#: ../libpurple/protocols/myspace/myspace.c:3322
 msgid "Screen resolution (dots per inch)"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:3297
-#, fuzzy
+msgstr "熒幕解像度(DPI)"
+
+#: ../libpurple/protocols/myspace/myspace.c:3325
 msgid "Base font size (points)"
-msgstr "放大字體"
+msgstr "基礎字體大小(點)"
 
 #: ../libpurple/protocols/myspace/user.c:95
 #: ../libpurple/protocols/zephyr/zephyr.c:786
@@ -7751,179 +7877,200 @@
 msgid "User"
 msgstr "使用者"
 
-#. TODO: link to username, if available
-#: ../libpurple/protocols/myspace/user.c:102
-#: ../libpurple/protocols/oscar/oscar.c:2964
+#: ../libpurple/protocols/myspace/user.c:105
+#: ../libpurple/protocols/oscar/oscar.c:2974
 msgid "Profile"
 msgstr "個人資料"
 
-#: ../libpurple/protocols/myspace/user.c:124
-#, fuzzy
+#: ../libpurple/protocols/myspace/user.c:128
 msgid "Headline"
-msgstr "網名(_H):"
-
-#: ../libpurple/protocols/myspace/user.c:129
-#, fuzzy
+msgstr "頭條消息"
+
+#: ../libpurple/protocols/myspace/user.c:133
 msgid "Song"
-msgstr "音效"
-
-#: ../libpurple/protocols/myspace/user.c:134
+msgstr "歌曲"
+
+#: ../libpurple/protocols/myspace/user.c:141
 msgid "Total Friends"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/user.c:145
-#: ../libpurple/protocols/myspace/user.c:148
-#: ../libpurple/protocols/myspace/user.c:151
-#, fuzzy
+msgstr "好友總數"
+
+#: ../libpurple/protocols/myspace/user.c:159
 msgid "Client Version"
-msgstr "關閉交談"
+msgstr "客戶端版本"
 
 #. TODO: icons for each zap
-#: ../libpurple/protocols/myspace/zap.c:44
-#: ../libpurple/protocols/myspace/zap.c:177
+#. Lots of comments for translators:
+#. Zap means "to strike suddenly and forcefully as if with a
+#. * projectile or weapon."  This term often has an electrical
+#. * connotation, for example, "he was zapped by electricity when
+#. * he put a fork in the toaster."
+#: ../libpurple/protocols/myspace/zap.c:51
+#: ../libpurple/protocols/myspace/zap.c:214
 msgid "Zap"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:44
-#, fuzzy, c-format
+msgstr "放電"
+
+#: ../libpurple/protocols/myspace/zap.c:51
+#, c-format
 msgid "%s has zapped you!"
-msgstr "%s 已將你 [%s] 加入到他(她)的好友清單"
-
-#: ../libpurple/protocols/myspace/zap.c:44
+msgstr "%s 電了你一下!"
+
+#: ../libpurple/protocols/myspace/zap.c:51
 #, c-format
 msgid "Zapping %s..."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:45
+msgstr "向 %s 放電中..."
+
+#. Whack means "to hit or strike someone with a sharp blow"
+#: ../libpurple/protocols/myspace/zap.c:54
 msgid "Whack"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:45
-#, fuzzy, c-format
+msgstr "打人"
+
+#: ../libpurple/protocols/myspace/zap.c:54
+#, c-format
 msgid "%s has whacked you!"
-msgstr "%s 已將你 [%s] 加入到他(她)的好友清單"
-
-#: ../libpurple/protocols/myspace/zap.c:45
+msgstr "%s 打了你一下!"
+
+#: ../libpurple/protocols/myspace/zap.c:54
 #, c-format
 msgid "Whacking %s..."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:46
-#, fuzzy
+msgstr "打 %s 中..."
+
+#. Torch means "to set on fire."  Don't worry, this doesn't
+#. * make a whole lot of sense in English, either.  Feel free
+#. * to translate it literally.
+#: ../libpurple/protocols/myspace/zap.c:59
 msgid "Torch"
-msgstr "主題"
-
-#: ../libpurple/protocols/myspace/zap.c:46
-#, fuzzy, c-format
+msgstr "放火"
+
+#: ../libpurple/protocols/myspace/zap.c:59
+#, c-format
 msgid "%s has torched you!"
-msgstr "該使用者拒絕了你"
-
-#: ../libpurple/protocols/myspace/zap.c:46
+msgstr "%s 燒了你!"
+
+#: ../libpurple/protocols/myspace/zap.c:59
 #, c-format
 msgid "Torching %s..."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:47
+msgstr "燒 %s 中..."
+
+#. Smooch means "to kiss someone, often enthusiastically"
+#: ../libpurple/protocols/myspace/zap.c:62
 msgid "Smooch"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:47
-#, fuzzy, c-format
+msgstr "親吻"
+
+#: ../libpurple/protocols/myspace/zap.c:62
+#, c-format
 msgid "%s has smooched you!"
-msgstr "%s 已經登入。"
-
-#: ../libpurple/protocols/myspace/zap.c:47
+msgstr "%s 親吻了你!"
+
+#: ../libpurple/protocols/myspace/zap.c:62
 #, c-format
 msgid "Smooching %s..."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:48
+msgstr "親吻 %s 中..."
+
+#. A hug is a display of affection; wrapping your arms around someone
+#: ../libpurple/protocols/myspace/zap.c:65
 msgid "Hug"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:48
-#, fuzzy, c-format
+msgstr "擁抱"
+
+#: ../libpurple/protocols/myspace/zap.c:65
+#, c-format
 msgid "%s has hugged you!"
-msgstr "%s 已經登入。"
-
-#: ../libpurple/protocols/myspace/zap.c:48
+msgstr "%s 擁抱了你!"
+
+#: ../libpurple/protocols/myspace/zap.c:65
 #, c-format
 msgid "Hugging %s..."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:49
-#, fuzzy
+msgstr "擁抱 %s 中..."
+
+#. Slap means "to hit someone with an open/flat hand"
+#: ../libpurple/protocols/myspace/zap.c:68
 msgid "Slap"
-msgstr "想睡"
-
-#: ../libpurple/protocols/myspace/zap.c:49
-#, fuzzy, c-format
+msgstr "摑掌"
+
+#: ../libpurple/protocols/myspace/zap.c:68
+#, c-format
 msgid "%s has slapped you!"
-msgstr "%s 已將你 [%s] 加入到他(她)的好友清單"
-
-#: ../libpurple/protocols/myspace/zap.c:49
+msgstr "%s 摑了你一巴掌!"
+
+#: ../libpurple/protocols/myspace/zap.c:68
 #, c-format
 msgid "Slapping %s..."
-msgstr ""
-
-#  NOTE Jabber 錯誤 <gone/>,表示使用者或伺服器曾經上線,後來離了線
-#  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libpurple/protocols/myspace/zap.c:50
-#, fuzzy
+msgstr "摑 %s 中..."
+
+#. Goose means "to pinch someone on their butt"
+#: ../libpurple/protocols/myspace/zap.c:71
 msgid "Goose"
-msgstr "已離線"
-
-#: ../libpurple/protocols/myspace/zap.c:50
-#, fuzzy, c-format
+msgstr "掐屁股"
+
+#: ../libpurple/protocols/myspace/zap.c:71
+#, c-format
 msgid "%s has goosed you!"
-msgstr "%s 已經離開。"
-
-#: ../libpurple/protocols/myspace/zap.c:50
-#, fuzzy, c-format
+msgstr "%s 掐了你的屁股!"
+
+#: ../libpurple/protocols/myspace/zap.c:71
+#, c-format
 msgid "Goosing %s..."
-msgstr "找尋 %s 中"
-
-#: ../libpurple/protocols/myspace/zap.c:51
+msgstr "掐 %s 的屁股中..."
+
+#  TODO Untranslated
+#. A high-five is when two people's hands slap each other
+#. * in the air above their heads.  It is done to celebrate
+#. * something, often a victory, or to congratulate someone.
+#: ../libpurple/protocols/myspace/zap.c:76
 msgid "High-five"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:51
-#, fuzzy, c-format
+msgstr "High-five"
+
+#  TODO Untranslated
+#: ../libpurple/protocols/myspace/zap.c:76
+#, c-format
 msgid "%s has high-fived you!"
-msgstr "%s 已經登入。"
-
-#: ../libpurple/protocols/myspace/zap.c:51
+msgstr "%s high-five 了你!"
+
+#  TODO Untranslated
+#: ../libpurple/protocols/myspace/zap.c:76
 #, c-format
 msgid "High-fiving %s..."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:52
+msgstr "High-five %s 中..."
+
+#. We're not entirely sure what the MySpace people mean by
+#. * this... but we think it's the equivalent of "prank."  Or, for
+#. * someone to perform a mischievous trick or practical joke.
+#: ../libpurple/protocols/myspace/zap.c:81
 msgid "Punk"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:52
-#, fuzzy, c-format
+msgstr "整蠱"
+
+#: ../libpurple/protocols/myspace/zap.c:81
+#, c-format
 msgid "%s has punk'd you!"
-msgstr "%s 已經登入。"
-
-#: ../libpurple/protocols/myspace/zap.c:52
+msgstr "%s 整蠱了你!"
+
+#: ../libpurple/protocols/myspace/zap.c:81
 #, c-format
 msgid "Punking %s..."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:53
+msgstr "整蠱 %s 中..."
+
+# NOTE「Raspberry」在這裏是指一種噴口水發出古怪聲音的動作
+# NOTE 實例請見 http://vids.myspace.com/index.cfm?fuseaction=vids.individual&VideoID=2903093
+# NOTE 中文翻譯員在2007年9月24日一致決定,暫且翻成「出怪聲」
+#. Raspberry is a slang term for the vibrating sound made
+#. * when you stick your tongue out of your mouth with your
+#. * lips closed and blow.  It is typically done when
+#. * gloating or bragging.  Nowadays it's a pretty silly
+#. * gesture, so it does not carry a harsh negative
+#. * connotation.  It is generally used in a playful tone
+#. * with friends.
+#: ../libpurple/protocols/myspace/zap.c:90
 msgid "Raspberry"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:53
-#, fuzzy, c-format
+msgstr "出怪聲"
+
+#: ../libpurple/protocols/myspace/zap.c:90
+#, c-format
 msgid "%s has raspberried you!"
-msgstr "%s 已經登入。"
-
-#: ../libpurple/protocols/myspace/zap.c:53
+msgstr "%s 向你出怪聲!"
+
+#: ../libpurple/protocols/myspace/zap.c:90
 #, c-format
 msgid "Raspberrying %s..."
-msgstr ""
+msgstr "向 %s 出怪聲中..."
 
 #: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
@@ -7953,7 +8100,7 @@
 msgid "A folder with that name already exists"
 msgstr "那個目錄已經存在"
 
-#  XXX 這個太奇怪了 (^^;)
+#  XXX 這個太奇怪了 (^^;)
 #: ../libpurple/protocols/novell/nmuser.c:1887
 msgid "Not supported"
 msgstr "不支援"
@@ -7978,7 +8125,7 @@
 msgid "The server could not access the directory"
 msgstr "伺服器無法存取目錄"
 
-#  XXX 要覆查譯文
+#  XXX 要覆查譯文
 #: ../libpurple/protocols/novell/nmuser.c:1906
 msgid "Your system administrator has disabled this operation"
 msgstr "你的系統管理員不容許這個動作"
@@ -7995,7 +8142,7 @@
 msgid "Cannot add yourself"
 msgstr "無法新增你自己至好友清單"
 
-#  TODO 不知「Master archive」有無正式譯文,也不知應如何譯
+#  TODO 不知「Master archive」有無正式譯文,也不知應如何譯
 #: ../libpurple/protocols/novell/nmuser.c:1918
 msgid "Master archive is misconfigured"
 msgstr "Master archive 設定錯誤"
@@ -8058,111 +8205,111 @@
 msgid "Login failed (%s)."
 msgstr "登入失敗 (%s)。"
 
-#  XXX 暫譯
-#: ../libpurple/protocols/novell/novell.c:247
+#  XXX 暫譯
+#: ../libpurple/protocols/novell/novell.c:255
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr "無法送出訊息。無法取得使用者的細節 (%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:396
+#: ../libpurple/protocols/novell/novell.c:404
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "無法把 %s 加至你的好友清單 (%s)。"
 
 #. TODO: Improve this! message to who or for what conference?
-#: ../libpurple/protocols/novell/novell.c:422
+#: ../libpurple/protocols/novell/novell.c:430
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "無法送出訊息 (%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:493
-#: ../libpurple/protocols/novell/novell.c:985
+#: ../libpurple/protocols/novell/novell.c:501
+#: ../libpurple/protocols/novell/novell.c:993
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "無法邀請使用者 (%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:532
+#: ../libpurple/protocols/novell/novell.c:540
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr "無法送出訊息至 %s。無法建立會議 (%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:537
+#: ../libpurple/protocols/novell/novell.c:545
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "無法送出訊息。無法建立會議 (%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:584
+#: ../libpurple/protocols/novell/novell.c:592
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
 "creating folder (%s)."
 msgstr "無法在伺服器上的清單把使用者 %s 移至目錄 %s。建立目錄時發生錯誤 (%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:632
+#: ../libpurple/protocols/novell/novell.c:640
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
 "list (%s)."
 msgstr "無法新增 %s 至好友清單。在伺服器上的清單建立目錄時發生錯誤 (%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:705
+#: ../libpurple/protocols/novell/novell.c:713
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "無法取得使用者 %s 的細節 (%s)。"
 
-#  FIXME 譯文有待改進
-#: ../libpurple/protocols/novell/novell.c:751
-#: ../libpurple/protocols/novell/novell.c:897
+#  FIXME 譯文有待改進
+#: ../libpurple/protocols/novell/novell.c:759
+#: ../libpurple/protocols/novell/novell.c:905
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "無法把使用者加至你的私隱清單 (%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:798
+#: ../libpurple/protocols/novell/novell.c:806
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "無法把 %s 加至你的拒絕清單 (%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:851
+#: ../libpurple/protocols/novell/novell.c:859
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "無法把 %s 加至你的允許清單 (%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:919
+#: ../libpurple/protocols/novell/novell.c:927
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "無法把 %s 移除自你的私隱清單 (%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:942
-#: ../libpurple/protocols/novell/novell.c:1647
+#: ../libpurple/protocols/novell/novell.c:950
+#: ../libpurple/protocols/novell/novell.c:1656
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "無法在伺服器端修改私隱設定 (%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:1012
+#: ../libpurple/protocols/novell/novell.c:1020
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "無法建立會議 (%s)。"
 
-#: ../libpurple/protocols/novell/novell.c:1121
-#: ../libpurple/protocols/novell/novell.c:1692
+#: ../libpurple/protocols/novell/novell.c:1131
+#: ../libpurple/protocols/novell/novell.c:1702
 msgid "Error communicating with server. Closing connection."
 msgstr "和伺服器間的通訊發生錯誤。關閉連線。"
 
-#: ../libpurple/protocols/novell/novell.c:1476
+#: ../libpurple/protocols/novell/novell.c:1485
 msgid "Telephone Number"
 msgstr "電話號碼"
 
-#: ../libpurple/protocols/novell/novell.c:1482
+#: ../libpurple/protocols/novell/novell.c:1491
 msgid "Personal Title"
 msgstr "個人職銜"
 
-#  NOTE 似乎無中文譯文
-#: ../libpurple/protocols/novell/novell.c:1486
+#  NOTE 似乎無中文譯文
+#: ../libpurple/protocols/novell/novell.c:1495
 msgid "Mailstop"
 msgstr "Mail Stop"
 
-#: ../libpurple/protocols/novell/novell.c:1502
-#: ../libpurple/protocols/sametime/sametime.c:4122
+#: ../libpurple/protocols/novell/novell.c:1511
+#: ../libpurple/protocols/sametime/sametime.c:4168
 msgid "User ID"
 msgstr "使用者ID"
 
@@ -8172,43 +8319,39 @@
 #. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: ../libpurple/protocols/novell/novell.c:1515
+#: ../libpurple/protocols/novell/novell.c:1524
 msgid "Full name"
 msgstr "全名"
 
-#  NOTE「GroupWise」是軟件名稱,正式中文名大概不會是「群組」...
-#: ../libpurple/protocols/novell/novell.c:1637
+#  NOTE「GroupWise」是軟件名稱,正式中文名大概不會是「群組」...
+#: ../libpurple/protocols/novell/novell.c:1646
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise 會議 %d"
 
-#: ../libpurple/protocols/novell/novell.c:1668
-msgid "Unable to make SSL connection to server."
-msgstr "無法使用 SSL 協定連線到伺服器。"
-
-#: ../libpurple/protocols/novell/novell.c:1720
+#: ../libpurple/protocols/novell/novell.c:1729
 msgid "Authenticating..."
 msgstr "認證中..."
 
-#: ../libpurple/protocols/novell/novell.c:1732
+#: ../libpurple/protocols/novell/novell.c:1743
 msgid "Unable to connect to server."
 msgstr "無法連線到伺服器。"
 
-#: ../libpurple/protocols/novell/novell.c:1735
+#: ../libpurple/protocols/novell/novell.c:1746
 msgid "Waiting for response..."
 msgstr "等待回覆中..."
 
-#: ../libpurple/protocols/novell/novell.c:1870
+#: ../libpurple/protocols/novell/novell.c:1881
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "邀請了 %s 加入這個交談。"
 
-#: ../libpurple/protocols/novell/novell.c:1898
+#: ../libpurple/protocols/novell/novell.c:1909
 msgid "Invitation to Conversation"
 msgstr "邀請加入交談"
 
-#  NOTE「Sent」係指發出邀請時的時間
-#: ../libpurple/protocols/novell/novell.c:1899
+#  NOTE「Sent」係指發出邀請時的時間
+#: ../libpurple/protocols/novell/novell.c:1910
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -8219,38 +8362,32 @@
 "\n"
 "時間:%s"
 
-#: ../libpurple/protocols/novell/novell.c:1901
+#: ../libpurple/protocols/novell/novell.c:1912
 msgid "Would you like to join the conversation?"
 msgstr "你要加入個這交談嗎?"
 
-# XXX 暫譯
-#. we don't want to reconnect in this case
-#: ../libpurple/protocols/novell/novell.c:2012
+# XXX 暫譯
+#: ../libpurple/protocols/novell/novell.c:2027
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "你已經被登出,因為你已在其他電腦上登入。"
 
-#: ../libpurple/protocols/novell/novell.c:2069
+#: ../libpurple/protocols/novell/novell.c:2084
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s 目前似乎離線,所以不會收到你剛才送出的訊息。"
 
-#. TODO: Would be nice to prompt if not set!
-#. *  purple_request_fields(gc, _("Server Address"),...);
-#.
-#. ...but for now just error out with a nice message.
-#: ../libpurple/protocols/novell/novell.c:2167
+#: ../libpurple/protocols/novell/novell.c:2184
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 msgstr "無法連線至伺服器。請輸入你希望連線至的伺服器的位址。"
 
-#: ../libpurple/protocols/novell/novell.c:2195
+#: ../libpurple/protocols/novell/novell.c:2213
 msgid "Error. SSL support is not installed."
 msgstr "錯誤:沒有安裝 SSL 支援。"
 
-#: ../libpurple/protocols/novell/novell.c:2504
-#, c-format
+#: ../libpurple/protocols/novell/novell.c:2521
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "這個會議已經關閉。無法繼續送出任何訊息。"
 
@@ -8264,33 +8401,33 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3518
-#: ../libpurple/protocols/novell/novell.c:3520
+#: ../libpurple/protocols/novell/novell.c:3535
+#: ../libpurple/protocols/novell/novell.c:3537
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger 協定模組"
 
-#: ../libpurple/protocols/novell/novell.c:3545
+#: ../libpurple/protocols/novell/novell.c:3562
 msgid "Server address"
 msgstr "伺服器位址"
 
-#: ../libpurple/protocols/novell/novell.c:3549
+#: ../libpurple/protocols/novell/novell.c:3566
 msgid "Server port"
 msgstr "伺服器通訊埠"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:387
-#: ../libpurple/protocols/yahoo/yahoo.c:2469
-#: ../libpurple/protocols/yahoo/yahoo.c:2636
-#: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:581
-#: ../libpurple/proxy.c:1116 ../libpurple/proxy.c:1225
-#: ../libpurple/proxy.c:1325 ../libpurple/proxy.c:1453
+#: ../libpurple/protocols/oscar/flap_connection.c:391
+#: ../libpurple/protocols/yahoo/yahoo.c:2473
+#: ../libpurple/protocols/yahoo/yahoo.c:2641
+#: ../libpurple/protocols/yahoo/ycht.c:482 ../libpurple/proxy.c:584
+#: ../libpurple/proxy.c:1129 ../libpurple/proxy.c:1238
+#: ../libpurple/proxy.c:1338 ../libpurple/proxy.c:1466
 msgid "Server closed the connection."
 msgstr "伺服器關閉連線。"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:389
-#: ../libpurple/protocols/yahoo/yahoo.c:2463
-#: ../libpurple/protocols/yahoo/yahoo.c:2630 ../libpurple/proxy.c:593
-#: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1237
-#: ../libpurple/proxy.c:1337 ../libpurple/proxy.c:1465
+#: ../libpurple/protocols/oscar/flap_connection.c:393
+#: ../libpurple/protocols/yahoo/yahoo.c:2466
+#: ../libpurple/protocols/yahoo/yahoo.c:2634 ../libpurple/proxy.c:596
+#: ../libpurple/proxy.c:1141 ../libpurple/proxy.c:1250
+#: ../libpurple/proxy.c:1350 ../libpurple/proxy.c:1478
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -8299,10 +8436,10 @@
 "與伺服器之間的連線突然中斷:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:392
-#: ../libpurple/proxy.c:1145 ../libpurple/proxy.c:1250
-#: ../libpurple/proxy.c:1349 ../libpurple/proxy.c:1421
-#: ../libpurple/proxy.c:1478
+#: ../libpurple/protocols/oscar/flap_connection.c:396
+#: ../libpurple/proxy.c:1158 ../libpurple/proxy.c:1263
+#: ../libpurple/proxy.c:1362 ../libpurple/proxy.c:1434
+#: ../libpurple/proxy.c:1491
 msgid "Received invalid data on connection with server."
 msgstr "連線至伺服器時收到無效的資料。"
 
@@ -8337,42 +8474,49 @@
 msgstr "ICQ 協定模組"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4410
+#: ../libpurple/protocols/yahoo/yahoo.c:4421
 #: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "編碼"
 
-#: ../libpurple/protocols/oscar/odc.c:40
+#: ../libpurple/protocols/oscar/odc.c:42
 msgid "The remote user has closed the connection."
 msgstr "遠端使用者關閉了連線。"
 
-#: ../libpurple/protocols/oscar/odc.c:42
+#: ../libpurple/protocols/oscar/odc.c:44
 msgid "The remote user has declined your request."
 msgstr "遠端使用者拒絕了你的要求。"
 
-#: ../libpurple/protocols/oscar/odc.c:44
+#: ../libpurple/protocols/oscar/odc.c:46
 #, c-format
 msgid "Lost connection with the remote user:<br>%s"
 msgstr "與遠端使用者的連線突然中斷:<br>%s"
 
-#: ../libpurple/protocols/oscar/odc.c:47
+#: ../libpurple/protocols/oscar/odc.c:49
 msgid "Received invalid data on connection with remote user."
 msgstr "在與遠端使用者的連線上收到無交的資料。"
 
-#: ../libpurple/protocols/oscar/odc.c:49
+#: ../libpurple/protocols/oscar/odc.c:51
 msgid "Could not establish a connection with the remote user."
 msgstr "無法與遠端使用者建立連線。"
 
-#: ../libpurple/protocols/oscar/odc.c:560
+#: ../libpurple/protocols/oscar/odc.c:562
 msgid "Direct IM established"
 msgstr "即時訊息已經建立"
 
+#: ../libpurple/protocols/oscar/odc.c:600
+#, c-format
+msgid ""
+"%s tried to send you a %s file, but we only allow files up to %s over Direct "
+"IM.  Try using file transfer instead.\n"
+msgstr "%s 嘗試向你傳送一個 %s 的檔案,但透過即時訊息直接傳送檔案時,這個用戶端只容許不大於 %s 的檔案,因此,請嘗試改用普通的「檔案傳輸」功能傳送檔案。\n"
+
 #: ../libpurple/protocols/oscar/oft.c:656
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "檔案「%s」大小為 %s,超過了 %s 這個上限。"
 
-# NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
+# NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
 #: ../libpurple/protocols/oscar/oscar.c:116
 msgid "Invalid error"
 msgstr "無效錯誤"
@@ -8389,7 +8533,7 @@
 msgid "Rate to client"
 msgstr "到用戶端速率"
 
-#  XXX 可能是誤譯
+#  XXX 可能是誤譯
 #: ../libpurple/protocols/oscar/oscar.c:121
 msgid "Service unavailable"
 msgstr "伺服器不存在"
@@ -8426,8 +8570,8 @@
 msgid "Request denied"
 msgstr "要求被拒"
 
-# NOTE「Busted」與「SNAC payload」的說名由Luke Schierer在#gaim提供
-# NOTE 整句的意思其實係「您一次過傳送太多資訊了」
+# NOTE「Busted」與「SNAC payload」的說名由Luke Schierer在#gaim提供
+# NOTE 整句的意思其實係「您一次過傳送太多資訊了」
 #: ../libpurple/protocols/oscar/oscar.c:130
 msgid "Busted SNAC payload"
 msgstr "SNAC負載過大"
@@ -8436,7 +8580,7 @@
 msgid "Insufficient rights"
 msgstr "權限不夠"
 
-# NOTE Debian 譯「local」為「本地端」(Windows 舊譯「本地」,新譯「本機」)
+# NOTE Debian 譯「local」為「本地端」(Windows 舊譯「本地」,新譯「本機」)
 #: ../libpurple/protocols/oscar/oscar.c:132
 msgid "In local permit/deny"
 msgstr "本地端的允許/拒絕清單"
@@ -8479,23 +8623,18 @@
 "is probably using a different encoding than expected.  If you know what "
 "encoding he is using, you can specify it in the advanced account options for "
 "your AIM/ICQ account.)"
-msgstr ""
-"(接收這個訊息時發生了錯誤。正在跟你交談的好友很可能在使用與你想像不乎的字符"
-"編碼;如果你知道那是什麼編碼,請在你的 AIM/ICQ 帳號的「進階設定」中的「編碼」"
-"欄位指定。)"
+msgstr "(接收這個訊息時發生了錯誤。正在跟你交談的好友很可能在使用與你想像不乎的字符編碼;如果你知道那是什麼編碼,請在你的 AIM/ICQ 帳號的「進階設定」中的「編碼」欄位指定。)"
 
 #: ../libpurple/protocols/oscar/oscar.c:457
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
 "different encodings selected, or %s has a buggy client.)"
-msgstr ""
-"(接收這個訊息時發生了錯誤。可能你和 %s 選用了不同的編碼,也有可能是 %s 在使"
-"用有問題的用戶端程式。)"
+msgstr "(接收這個訊息時發生了錯誤。可能你和 %s 選用了不同的編碼,也有可能是 %s 在使用有問題的用戶端程式。)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2387
-#: ../pidgin/gtkutils.c:2417
+#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2392
+#: ../pidgin/gtkutils.c:2422
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:332
 msgid "Buddy Icon"
 msgstr "好友圖示"
@@ -8504,21 +8643,21 @@
 msgid "Voice"
 msgstr "聲音"
 
-# NOTE 將「直接消息」改譯為「即時訊息」
+# NOTE 將「直接消息」改譯為「即時訊息」
 #: ../libpurple/protocols/oscar/oscar.c:645
 msgid "AIM Direct IM"
 msgstr "AIM 式即時訊息"
 
 #: ../libpurple/protocols/oscar/oscar.c:648
-#: ../libpurple/protocols/silc/silc.c:768
-#: ../libpurple/protocols/silc/util.c:553
+#: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc/util.c:559
 #: ../libpurple/protocols/silc10/silc.c:679
 #: ../libpurple/protocols/silc10/util.c:549
 msgid "Chat"
 msgstr "聊天"
 
 #: ../libpurple/protocols/oscar/oscar.c:651
-#: ../libpurple/protocols/oscar/oscar.c:6010
+#: ../libpurple/protocols/oscar/oscar.c:6060
 msgid "Get File"
 msgstr "接收檔案"
 
@@ -8538,7 +8677,7 @@
 msgid "ICQ Direct Connect"
 msgstr "ICQ 式直接連線"
 
-# NOTE 據其他PO檔的譯文看,「AP」應該不是「應用程式」
+# NOTE 據其他PO檔的譯文看,「AP」應該不是「應用程式」
 #: ../libpurple/protocols/oscar/oscar.c:670
 msgid "AP User"
 msgstr "AP 使用者"
@@ -8547,7 +8686,7 @@
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-# NOTE「Nihilist」是什麼呢?連開發者都不知道
+# NOTE「Nihilist」是什麼呢?連開發者都不知道
 # NOTE (18:06:07) KingAnt: "nihilist" is actually the capability of all 0s--not no capabilities
 # NOTE (18:07:23) KingAnt: Yeah, what he said
 # NOTE (18:17:08) wing: capability of all 0s?
@@ -8574,7 +8713,7 @@
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-# NOTE 這似乎是一種掌上電腦的牌子
+# NOTE 這似乎是一種掌上電腦的牌子
 #: ../libpurple/protocols/oscar/oscar.c:691
 msgid "Hiptop"
 msgstr "Hiptop"
@@ -8583,12 +8722,12 @@
 msgid "Security Enabled"
 msgstr "有保安功能"
 
-# XXX 暫譯
+# XXX 暫譯
 #: ../libpurple/protocols/oscar/oscar.c:697
 msgid "Video Chat"
 msgstr "視像聊天"
 
-# XXX 暫譯
+# XXX 暫譯
 #: ../libpurple/protocols/oscar/oscar.c:701
 msgid "iChat AV"
 msgstr "iChat 視像聊天"
@@ -8597,56 +8736,50 @@
 msgid "Live Video"
 msgstr "動態視像"
 
-#  NOTE AIM_CAPS_CAMERA,即是什麼呢(^^;)
+#  NOTE AIM_CAPS_CAMERA,即是什麼呢(^^;)
 #: ../libpurple/protocols/oscar/oscar.c:707
 msgid "Camera"
 msgstr "照相機"
 
 #: ../libpurple/protocols/oscar/oscar.c:725
-#: ../libpurple/protocols/oscar/oscar.c:5780
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:5830
 msgid "Free For Chat"
 msgstr "我有空聊天"
 
 #: ../libpurple/protocols/oscar/oscar.c:729
-#: ../libpurple/protocols/oscar/oscar.c:5815
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:5865
 msgid "Not Available"
 msgstr "長時間離開"
 
 #: ../libpurple/protocols/oscar/oscar.c:731
-#: ../libpurple/protocols/oscar/oscar.c:5801
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:5851
 msgid "Occupied"
 msgstr "忙碌"
 
-# NOTE 參閱 http://www.geocities.com/Athens/Delphi/6470/icq99.html
+# NOTE 參閱 http://www.geocities.com/Athens/Delphi/6470/icq99.html
 #: ../libpurple/protocols/oscar/oscar.c:735
-#, c-format
 msgid "Web Aware"
 msgstr "允許其他使用者在網絡上查看你目前的狀態"
 
-#: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:183
-#: ../libpurple/protocols/qq/qq.c:288
-#: ../libpurple/protocols/yahoo/yahoo.c:3095 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1060
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:184
+#: ../libpurple/protocols/qq/qq.c:289
+#: ../libpurple/protocols/yahoo/yahoo.c:3106 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:557 ../pidgin/gtkstatusbox.c:1060
 msgid "Invisible"
 msgstr "隱身"
 
 #: ../libpurple/protocols/oscar/oscar.c:739
-#, c-format
 msgid "Online"
 msgstr "上線"
 
 #: ../libpurple/protocols/oscar/oscar.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3707
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1126
+#: ../libpurple/protocols/oscar/oscar.c:3717
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1156
 msgid "IP Address"
 msgstr "IP 位址"
 
 #: ../libpurple/protocols/oscar/oscar.c:845
-#: ../libpurple/protocols/oscar/oscar.c:2891
+#: ../libpurple/protocols/oscar/oscar.c:2901
 msgid "Warning Level"
 msgstr "警告等級"
 
@@ -8685,141 +8818,148 @@
 msgid "Finalizing connection"
 msgstr "完成連線"
 
-#: ../libpurple/protocols/oscar/oscar.c:1260
-#, fuzzy, c-format
+#: ../libpurple/protocols/oscar/oscar.c:1262
+#, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
 "invalid.  Screen names must be a valid email address, or start with a letter "
 "and contain only letters, numbers and spaces, or contain only numbers."
-msgstr ""
-"無法登入:無法以 %s 身份登入,因為這個帳號是無效的。帳號必須以英文字母起始,"
-"並只含英文字母、數字及空白;或者只由數字組成。"
-
-#: ../libpurple/protocols/oscar/oscar.c:1345
-#: ../libpurple/protocols/yahoo/yahoo.c:2105
+msgstr "無法登入:無法以 %s 身份登入,因為這個帳號是無效的。帳號必須為有效電郵地址;或者以英文字母起始,並只含英文字母、數字及空白;或者只由數字組成。"
+
+#. Unregistered screen name
+#: ../libpurple/protocols/oscar/oscar.c:1347
+#: ../libpurple/protocols/yahoo/yahoo.c:2108
 msgid "Invalid screen name."
 msgstr "帳號無效。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1352
-#: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1045
-#: ../libpurple/protocols/yahoo/yahoo.c:2126
+#: ../libpurple/protocols/oscar/oscar.c:1353
+#: ../libpurple/protocols/qq/login_logout.c:485
+#: ../libpurple/protocols/simple/simple.c:1112
+#: ../libpurple/protocols/yahoo/yahoo.c:2130
 msgid "Incorrect password."
 msgstr "錯誤的密碼。"
 
+#. Suspended account
 #: ../libpurple/protocols/oscar/oscar.c:1357
 msgid "Your account is currently suspended."
 msgstr "你的帳號目前停用中。"
 
-#  NOTE「暫時無法使用」應該比「暫時不存在」通順
-#  NOTE 譯文更動 by Ambrose
+#  NOTE「暫時無法使用」應該比「暫時不存在」通順
+#  NOTE 譯文更動 by Ambrose
 #. service temporarily unavailable
 #: ../libpurple/protocols/oscar/oscar.c:1361
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "暫時無法使用 AOL 即時訊息服務。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1366
-#: ../libpurple/protocols/oscar/oscar.c:1377
+#. screen name connecting too frequently
+#. IP address connecting too frequently
+#: ../libpurple/protocols/oscar/oscar.c:1365
+#: ../libpurple/protocols/oscar/oscar.c:1374
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
-msgstr ""
-"你的連線/斷線動作太過頻繁。請等待十分鐘後再行重試。如果你依然繼續嘗試連線,"
-"那麼你的等待時間將會更加的延長。"
-
-#: ../libpurple/protocols/oscar/oscar.c:1371
+msgstr "你的連線/斷線動作太過頻繁。請等待十分鐘後再行重試。如果你依然繼續嘗試連線,那麼你的等待時間將會更加的延長。"
+
+#. client too old
+#: ../libpurple/protocols/oscar/oscar.c:1369
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "你所使用的用戶端程式太過老舊。請到 %s 更新"
 
-#: ../libpurple/protocols/oscar/oscar.c:1410
+#: ../libpurple/protocols/oscar/oscar.c:1407
 msgid "Could Not Connect"
 msgstr "無法連線"
 
-#: ../libpurple/protocols/oscar/oscar.c:1414
+#: ../libpurple/protocols/oscar/oscar.c:1411
 msgid "Received authorization"
 msgstr "收到認證"
 
-#: ../libpurple/protocols/oscar/oscar.c:1436
+#: ../libpurple/protocols/oscar/oscar.c:1434
 msgid "The SecurID key entered is invalid."
 msgstr "你所輸入的 SecurID 碼無效。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1449
+#: ../libpurple/protocols/oscar/oscar.c:1447
 msgid "Enter SecurID"
 msgstr "請輸入 SecurID"
 
-#: ../libpurple/protocols/oscar/oscar.c:1450
+#: ../libpurple/protocols/oscar/oscar.c:1448
 msgid "Enter the 6 digit number from the digital display."
 msgstr "請輸入數碼顯示器所顯示的六位數字。"
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#. *
+#. * @since 2.3.0
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1452
-#: ../libpurple/protocols/oscar/oscar.c:2232
-#: ../libpurple/protocols/oscar/oscar.c:2281
-#: ../libpurple/protocols/oscar/oscar.c:5885
-#: ../libpurple/protocols/oscar/oscar.c:6166 ../libpurple/request.h:1388
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#. *
+#. * @deprecated Please use purple_request_ok_cancel_with_hint instead.
+#.
+#: ../libpurple/protocols/oscar/oscar.c:1450
+#: ../libpurple/protocols/oscar/oscar.c:2242
+#: ../libpurple/protocols/oscar/oscar.c:2291
+#: ../libpurple/protocols/oscar/oscar.c:5935
+#: ../libpurple/protocols/oscar/oscar.c:6216 ../libpurple/request.h:1828
+#: ../libpurple/request.h:1841
 msgid "_OK"
 msgstr "確定(_O)"
 
-#: ../libpurple/protocols/oscar/oscar.c:1491
-#: ../libpurple/protocols/oscar/oscar.c:1534
+#: ../libpurple/protocols/oscar/oscar.c:1489
+#: ../libpurple/protocols/oscar/oscar.c:1532
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
 "fixed.  Check %s for updates."
-msgstr ""
-"你可能會短時間中斷連線。你可能會想在這個問題被修正後使用 TOC。請到 %s 看看有"
-"沒有更新。"
-
-#: ../libpurple/protocols/oscar/oscar.c:1494
-#: ../libpurple/protocols/oscar/oscar.c:1537
+msgstr "你可能會短時間中斷連線。你可能會想在這個問題被修正後使用 TOC。請到 %s 看看有沒有更新。"
+
+#: ../libpurple/protocols/oscar/oscar.c:1492
+#: ../libpurple/protocols/oscar/oscar.c:1535
 msgid "Unable to get a valid AIM login hash."
 msgstr "無法取得有效的 AIM 登入碼。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1622
+#: ../libpurple/protocols/oscar/oscar.c:1620
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "你可能會短時間中斷連線。請到 %s 看看有沒有更新。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1625
+#: ../libpurple/protocols/oscar/oscar.c:1623
 msgid "Unable to get a valid login hash."
 msgstr "無法取得有效的登入碼。"
 
-#: ../libpurple/protocols/oscar/oscar.c:1655
+#: ../libpurple/protocols/oscar/oscar.c:1653
 msgid "Password sent"
 msgstr "密碼送出"
 
-#: ../libpurple/protocols/oscar/oscar.c:1711
+#: ../libpurple/protocols/oscar/oscar.c:1709
 msgid "Unable to initialize connection"
 msgstr "無法初始化連結"
 
-#: ../libpurple/protocols/oscar/oscar.c:2202
+#: ../libpurple/protocols/oscar/oscar.c:2200
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "請通過我的認證要求,好讓我可以將你加入我的好友清單中。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2230
+#: ../libpurple/protocols/oscar/oscar.c:2240
 msgid "Authorization Request Message:"
 msgstr "認證要求訊息:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2231
+#: ../libpurple/protocols/oscar/oscar.c:2241
 msgid "Please authorize me!"
 msgstr "請通過我的認證!"
 
-#: ../libpurple/protocols/oscar/oscar.c:2272
-#: ../libpurple/protocols/oscar/oscar.c:2280
-#: ../libpurple/protocols/oscar/oscar.c:2407
-#: ../libpurple/protocols/oscar/oscar.c:5263
-#: ../libpurple/protocols/yahoo/yahoo.c:1030
+#: ../libpurple/protocols/oscar/oscar.c:2282
+#: ../libpurple/protocols/oscar/oscar.c:2290
+#: ../libpurple/protocols/oscar/oscar.c:2417
+#: ../libpurple/protocols/oscar/oscar.c:5311
+#: ../libpurple/protocols/yahoo/yahoo.c:1032
 msgid "No reason given."
 msgstr "沒有給予原因。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2279
+#: ../libpurple/protocols/oscar/oscar.c:2289
 msgid "Authorization Denied Message:"
 msgstr "拒絕認證訊息:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2407
+#: ../libpurple/protocols/oscar/oscar.c:2417
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -8829,17 +8969,17 @@
 "使用者 %u 因為下列原因,拒絕了你將其加入好友清單的要求:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2408
+#: ../libpurple/protocols/oscar/oscar.c:2418
 msgid "ICQ authorization denied."
 msgstr "ICQ 認證拒絕。"
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2415
+#: ../libpurple/protocols/oscar/oscar.c:2425
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "使用者 %u 同意了你將其加入好友清單的要求。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2423
+#: ../libpurple/protocols/oscar/oscar.c:2433
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8852,7 +8992,7 @@
 "來自:%s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2431
+#: ../libpurple/protocols/oscar/oscar.c:2441
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8865,7 +9005,7 @@
 "來自:%s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2439
+#: ../libpurple/protocols/oscar/oscar.c:2449
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -8878,38 +9018,38 @@
 "訊息為:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2460
+#: ../libpurple/protocols/oscar/oscar.c:2470
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ 使用者 %u 送來一個好友資訊:%s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2466
+#: ../libpurple/protocols/oscar/oscar.c:2476
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "你想將他(她)加入到你的好友名單中嗎?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2471 ../pidgin/gtkroomlist.c:309
+#: ../libpurple/protocols/oscar/oscar.c:2481 ../pidgin/gtkroomlist.c:318
 msgid "_Add"
 msgstr "加入(_A)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2472
+#: ../libpurple/protocols/oscar/oscar.c:2482
 msgid "_Decline"
 msgstr "婉拒(_D)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2596
+#: ../libpurple/protocols/oscar/oscar.c:2606
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "你遺失了 %hu 個由 %s 送來的訊息,因為它是無效的。"
 msgstr[1] "你遺失了 %hu 個由 %s 送來的訊息,因為它們是無效的。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2605
+#: ../libpurple/protocols/oscar/oscar.c:2615
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "你遺失了 %hu 個由 %s 送來的訊息,因為它太大了。"
 msgstr[1] "你遺失了 %hu 個由 %s 送來的訊息,因為它們太大了。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2614
+#: ../libpurple/protocols/oscar/oscar.c:2624
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -8918,22 +9058,22 @@
 msgstr[0] "你遺失了 %hu 個由 %s 送來的訊息,因為它傳送的速度太快。"
 msgstr[1] "你遺失了 %hu 個由 %s 送來的訊息,因為它們傳送的速度太快。"
 
-# XXX 跟芬蘭文的前譯者 (Arto) 有同感,直譯「邪惡」好像行不通,下同
-#: ../libpurple/protocols/oscar/oscar.c:2623
+# XXX 跟芬蘭文的前譯者 (Arto) 有同感,直譯「邪惡」好像行不通,下同
+#: ../libpurple/protocols/oscar/oscar.c:2633
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "你遺失了 %hu 個由 %s 送來的訊息,因為他(她)太邪惡了。"
 msgstr[1] "你遺失了 %hu 個由 %s 送來的訊息,因為他(她)太邪惡了。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2632
+#: ../libpurple/protocols/oscar/oscar.c:2642
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "你遺失了 %hu 個由 %s 送來的訊息,因為你太邪惡了。"
 msgstr[1] "你遺失了 %hu 個由 %s 送來的訊息,因為你太邪惡了。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2641
+#: ../libpurple/protocols/oscar/oscar.c:2651
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
@@ -8941,214 +9081,208 @@
 msgstr[1] "你遺失了 %hu 個由 %s 送來的訊息,原因不明。"
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2796
+#: ../libpurple/protocols/oscar/oscar.c:2806
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "無法送出訊息:%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2796
-#: ../libpurple/protocols/oscar/oscar.c:2801
-#: ../libpurple/protocols/oscar/oscar.c:2865
+#: ../libpurple/protocols/oscar/oscar.c:2806
+#: ../libpurple/protocols/oscar/oscar.c:2811
+#: ../libpurple/protocols/oscar/oscar.c:2875
 msgid "Unknown reason."
 msgstr "原因不明。"
 
-#: ../libpurple/protocols/oscar/oscar.c:2799
-#: ../libpurple/protocols/sametime/sametime.c:2409
+#: ../libpurple/protocols/oscar/oscar.c:2809
+#: ../libpurple/protocols/sametime/sametime.c:2451
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "無法送出訊息至 %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2865
+#: ../libpurple/protocols/oscar/oscar.c:2875
 #, c-format
 msgid "User information not available: %s"
 msgstr "無法取得個人資料:%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2896
+#: ../libpurple/protocols/oscar/oscar.c:2906
 msgid "Online Since"
 msgstr "上線自"
 
-# XXX 改譯「註冊日期」會否比較通順?
-#: ../libpurple/protocols/oscar/oscar.c:2901
+# XXX 改譯「註冊日期」會否比較通順?
+#: ../libpurple/protocols/oscar/oscar.c:2911
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr "成為成員的時間"
 
-#: ../libpurple/protocols/oscar/oscar.c:2936
+#: ../libpurple/protocols/oscar/oscar.c:2946
 msgid "Available Message"
 msgstr "尚有訊息"
 
-#: ../libpurple/protocols/oscar/oscar.c:3044
+#: ../libpurple/protocols/oscar/oscar.c:3054
 msgid "Your AIM connection may be lost."
 msgstr "你的 AIM 可能斷線了。"
 
 #  The conversion failed!
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3232
+#: ../libpurple/protocols/oscar/oscar.c:3242
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr "「無法顯示來自這個使用者的訊息,因為它包含了無效字符。」"
 
-#: ../libpurple/protocols/oscar/oscar.c:3396
+#: ../libpurple/protocols/oscar/oscar.c:3406
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
-msgstr ""
-"你最近做的一個動作無法完成,因為你已經達到發送訊息速率的上限。請等待十秒後再"
-"試一次。"
-
-#: ../libpurple/protocols/oscar/oscar.c:3479
+msgstr "你最近做的一個動作無法完成,因為你已經達到發送訊息速率的上限。請等待十秒後再試一次。"
+
+#: ../libpurple/protocols/oscar/oscar.c:3489
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "你已經由聊天室 %s 停止連線。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3729
-#: ../libpurple/protocols/silc/util.c:585
+#: ../libpurple/protocols/oscar/oscar.c:3739
+#: ../libpurple/protocols/silc/util.c:591
 #: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "流動電話"
 
-#: ../libpurple/protocols/oscar/oscar.c:3759
+#: ../libpurple/protocols/oscar/oscar.c:3769
 msgid "Personal Web Page"
 msgstr "個人網頁"
 
-#: ../libpurple/protocols/oscar/oscar.c:3783
+#: ../libpurple/protocols/oscar/oscar.c:3793
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "其他資訊"
 
-#: ../libpurple/protocols/oscar/oscar.c:3791
-#: ../libpurple/protocols/oscar/oscar.c:3804
+#: ../libpurple/protocols/oscar/oscar.c:3801
+#: ../libpurple/protocols/oscar/oscar.c:3814
 msgid "Zip Code"
 msgstr "郵遞區號"
 
-#: ../libpurple/protocols/oscar/oscar.c:3815
+#: ../libpurple/protocols/oscar/oscar.c:3825
 msgid "Division"
 msgstr "部門"
 
-#: ../libpurple/protocols/oscar/oscar.c:3816
+#: ../libpurple/protocols/oscar/oscar.c:3826
 msgid "Position"
 msgstr "職位"
 
-#: ../libpurple/protocols/oscar/oscar.c:3818
+#: ../libpurple/protocols/oscar/oscar.c:3828
 msgid "Web Page"
 msgstr "網頁"
 
-#: ../libpurple/protocols/oscar/oscar.c:3821
+#: ../libpurple/protocols/oscar/oscar.c:3831
 msgid "Work Information"
 msgstr "工作資訊"
 
-# XXX 這是什麼 (情形下出現的)? (好像是以前譯「訊息」的那個??)
-#: ../libpurple/protocols/oscar/oscar.c:3877
+# XXX 這是什麼 (情形下出現的)? (好像是以前譯「訊息」的那個??)
+#: ../libpurple/protocols/oscar/oscar.c:3887
 msgid "Pop-Up Message"
 msgstr "彈出訊息"
 
 # Patch by Kevin Leung
-#: ../libpurple/protocols/oscar/oscar.c:3917
+#: ../libpurple/protocols/oscar/oscar.c:3927
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "下列是 %s 的帳號"
 msgstr[1] "下列是 %s 的帳號"
 
-#: ../libpurple/protocols/oscar/oscar.c:3922
+#: ../libpurple/protocols/oscar/oscar.c:3932
 msgid "Screen name"
 msgstr "帳號"
 
-#: ../libpurple/protocols/oscar/oscar.c:3948
+#: ../libpurple/protocols/oscar/oscar.c:3958
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "找不到和電子郵件地址 %s 相關的結果"
 
-#: ../libpurple/protocols/oscar/oscar.c:3969
+#: ../libpurple/protocols/oscar/oscar.c:3979
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "你應該會收到一封要求對 %s 進行認證的電子郵件。"
 
-#: ../libpurple/protocols/oscar/oscar.c:3971
+#: ../libpurple/protocols/oscar/oscar.c:3981
 msgid "Account Confirmation Requested"
 msgstr "帳號確認"
 
-#: ../libpurple/protocols/oscar/oscar.c:4002
-#, c-format
+#: ../libpurple/protocols/oscar/oscar.c:4012
 msgid "Error Changing Account Info"
 msgstr "更改帳號資訊錯誤"
 
-#: ../libpurple/protocols/oscar/oscar.c:4005
+#: ../libpurple/protocols/oscar/oscar.c:4015
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 msgstr "錯誤 0x%04x:無法格式化帳號,因為要求的帳號與原本的不同。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4008
+#: ../libpurple/protocols/oscar/oscar.c:4018
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr "錯誤 0x%04x:無法格式化帳號,因為它是無效的。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4011
+#: ../libpurple/protocols/oscar/oscar.c:4021
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 msgstr "錯誤 0x%04x:無法格式化帳號,因為要求的帳號太長。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4014
+#: ../libpurple/protocols/oscar/oscar.c:4024
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr "錯誤 0x%04x:無法改變電子郵件地址,因為這個帳號尚有要求等待處理。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4017
+#: ../libpurple/protocols/oscar/oscar.c:4027
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
-msgstr ""
-"錯誤 0x%04x:無法改變電子郵件地址,因為這個電子郵件地址和太多的帳號產生關連。"
-
-#: ../libpurple/protocols/oscar/oscar.c:4020
+msgstr "錯誤 0x%04x:無法改變電子郵件地址,因為這個電子郵件地址和太多的帳號產生關連。"
+
+#: ../libpurple/protocols/oscar/oscar.c:4030
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr "錯誤 0x%04x:無法改變電子郵件地址,因為這個電子郵件地址是無效的。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4023
+#: ../libpurple/protocols/oscar/oscar.c:4033
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "錯誤 0x%04x:未知錯誤。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4033
+#: ../libpurple/protocols/oscar/oscar.c:4043
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "%s 的電子郵件地址為 %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4035
+#: ../libpurple/protocols/oscar/oscar.c:4045
 msgid "Account Info"
 msgstr "帳號資訊"
 
-#: ../libpurple/protocols/oscar/oscar.c:4218
+#: ../libpurple/protocols/oscar/oscar.c:4228
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "無法傳送即時訊息圖像;要傳送即時訊息圖像,必須與對方直接連線。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4489
+#: ../libpurple/protocols/oscar/oscar.c:4499
 msgid "Unable to set AIM profile."
 msgstr "無法設定 AIM 個人資料。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4490
+#: ../libpurple/protocols/oscar/oscar.c:4500
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
 "fully connected."
-msgstr ""
-"你在未登入完成前要求修改你的個人資料,所以這些資訊並未被修改。請在完成登入後"
-"再重新進行設定。"
-
-#: ../libpurple/protocols/oscar/oscar.c:4504
+msgstr "你在未登入完成前要求修改你的個人資料,所以這些資訊並未被修改。請在完成登入後再重新進行設定。"
+
+#: ../libpurple/protocols/oscar/oscar.c:4514
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -9159,11 +9293,11 @@
 msgstr[0] "個人資料的長度超出了 %d 個位元組的上限,過長部分已被截去。"
 msgstr[1] "個人資料的長度超出了 %d 個位元組的上限,過長部分已被截去。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4509
+#: ../libpurple/protocols/oscar/oscar.c:4519
 msgid "Profile too long."
 msgstr "個人資料過長。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4554
+#: ../libpurple/protocols/oscar/oscar.c:4564
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -9174,93 +9308,84 @@
 msgstr[0] "離開訊息的長度超出了 %d 個位元組的上限,過長部分已被截去。"
 msgstr[1] "離開訊息的長度超出了 %d 個位元組的上限,過長部分已被截去。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4559
+#: ../libpurple/protocols/oscar/oscar.c:4569
 msgid "Away message too long."
 msgstr "離開訊息過長。"
 
-#: ../libpurple/protocols/oscar/oscar.c:4628
-#, fuzzy, c-format
+#: ../libpurple/protocols/oscar/oscar.c:4642
+#, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
 "must be a valid email address, or start with a letter and contain only "
 "letters, numbers and spaces, or contain only numbers."
-msgstr ""
-"因為這個帳號不是一個有效的帳號,所以無法將好友「%s」加入清單中。帳號必須以英"
-"文字母為開頭,同時由「英文字母」、「數字」和「空白」所組成,或者單純以「數"
-"字」組成。"
-
-#: ../libpurple/protocols/oscar/oscar.c:4630
-#: ../libpurple/protocols/oscar/oscar.c:5060
-#: ../libpurple/protocols/oscar/oscar.c:5075
+msgstr "因為這個帳號不是一個有效的帳號,所以無法將好友「%s」加入清單中。帳號必須為有效電郵地址;或者必須以英文字母為開頭,同時由「英文字母」、「數字」和「空白」所組成,或者單純以「數字」組成。"
+
+#: ../libpurple/protocols/oscar/oscar.c:4644
+#: ../libpurple/protocols/oscar/oscar.c:5097
+#: ../libpurple/protocols/oscar/oscar.c:5112
 msgid "Unable To Add"
 msgstr "無法加入"
 
-#: ../libpurple/protocols/oscar/oscar.c:4739
+#: ../libpurple/protocols/oscar/oscar.c:4763
 msgid "Unable To Retrieve Buddy List"
 msgstr "無法讀取好友清單"
 
-#: ../libpurple/protocols/oscar/oscar.c:4740
+#: ../libpurple/protocols/oscar/oscar.c:4764
 msgid ""
 "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."
-msgstr ""
-"AIM 伺服器暫時無法送出你的好友清單。不過這個好友清單並沒有遺失,可能可以在幾"
-"個小時後取得。"
-
-#: ../libpurple/protocols/oscar/oscar.c:4922
-#: ../libpurple/protocols/oscar/oscar.c:4924
-#: ../libpurple/protocols/oscar/oscar.c:5140
-#: ../libpurple/protocols/oscar/oscar.c:5141
-#: ../libpurple/protocols/oscar/oscar.c:5146
+"list is not lost, and will probably become available in a few minutes."
+msgstr "AIM 伺服器暫時無法送出你的好友清單。不過這個好友清單並沒有遺失,可能可以在幾分鐘後取得。"
+
+#: ../libpurple/protocols/oscar/oscar.c:4947
+#: ../libpurple/protocols/oscar/oscar.c:4949
+#: ../libpurple/protocols/oscar/oscar.c:5177
+#: ../libpurple/protocols/oscar/oscar.c:5178
+#: ../libpurple/protocols/oscar/oscar.c:5183
 msgid "Orphans"
 msgstr "孤兒們"
 
-#: ../libpurple/protocols/oscar/oscar.c:5058
+#: ../libpurple/protocols/oscar/oscar.c:5095
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
-msgstr ""
-"因為你的好友法單中有太多的好友,所以沒有辦法加入好友 %s。請在移除部份好友後重"
-"試。"
-
-#: ../libpurple/protocols/oscar/oscar.c:5058
-#: ../libpurple/protocols/oscar/oscar.c:5073
+msgstr "因為你的好友法單中有太多的好友,所以沒有辦法加入好友 %s。請在移除部份好友後重試。"
+
+#: ../libpurple/protocols/oscar/oscar.c:5095
+#: ../libpurple/protocols/oscar/oscar.c:5110
 msgid "(no name)"
 msgstr "(沒有名字)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5072
-#, fuzzy, c-format
+#: ../libpurple/protocols/oscar/oscar.c:5109
+#, c-format
 msgid "Could not add the buddy %s for an unknown reason."
-msgstr "指令執行失敗,原因不明。"
-
-#: ../libpurple/protocols/oscar/oscar.c:5178
+msgstr "無法把 %s 加入好友清單,原因不明。"
+
+#: ../libpurple/protocols/oscar/oscar.c:5226
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
 "want to add them?"
-msgstr ""
-"使用者 %s 已經允許你加入到他(她)的好友清單中。你是不是也要將他(她)加入"
-"呢?"
-
-# NOTE 這是我們允許別人發出的認證要求後顯示給我們自己看的
-#: ../libpurple/protocols/oscar/oscar.c:5186
+msgstr "使用者 %s 已經允許你加入到他(她)的好友清單中。你是不是也要將他(她)加入呢?"
+
+# NOTE 這是我們允許別人發出的認證要求後顯示給我們自己看的
+#: ../libpurple/protocols/oscar/oscar.c:5234
 msgid "Authorization Given"
 msgstr "給予認證"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5259
+#: ../libpurple/protocols/oscar/oscar.c:5307
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "使用者 %s 允許了你將他(她)加入好友清單的要求。"
 
-# NOTE 這是我們發出的認證要求被對方允許時顯示的
-#: ../libpurple/protocols/oscar/oscar.c:5260
+# NOTE 這是我們發出的認證要求被對方允許時顯示的
+#: ../libpurple/protocols/oscar/oscar.c:5308
 msgid "Authorization Granted"
 msgstr "認證獲允"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5263
+#: ../libpurple/protocols/oscar/oscar.c:5311
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -9270,198 +9395,196 @@
 "使用者 %s 因為下列原因,拒絕了你將他(她)加入好友清單的要求:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5264
+#: ../libpurple/protocols/oscar/oscar.c:5312
 msgid "Authorization Denied"
 msgstr "認證被拒"
 
-# NOTE: 這裡的字義係由 #gaim 的 MrHappy 及 deryni 提供的
-# NOTE: KingAnt 提供的字義有些不同,暫時不予理會
-#: ../libpurple/protocols/oscar/oscar.c:5300
+# NOTE: 這裡的字義係由 #gaim 的 MrHappy 及 deryni 提供的
+# NOTE: KingAnt 提供的字義有些不同,暫時不予理會
+#: ../libpurple/protocols/oscar/oscar.c:5348
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "頻道號碼(_E):"
 
-#: ../libpurple/protocols/oscar/oscar.c:5340
+#: ../libpurple/protocols/oscar/oscar.c:5388
 msgid "Invalid chat name specified."
 msgstr "給予了無效的聊天室名稱。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5409
+#: ../libpurple/protocols/oscar/oscar.c:5457
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "無法傳送即時訊息圖像;AIM 聊天並不支援即時訊息圖像的傳送。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5569
-#: ../libpurple/protocols/oscar/oscar.c:5574
+#: ../libpurple/protocols/oscar/oscar.c:5619
+#: ../libpurple/protocols/oscar/oscar.c:5624
 msgid "Away Message"
 msgstr "離開訊息"
 
-# XXX 好像不對,又好像沒問題
-#: ../libpurple/protocols/oscar/oscar.c:5574
+# XXX 好像不對,又好像沒問題
+#: ../libpurple/protocols/oscar/oscar.c:5624
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(搜尋中)</i>"
 
-#  NOTE 蘋果自己的中文網站只寫「iTunes Store」(英文)了事 :P
+#  NOTE 蘋果自己的中文網站只寫「iTunes Store」(英文)了事 :P
 #  NOTE (21:24:59) wing: what is the "iTunes Music Store Link" in the AIM status message?
 #  NOTE (21:29:48) KingAnt: wing: The AIM protocol allows people to advertise the song their currently listening to as part of their status
-#  XXX 所以這應該是有問題的譯文,但暫時想不到怎樣改善 - ambrose 20070415
-#: ../libpurple/protocols/oscar/oscar.c:5774
+#  XXX 所以這應該是有問題的譯文,但暫時想不到怎樣改善 - ambrose 20070415
+#: ../libpurple/protocols/oscar/oscar.c:5824
 msgid "iTunes Music Store Link"
 msgstr "iTunes Store 網站連結"
 
-#: ../libpurple/protocols/oscar/oscar.c:5882
+#: ../libpurple/protocols/oscar/oscar.c:5932
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s 的好友說明"
 
-#: ../libpurple/protocols/oscar/oscar.c:5883
+#: ../libpurple/protocols/oscar/oscar.c:5933
 msgid "Buddy Comment:"
 msgstr "好友說明:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5930
+#: ../libpurple/protocols/oscar/oscar.c:5980
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "你選擇了與 %s 開啟一個直接即時訊息。"
 
-#: ../libpurple/protocols/oscar/oscar.c:5934
+#: ../libpurple/protocols/oscar/oscar.c:5984
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
 msgstr "這樣將會曝露出你的 IP 位址,因此可能會有私隱上的風險。你想要繼續嗎?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5940
-#: ../libpurple/protocols/oscar/peer.c:1045
+#: ../libpurple/protocols/oscar/oscar.c:5990
+#: ../libpurple/protocols/oscar/peer.c:1047
 msgid "C_onnect"
 msgstr "連線(_O)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5975
+#: ../libpurple/protocols/oscar/oscar.c:6025
 msgid "Get AIM Info"
 msgstr "取得 AIM 資訊"
 
-#: ../libpurple/protocols/oscar/oscar.c:5981
+#: ../libpurple/protocols/oscar/oscar.c:6031
 msgid "Edit Buddy Comment"
 msgstr "編輯好友說明"
 
-#: ../libpurple/protocols/oscar/oscar.c:5989
+#: ../libpurple/protocols/oscar/oscar.c:6039
 msgid "Get Status Msg"
 msgstr "取得狀態訊息"
 
-# NOTE 將「直接消息」改譯為「即時訊息」
-#: ../libpurple/protocols/oscar/oscar.c:6002
+# NOTE 將「直接消息」改譯為「即時訊息」
+#: ../libpurple/protocols/oscar/oscar.c:6052
 msgid "Direct IM"
 msgstr "即時訊息"
 
-#: ../libpurple/protocols/oscar/oscar.c:6024
+#: ../libpurple/protocols/oscar/oscar.c:6074
 msgid "Re-request Authorization"
 msgstr "重新要求認證"
 
-# NOTE Require意為「需要」,不是「要求」
-#: ../libpurple/protocols/oscar/oscar.c:6083
+# NOTE Require意為「需要」,不是「要求」
+#: ../libpurple/protocols/oscar/oscar.c:6133
 msgid "Require authorization"
 msgstr "需要認證"
 
-#: ../libpurple/protocols/oscar/oscar.c:6086
+#: ../libpurple/protocols/oscar/oscar.c:6136
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "允許其他使用者在網絡上查看你目前的狀態(會導致你收到垃圾訊息!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6091
+#: ../libpurple/protocols/oscar/oscar.c:6141
 msgid "ICQ Privacy Options"
 msgstr "ICQ 私隱選頊"
 
-#: ../libpurple/protocols/oscar/oscar.c:6110
+#: ../libpurple/protocols/oscar/oscar.c:6160
 msgid "The new formatting is invalid."
 msgstr "新的格式是無效的。"
 
-#: ../libpurple/protocols/oscar/oscar.c:6111
+#: ../libpurple/protocols/oscar/oscar.c:6161
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "帳號格式化只能改變大寫以及空白。"
 
-#: ../libpurple/protocols/oscar/oscar.c:6164
+#: ../libpurple/protocols/oscar/oscar.c:6214
 msgid "Change Address To:"
 msgstr "更改地址為:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6210
+#: ../libpurple/protocols/oscar/oscar.c:6260
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>你並沒有在等待驗證</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6213
+#: ../libpurple/protocols/oscar/oscar.c:6263
 msgid "You are awaiting authorization from the following buddies"
 msgstr "你目前正在等待下列好友的認證"
 
-#: ../libpurple/protocols/oscar/oscar.c:6214
+#: ../libpurple/protocols/oscar/oscar.c:6264
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
-msgstr ""
-"你可以重新要求這些好友的認證,只要在好友清單中以滑鼠右鍵點擊他們,然後選擇"
-"「要求重新認證」。"
-
-#: ../libpurple/protocols/oscar/oscar.c:6231
+msgstr "你可以重新要求這些好友的認證,只要在好友清單中以滑鼠右鍵點擊他們,然後選擇「要求重新認證」。"
+
+#: ../libpurple/protocols/oscar/oscar.c:6281
 msgid "Find Buddy by E-Mail"
 msgstr "以電子郵件地址來找尋好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6232
+#: ../libpurple/protocols/oscar/oscar.c:6282
 msgid "Search for a buddy by e-mail address"
 msgstr "使用電子郵件地址搜尋好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6233
+#: ../libpurple/protocols/oscar/oscar.c:6283
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "請輸入對方的電子郵件地址。"
 
-#: ../libpurple/protocols/oscar/oscar.c:6236
+#: ../libpurple/protocols/oscar/oscar.c:6286
 msgid "_Search"
 msgstr "搜尋(_S)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6394
+#: ../libpurple/protocols/oscar/oscar.c:6444
 msgid "Set User Info (URL)..."
 msgstr "設定使用者資訊 (透過網頁)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6405
+#: ../libpurple/protocols/oscar/oscar.c:6455
 msgid "Change Password (URL)"
 msgstr "修改密碼 (透過網頁)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6409
+#: ../libpurple/protocols/oscar/oscar.c:6459
 msgid "Configure IM Forwarding (URL)"
 msgstr "設定即時訊息的轉送 (透過網頁)"
 
-#  NOTE 譯文更動 by Ambrose
+#  NOTE 譯文更動 by Ambrose
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6419
+#: ../libpurple/protocols/oscar/oscar.c:6469
 msgid "Set Privacy Options..."
 msgstr "設定私隱選項..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6426
+#: ../libpurple/protocols/oscar/oscar.c:6476
 msgid "Confirm Account"
 msgstr "確認帳號"
 
-#: ../libpurple/protocols/oscar/oscar.c:6430
+#: ../libpurple/protocols/oscar/oscar.c:6480
 msgid "Display Currently Registered E-Mail Address"
 msgstr "顯示目前所註冊的電子郵件位址"
 
-#: ../libpurple/protocols/oscar/oscar.c:6434
+#: ../libpurple/protocols/oscar/oscar.c:6484
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "修改目前所註冊的電子郵件位址..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6441
+#: ../libpurple/protocols/oscar/oscar.c:6491
 msgid "Show Buddies Awaiting Authorization"
 msgstr "顯示等待認證的好友"
 
-#: ../libpurple/protocols/oscar/oscar.c:6447
+#: ../libpurple/protocols/oscar/oscar.c:6497
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "使用電子郵件地址搜尋好友..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6452
+#: ../libpurple/protocols/oscar/oscar.c:6502
 msgid "Search for Buddy by Information"
-msgstr "根據資訊尋找好友"
-
-#: ../libpurple/protocols/oscar/oscar.c:6520
+msgstr "根據照資訊尋找好友"
+
+#: ../libpurple/protocols/oscar/oscar.c:6570
 msgid "Use recent buddies group"
 msgstr "使用「Recent Buddies」羣組"
 
-#: ../libpurple/protocols/oscar/oscar.c:6523
+#: ../libpurple/protocols/oscar/oscar.c:6573
 msgid "Show how long you have been idle"
 msgstr "顯示你閒置多久時間"
 
-#: ../libpurple/protocols/oscar/oscar.c:6678
+#: ../libpurple/protocols/oscar/oscar.c:6728
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -9469,34 +9592,31 @@
 "務必使用 ICQ 的代理伺服器來進行檔案傳輸\n"
 "(較慢,但不會暴露你的 IP 位址)"
 
-#: ../libpurple/protocols/oscar/peer.c:697
+#: ../libpurple/protocols/oscar/peer.c:699
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "正在要求 %s 連線至此處 (%s:%hu),以便建立即時訊息。"
 
-#: ../libpurple/protocols/oscar/peer.c:782
+#: ../libpurple/protocols/oscar/peer.c:784
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "正在嘗試連線至 %s;%hu。"
 
-#: ../libpurple/protocols/oscar/peer.c:856
-#, c-format
+#: ../libpurple/protocols/oscar/peer.c:858
 msgid "Attempting to connect via proxy server."
 msgstr "正在嘗試透過 Proxy 伺服器連線。"
 
-#: ../libpurple/protocols/oscar/peer.c:1033
+#: ../libpurple/protocols/oscar/peer.c:1035
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s 剛剛要求直接連線到 %s"
 
-#: ../libpurple/protocols/oscar/peer.c:1037
+#: ../libpurple/protocols/oscar/peer.c:1039
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
 "considered a privacy risk."
-msgstr ""
-"這個要求將會在兩部電腦間建立起直接連線,而這是在傳送即時訊息圖像時所必須的。"
-"這樣將會曝露你的 IP 位址,因此可能會有私隱方面的風險。"
+msgstr "這個要求將會在兩部電腦間建立起直接連線,而這是在傳送即時訊息圖像時所必須的。這樣將會曝露你的 IP 位址,因此可能會有私隱方面的風險。"
 
 #: ../libpurple/protocols/qq/buddy_info.c:39
 msgid "Primary Information"
@@ -9652,28 +9772,28 @@
 msgid "Other"
 msgstr "其他"
 
-#: ../libpurple/protocols/qq/buddy_info.c:481
-#: ../libpurple/protocols/qq/buddy_info.c:482
+#: ../libpurple/protocols/qq/buddy_info.c:522
+#: ../libpurple/protocols/qq/buddy_info.c:523
 msgid "Modify my information"
 msgstr "修改好友資訊"
 
-#: ../libpurple/protocols/qq/buddy_info.c:483
+#: ../libpurple/protocols/qq/buddy_info.c:524
 msgid "Update my information"
 msgstr "更新好友資訊"
 
-#: ../libpurple/protocols/qq/buddy_info.c:507
+#: ../libpurple/protocols/qq/buddy_info.c:548
 msgid "Your information has been updated"
 msgstr "成功修改了你的好友資訊。"
 
-#: ../libpurple/protocols/qq/buddy_info.c:560
+#: ../libpurple/protocols/qq/buddy_info.c:601
 #, c-format
 msgid ""
 "Setting custom faces is not currently supported. Please choose an image from "
 "%s."
 msgstr "自選的表情圖案暫時未獲支援,請自 %s 選取圖案。"
 
-#: ../libpurple/protocols/qq/buddy_info.c:577
-#: ../libpurple/protocols/qq/buddy_info.c:590
+#: ../libpurple/protocols/qq/buddy_info.c:618
+#: ../libpurple/protocols/qq/buddy_info.c:631
 msgid "Invalid QQ Face"
 msgstr "無效的 QQ 表情"
 
@@ -9691,14 +9811,16 @@
 msgid "Reject request"
 msgstr "拒絕"
 
+#  NOTE 這個「你」字沒有打錯,主要是法文及德文的譯者都採用「你」
+#  NOTE(法文「tu」、德文「du」)而不是「您」(「vous」、「Sie」),
+#  NOTE 中文採用「你」應該也是恰當的。
 #. title
 #: ../libpurple/protocols/qq/buddy_opt.c:213
 #: ../libpurple/protocols/qq/group_opt.c:141
 msgid "Sorry, you are not my type..."
-msgstr "對不起,我和你合不來……"
+msgstr "對不起,我和你,合不來的……"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:277
-#, fuzzy
 msgid "Add buddy with auth request failed"
 msgstr "連同認證要求的新增好友失敗"
 
@@ -9709,9 +9831,8 @@
 
 #. TODO: Does the user really need to be notified about this?
 #: ../libpurple/protocols/qq/buddy_opt.c:338
-#, fuzzy
 msgid "You have successfully removed yourself from your friend's buddy list"
-msgstr "你成功從一個好友的好友清單中移除了你自己"
+msgstr "你成功從對方的好友清單中移除了你自己"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:404
 #, c-format
@@ -9740,7 +9861,7 @@
 msgstr "送出"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:418
-#, fuzzy, c-format
+#, c-format
 msgid "You have added %d to buddy list"
 msgstr "成功將 %d 加入好友清單"
 
@@ -9777,17 +9898,16 @@
 msgstr "QQ 羣"
 
 #: ../libpurple/protocols/qq/group.c:120
-#, fuzzy
 msgid "Please enter external group ID"
 msgstr "請輸入外部 Group ID"
 
-# NOTE 參見 hi.qq.com/intro/mo.shtml?d10.htm
+# NOTE 參見 hi.qq.com/intro/mo.shtml?d10.htm
 #: ../libpurple/protocols/qq/group.c:121
 msgid "You can only search for permanent QQ groups\n"
 msgstr "你只可搜尋永久羣組\n"
 
 #: ../libpurple/protocols/qq/group_im.c:126
-#, fuzzy, c-format
+#, c-format
 msgid "User %d requested to join group %d"
 msgstr "使用者 %d 要求加入羣組 %d"
 
@@ -9819,31 +9939,30 @@
 msgstr "允許"
 
 #: ../libpurple/protocols/qq/group_im.c:180
-#, fuzzy, c-format
+#, c-format
 msgid "Your request to join group %d has been rejected by admin %d"
-msgstr "管理人 %d 拒絕了你加入羣組 %d"
+msgstr "管理人 %2$d 拒絕了你加入羣組 %1$d"
 
 #: ../libpurple/protocols/qq/group_im.c:221
-#, fuzzy, c-format
+#, c-format
 msgid "Your request to join group %d has been approved by admin %d"
-msgstr "管理人 %d 允許了你加入羣組 %d"
+msgstr "管理人 %2$d 允許了你加入羣組 %1$d"
 
 #: ../libpurple/protocols/qq/group_im.c:257
-#, fuzzy, c-format
+#, c-format
 msgid "You [%d] have left group \"%d\""
 msgstr "你 [%d] 退出了羣組「%d」"
 
 #: ../libpurple/protocols/qq/group_im.c:291
-#, fuzzy, c-format
+#, c-format
 msgid "You [%d] have been added to group \"%d\""
-msgstr "羣組「%2$d」新增了你 [%1$d]"
+msgstr "你 [%d] 已經被加入羣組 \"%d\""
 
 #: ../libpurple/protocols/qq/group_im.c:292
 msgid "This group has been added to your buddy list"
 msgstr "羣組已新增至好友清單。"
 
 #: ../libpurple/protocols/qq/group_internal.c:41
-#, fuzzy
 msgid "I am not a member"
 msgstr "我不是成員"
 
@@ -9868,7 +9987,6 @@
 msgstr "這羣組不容許外人加入"
 
 #: ../libpurple/protocols/qq/group_join.c:233
-#, fuzzy
 msgid "You have successfully left the group"
 msgstr "你成功離開羣組"
 
@@ -9877,19 +9995,16 @@
 msgstr "QQ 羣組認證"
 
 #: ../libpurple/protocols/qq/group_join.c:258
-#, fuzzy
 msgid "Your authorization request has been accepted by the QQ server"
 msgstr "QQ 伺服器接受了你的認證"
 
 #: ../libpurple/protocols/qq/group_join.c:329
-#, fuzzy
 msgid "You entered a group ID outside the acceptable range"
 msgstr "指定的羣組 ID 在有效範圍之外"
 
 #: ../libpurple/protocols/qq/group_join.c:360
-#, fuzzy
 msgid "Are you sure you want to leave this Qun?"
-msgstr "你確定要刪除 %s?"
+msgstr "你確定要離開羣組?"
 
 #: ../libpurple/protocols/qq/group_join.c:362
 msgid ""
@@ -9909,24 +10024,20 @@
 #. we want to see window
 #: ../libpurple/protocols/qq/group_opt.c:124
 #: ../libpurple/protocols/qq/sys_msg.c:87
-#, fuzzy
 msgid "Do you want to approve the request?"
 msgstr "允許這個要求?"
 
 #: ../libpurple/protocols/qq/group_opt.c:137
-#, fuzzy
 msgid "Enter your reason:"
 msgstr "請輸入原因:"
 
-#  NOTE QQ「member」應是「成員」
+#  NOTE QQ「member」應是「成員」
 #: ../libpurple/protocols/qq/group_opt.c:235
-#, fuzzy
 msgid "You have successfully modified Qun member"
 msgstr "成功更改了羣的一個成員"
 
-# FIXME 暫譯 ambrose 20070415
+# FIXME 暫譯 ambrose 20070415
 #: ../libpurple/protocols/qq/group_opt.c:305
-#, fuzzy
 msgid "You have successfully modified Qun information"
 msgstr "成功更改了羣的資訊"
 
@@ -9946,132 +10057,123 @@
 msgid "System Message"
 msgstr "系統訊息"
 
-# TODO 覆查譯文 - 20061028
 #: ../libpurple/protocols/qq/im.c:576
-#, fuzzy
 msgid "Failed to send IM."
-msgstr "無法取得名稱:%s"
-
-# NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
-#: ../libpurple/protocols/qq/keep_alive.c:87
-#, fuzzy
+msgstr "送出即時訊息失敗。"
+
+#: ../libpurple/protocols/qq/keep_alive.c:88
 msgid "Keep alive error"
-msgstr "讀取錯誤"
+msgstr "Keep Alive 錯誤"
 
 #: ../libpurple/protocols/qq/login_logout.c:408
-#, fuzzy
 msgid "Error requesting login token"
-msgstr "連線開啟錯誤"
-
-#: ../libpurple/protocols/qq/login_logout.c:486
+msgstr "取得登入符記途中發生錯誤"
+
+#: ../libpurple/protocols/qq/login_logout.c:489
 msgid "Unable to login, check debug log"
 msgstr "無法登入,請檢查除錯記錄"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
+#: ../libpurple/protocols/qq/qq.c:140 ../libpurple/protocols/toc/toc.c:173
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:109
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:189
-#: ../libpurple/protocols/yahoo/ycht.c:549
+#: ../libpurple/protocols/yahoo/ycht.c:550
 msgid "Unable to connect."
 msgstr "無法連結。"
 
-# XXX 問題:
-# XXX gtk/gtkft.c - 「Unknown」是一指一個未能計算的數值,譯「未知」較好
-# XXX libgaim/account.c - 「Unknown」指不知道是什麼通訊協定,譯「不明」較好(因為一定「曾經知道」,
-# XXX                      我在「帳號清單」看見「未知」真的看了很久也看不明白)
-# XXX libgaim/protocols/* - 「Unknown」指不明的好友狀態,可能是指「不明」(通訊系統回報的狀態是「不明」)
-# XXX                       或者「未知」(出現了 Pidgin 未見過的狀態代號)
+# XXX 問題:
+# XXX gtk/gtkft.c - 「Unknown」是一指一個未能計算的數值,譯「未知」較好
+# XXX libgaim/account.c - 「Unknown」指不知道是什麼通訊協定,譯「不明」較好(因為一定「曾經知道」,
+# XXX                      我在「帳號清單」看見「未知」真的看了很久也看不明白)
+# XXX libgaim/protocols/* - 「Unknown」指不明的好友狀態,可能是指「不明」(通訊系統回報的狀態是「不明」)
+# XXX                       或者「未知」(出現了 Pidgin 未見過的狀態代號)
 # XXX - Ambrose 20061123
-#: ../libpurple/protocols/qq/qq.c:186
+#: ../libpurple/protocols/qq/qq.c:187
 #, c-format
 msgid "Unknown-%d"
 msgstr "未知(代碼 %d)"
 
-#: ../libpurple/protocols/qq/qq.c:211
-#, fuzzy
+#: ../libpurple/protocols/qq/qq.c:212
 msgid "TCP Address"
-msgstr "IP 位址"
-
-#: ../libpurple/protocols/qq/qq.c:213
-#, fuzzy
+msgstr "TCP 位址"
+
+#: ../libpurple/protocols/qq/qq.c:214
 msgid "UDP Address"
-msgstr "IP 位址"
-
-#  FIXME 這是暫譯,但在有限的資料下(我沒有QQ帳戶)應該是大致正確的譯法 - Ambrose 20070414
-#: ../libpurple/protocols/qq/qq.c:242
+msgstr "UDP 位址"
+
+#  FIXME 這是暫譯,但在有限的資料下(我沒有QQ帳戶)應該是大致正確的譯法 - Ambrose 20070414
+#: ../libpurple/protocols/qq/qq.c:243
 msgid "Level"
 msgstr "成長階段"
 
-#: ../libpurple/protocols/qq/qq.c:373
+#: ../libpurple/protocols/qq/qq.c:374
 msgid "Invalid name"
 msgstr "名稱無效"
 
-#  NOTE 參見 qq.h
-#: ../libpurple/protocols/qq/qq.c:439
+#  NOTE 參見 qq.h
+#: ../libpurple/protocols/qq/qq.c:440
 #, c-format
 msgid "<b>Current Online</b>: %d<br>\n"
 msgstr "<b>目前上線好友</b>: %d 人<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:440
+#: ../libpurple/protocols/qq/qq.c:441
 #, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr "<b>最近更新時間:</b>%s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:444
+#: ../libpurple/protocols/qq/qq.c:445
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>連線模式</b>:%s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:445
+#: ../libpurple/protocols/qq/qq.c:446
 #, c-format
 msgid "<b>Server IP</b>: %s: %d<br>\n"
 msgstr "<b>伺服器位址:</b>%s:%d<br>\n"
 
 # XXX - 20061027
-#: ../libpurple/protocols/qq/qq.c:446
+#: ../libpurple/protocols/qq/qq.c:447
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
 msgstr "<b>自己位址:</b>%s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:451
+#: ../libpurple/protocols/qq/qq.c:452
 #, c-format
 msgid "<b>Login Time</b>: %s<br>\n"
 msgstr "<b>登入時間:</b>%s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:452
+#: ../libpurple/protocols/qq/qq.c:453
 #, c-format
 msgid "<b>Last Login IP</b>: %s<br>\n"
 msgstr "<b>上次登入位址:</b>%s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:453
+#: ../libpurple/protocols/qq/qq.c:454
 #, c-format
 msgid "<b>Last Login Time</b>: %s\n"
 msgstr "<b>上次登入時間:</b>%s\n"
 
 # XXX - 20061027
-#: ../libpurple/protocols/qq/qq.c:457
+#: ../libpurple/protocols/qq/qq.c:458
 msgid "Login Information"
 msgstr "登入資訊"
 
-#: ../libpurple/protocols/qq/qq.c:533
-#, fuzzy
+#: ../libpurple/protocols/qq/qq.c:534
 msgid "Set My Information"
-msgstr "伺服器資訊"
-
-#: ../libpurple/protocols/qq/qq.c:536 ../libpurple/protocols/toc/toc.c:1680
+msgstr "設定我的資訊"
+
+#: ../libpurple/protocols/qq/qq.c:537 ../libpurple/protocols/toc/toc.c:1680
 msgid "Change Password"
 msgstr "修改密碼"
 
-#: ../libpurple/protocols/qq/qq.c:539
+#: ../libpurple/protocols/qq/qq.c:540
 msgid "Show Login Information"
 msgstr "顯示登入資訊"
 
-#: ../libpurple/protocols/qq/qq.c:560
-#, fuzzy
+#: ../libpurple/protocols/qq/qq.c:561
 msgid "Leave this QQ Qun"
 msgstr "離開這個 QQ 羣 (Qun)"
 
-#: ../libpurple/protocols/qq/qq.c:584
+#: ../libpurple/protocols/qq/qq.c:585
 msgid "Block this buddy"
 msgstr "封鎖這個好友"
 
@@ -10085,20 +10187,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/qq/qq.c:725 ../libpurple/protocols/qq/qq.c:727
+#: ../libpurple/protocols/qq/qq.c:726 ../libpurple/protocols/qq/qq.c:728
 msgid "QQ Protocol\tPlugin"
 msgstr "QQ 協定模組"
 
-#: ../libpurple/protocols/qq/qq.c:752
-#, fuzzy
+#: ../libpurple/protocols/qq/qq.c:753
 msgid "Connect using TCP"
-msgstr "連線中"
-
-#: ../libpurple/protocols/qq/recv_core.c:309
+msgstr "使用 TCP 連結"
+
+#: ../libpurple/protocols/qq/recv_core.c:310
 msgid "Socket error"
 msgstr "Socket 錯誤"
 
-#: ../libpurple/protocols/qq/recv_core.c:319
+#: ../libpurple/protocols/qq/recv_core.c:321
 msgid "Unable to read from socket"
 msgstr "無法讀取 Socket"
 
@@ -10117,19 +10218,18 @@
 msgid "%d canceled the transfer of %s"
 msgstr "%d 取消了「%s」的傳送"
 
-#: ../libpurple/protocols/qq/sendqueue.c:123
+#: ../libpurple/protocols/qq/sendqueue.c:124
 msgid "Connection lost"
 msgstr "連線中斷"
 
-#. cancel login progress
-#: ../libpurple/protocols/qq/sendqueue.c:131
+# FIXME 譯文有待改進  - 20070912 acli
+#: ../libpurple/protocols/qq/sendqueue.c:133
 msgid "Login failed, no reply"
 msgstr "登入失敗,沒有回應"
 
 #: ../libpurple/protocols/qq/sys_msg.c:110
-#, fuzzy
 msgid "Do you want to add this buddy?"
-msgstr "你想將這個使用者加入到你的好友名單中嗎?"
+msgstr "你要加入這個使用者到好友清單中嗎?"
 
 #. only need to get value
 #: ../libpurple/protocols/qq/sys_msg.c:166
@@ -10144,9 +10244,9 @@
 msgstr "你要將他(她)加入你的好友清單嗎?"
 
 #: ../libpurple/protocols/qq/sys_msg.c:176
-#, fuzzy, c-format
+#, c-format
 msgid "%s has added you [%s] to his or her buddy list"
-msgstr "%s 將你加入他(她)的好友清單。"
+msgstr "%s 將你 [%s] 加入他(她)的好友清單。"
 
 #: ../libpurple/protocols/qq/sys_msg.c:192
 #, c-format
@@ -10154,15 +10254,15 @@
 msgstr "使用者「%s」拒絕了你的要求"
 
 #: ../libpurple/protocols/qq/sys_msg.c:212
-#, fuzzy, c-format
+#, c-format
 msgid "User %s approved your request"
-msgstr "使用者「%s」允許了你的要求"
+msgstr "使用者 %s 允許了你的要求"
 
 #. TODO: this should go through purple_account_request_authorization()
 #: ../libpurple/protocols/qq/sys_msg.c:238
-#, fuzzy, c-format
+#, c-format
 msgid "%s wants to add you [%s] as a friend"
-msgstr "%s 想要將你(%s)加入他(她)的好友清單"
+msgstr "%s 想要將你 [%s] 加入他(她)的好友清單"
 
 #: ../libpurple/protocols/qq/sys_msg.c:239
 #, c-format
@@ -10174,280 +10274,272 @@
 msgid "%s is not in your buddy list"
 msgstr "%s 不在你的好友清單內"
 
-#: ../libpurple/protocols/sametime/sametime.c:417
+#: ../libpurple/protocols/sametime/sametime.c:419
 msgid "Connection closed (writing)"
 msgstr "連線關閉(寫入)"
 
-#: ../libpurple/protocols/sametime/sametime.c:1290
+#: ../libpurple/protocols/sametime/sametime.c:1292
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>羣組名稱:</b>%s<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:1291
+#: ../libpurple/protocols/sametime/sametime.c:1293
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr "<b>Notes 羣組 ID:</b>%s<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:1293
+#: ../libpurple/protocols/sametime/sametime.c:1295
 #, c-format
 msgid "Info for Group %s"
 msgstr "關於羣組 %s 的資訊"
 
-#: ../libpurple/protocols/sametime/sametime.c:1295
+#: ../libpurple/protocols/sametime/sametime.c:1297
 msgid "Notes Address Book Information"
 msgstr "Notes 通訊錄資訊"
 
-#: ../libpurple/protocols/sametime/sametime.c:1327
+#: ../libpurple/protocols/sametime/sametime.c:1329
 msgid "Invite Group to Conference..."
 msgstr "邀請整個羣組進入會議室..."
 
-#: ../libpurple/protocols/sametime/sametime.c:1337
+#: ../libpurple/protocols/sametime/sametime.c:1339
 msgid "Get Notes Address Book Info"
 msgstr "取得 Notes 通訊錄資訊"
 
-#: ../libpurple/protocols/sametime/sametime.c:1504
+# NOTE 見cnscode.org.tw
+# FIXME 譯文有待改進
+#: ../libpurple/protocols/sametime/sametime.c:1506
 msgid "Sending Handshake"
-msgstr "傳送 Handshake"
-
-#: ../libpurple/protocols/sametime/sametime.c:1509
+msgstr "傳送交握中"
+
+# NOTE 見cnscode.org.tw
+#: ../libpurple/protocols/sametime/sametime.c:1511
 msgid "Waiting for Handshake Acknowledgement"
-msgstr "等待 Handshake 回應"
-
-#: ../libpurple/protocols/sametime/sametime.c:1514
+msgstr "等待交握回應"
+
+# NOTE 見cnscode.org.tw
+#: ../libpurple/protocols/sametime/sametime.c:1516
 msgid "Handshake Acknowledged, Sending Login"
-msgstr "Handshake收到回應,送出登入要求"
-
-#: ../libpurple/protocols/sametime/sametime.c:1519
+msgstr "收到交握回應,送出登入要求中"
+
+#: ../libpurple/protocols/sametime/sametime.c:1521
 msgid "Waiting for Login Acknowledgement"
 msgstr "等待登入要求的回應"
 
-#: ../libpurple/protocols/sametime/sametime.c:1524
+#: ../libpurple/protocols/sametime/sametime.c:1526
 msgid "Login Redirected"
-msgstr "重新導向登入"
-
-#: ../libpurple/protocols/sametime/sametime.c:1530
+msgstr "登入已被重新導向"
+
+#: ../libpurple/protocols/sametime/sametime.c:1532
 msgid "Forcing Login"
-msgstr "強行登入"
-
-#: ../libpurple/protocols/sametime/sametime.c:1534
+msgstr "強行登入中"
+
+#: ../libpurple/protocols/sametime/sametime.c:1536
 msgid "Login Acknowledged"
 msgstr "登入要求收到回應"
 
-#  XXX 暫譯
-#: ../libpurple/protocols/sametime/sametime.c:1539
+#  XXX 暫譯
+#: ../libpurple/protocols/sametime/sametime.c:1541
 msgid "Starting Services"
 msgstr "啟動服務"
 
-#: ../libpurple/protocols/sametime/sametime.c:1645
+#: ../libpurple/protocols/sametime/sametime.c:1678
 #, c-format
 msgid ""
 "A Sametime administrator has issued the following announcement on server %s"
 msgstr "在伺服器「%s」上,有 Sametime 管理人發出了下列通告"
 
-# FIXME 這好像不通順 - 20061025
-#: ../libpurple/protocols/sametime/sametime.c:1650
+# FIXME 這好像不通順 - 20061025
+#: ../libpurple/protocols/sametime/sametime.c:1683
 msgid "Sametime Administrator Announcement"
 msgstr "Sametime 管理人通告"
 
-#: ../libpurple/protocols/sametime/sametime.c:1702
+#: ../libpurple/protocols/sametime/sametime.c:1734
 msgid "Connection reset"
 msgstr "連線重置"
 
-#: ../libpurple/protocols/sametime/sametime.c:1709
+#: ../libpurple/protocols/sametime/sametime.c:1746
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr "讀取 Socket 時發生錯誤;%s"
 
 #. this is a regular connect, error out
-#: ../libpurple/protocols/sametime/sametime.c:1732
-#: ../libpurple/protocols/sametime/sametime.c:3726
+#: ../libpurple/protocols/sametime/sametime.c:1771
+#: ../libpurple/protocols/sametime/sametime.c:3772
 msgid "Unable to connect to host"
 msgstr "無法連線到主機"
 
-#: ../libpurple/protocols/sametime/sametime.c:1770
+#: ../libpurple/protocols/sametime/sametime.c:1812
 #, c-format
 msgid "Announcement from %s"
 msgstr "自 %s 發佈"
 
-#: ../libpurple/protocols/sametime/sametime.c:1944
+#: ../libpurple/protocols/sametime/sametime.c:1986
 msgid "Conference Closed"
 msgstr "會議室關閉"
 
-#: ../libpurple/protocols/sametime/sametime.c:2403
+#: ../libpurple/protocols/sametime/sametime.c:2445
 msgid "Unable to send message: "
 msgstr "無法送出訊息:"
 
-#: ../libpurple/protocols/sametime/sametime.c:2959
+#: ../libpurple/protocols/sametime/sametime.c:3001
 msgid "Place Closed"
 msgstr "Place 已關閉"
 
-#: ../libpurple/protocols/sametime/sametime.c:3229
+#: ../libpurple/protocols/sametime/sametime.c:3271
 msgid "Microphone"
 msgstr "麥克風"
 
-#: ../libpurple/protocols/sametime/sametime.c:3230
+#: ../libpurple/protocols/sametime/sametime.c:3272
 msgid "Speakers"
 msgstr "喇叭"
 
-# XXX 暫譯
-#: ../libpurple/protocols/sametime/sametime.c:3231
+# XXX 暫譯
+#: ../libpurple/protocols/sametime/sametime.c:3273
 msgid "Video Camera"
 msgstr "視像"
 
-#: ../libpurple/protocols/sametime/sametime.c:3269
-#: ../libpurple/protocols/sametime/sametime.c:4145
+#: ../libpurple/protocols/sametime/sametime.c:3311
+#: ../libpurple/protocols/sametime/sametime.c:4191
 msgid "Supports"
 msgstr "支援"
 
-#  XXX 怪
-#: ../libpurple/protocols/sametime/sametime.c:3274
-#: ../libpurple/protocols/sametime/sametime.c:4119
+#  XXX 怪
+#: ../libpurple/protocols/sametime/sametime.c:3316
+#: ../libpurple/protocols/sametime/sametime.c:4165
 msgid "External User"
 msgstr "外部使用者"
 
-#: ../libpurple/protocols/sametime/sametime.c:3380
+#: ../libpurple/protocols/sametime/sametime.c:3422
 msgid "Create conference with user"
 msgstr "與使用者建立會議室"
 
-#: ../libpurple/protocols/sametime/sametime.c:3381
+#: ../libpurple/protocols/sametime/sametime.c:3423
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
 "sent to %s"
 msgstr "請為新的會議室輸入一個主題,同時發出一個邀請訊息給%s"
 
-#: ../libpurple/protocols/sametime/sametime.c:3385
+#: ../libpurple/protocols/sametime/sametime.c:3427
 msgid "New Conference"
 msgstr "新會議室"
 
-#: ../libpurple/protocols/sametime/sametime.c:3387
+#: ../libpurple/protocols/sametime/sametime.c:3429
 msgid "Create"
 msgstr "建立"
 
-#: ../libpurple/protocols/sametime/sametime.c:3452
+#: ../libpurple/protocols/sametime/sametime.c:3494
 msgid "Available Conferences"
 msgstr "現有會議室"
 
-#: ../libpurple/protocols/sametime/sametime.c:3458
+#: ../libpurple/protocols/sametime/sametime.c:3500
 msgid "Create New Conference..."
 msgstr "開啟新會議室..."
 
-# NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
-#: ../libpurple/protocols/sametime/sametime.c:3465
+# NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
+#: ../libpurple/protocols/sametime/sametime.c:3507
 msgid "Invite user to a conference"
 msgstr "邀請使用者進入會議室"
 
-#: ../libpurple/protocols/sametime/sametime.c:3466
+#: ../libpurple/protocols/sametime/sametime.c:3508
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
 "\"Create New Conference\" if you'd like to create a new conference to invite "
 "this user to."
-msgstr ""
-"從下方的清單中選取一個會議室,同時發出邀請給使用者%s。如果你想開啟一個新的會"
-"議室,並且邀請這個使用者加入,你可以選擇「開啟新會議室」選項。"
-
-# NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
-#: ../libpurple/protocols/sametime/sametime.c:3471
+msgstr "從下方的清單中選取一個會議室,同時發出邀請給使用者%s。如果你想開啟一個新的會議室,並且邀請這個使用者加入,你可以選擇「開啟新會議室」選項。"
+
+# NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
+#: ../libpurple/protocols/sametime/sametime.c:3513
 msgid "Invite to Conference"
 msgstr "邀請進入會議室"
 
-#: ../libpurple/protocols/sametime/sametime.c:3562
+#: ../libpurple/protocols/sametime/sametime.c:3604
 msgid "Invite to Conference..."
 msgstr "邀請進入會議室"
 
-#  XXX 要覆查 - 20061029
-#: ../libpurple/protocols/sametime/sametime.c:3567
+#  XXX 要覆查 - 20061029
+#: ../libpurple/protocols/sametime/sametime.c:3609
 msgid "Send TEST Announcement"
 msgstr "送出測試通告"
 
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4354
+#: ../libpurple/protocols/sametime/sametime.c:3628 ../pidgin/gtkconv.c:4437
 msgid "Topic:"
 msgstr "主題:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3614
+#: ../libpurple/protocols/sametime/sametime.c:3656
 msgid "No Sametime Community Server specified"
 msgstr "未指定 Sametime 社羣伺服器"
 
-# NOTE「Meanwhile」指實作「Sametime」協定的一個軟體,不是連接詞
-#: ../libpurple/protocols/sametime/sametime.c:3636
+# NOTE「Meanwhile」指實作「Sametime」協定的一個軟體,不是連接詞
+#: ../libpurple/protocols/sametime/sametime.c:3681
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
 "Please enter one below to continue logging in."
-msgstr ""
-"Meanwhile 帳號「%s」尚未設定主機名稱或 IP 位址,請在下面輸入其一,以便繼續登"
-"入。"
-
-# NOTE「Meanwhile」指實作「Sametime」協定的一個軟體,不是連接詞
-#: ../libpurple/protocols/sametime/sametime.c:3641
+msgstr "Meanwhile 帳號「%s」尚未設定主機名稱或 IP 位址,請在下面輸入其一,以便繼續登入。"
+
+# NOTE「Meanwhile」指實作「Sametime」協定的一個軟體,不是連接詞
+#: ../libpurple/protocols/sametime/sametime.c:3686
 msgid "Meanwhile Connection Setup"
 msgstr "Meanwhile 連線設定"
 
-#: ../libpurple/protocols/sametime/sametime.c:3642
+#: ../libpurple/protocols/sametime/sametime.c:3687
 msgid "No Sametime Community Server Specified"
 msgstr "未指定 Sametime 社羣伺服器"
 
-#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4041
+#: ../libpurple/protocols/sametime/sametime.c:3689
 msgid "Connect"
 msgstr "連線"
 
-#: ../libpurple/protocols/sametime/sametime.c:4135
+#: ../libpurple/protocols/sametime/sametime.c:4181
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "未知(0x%04x)<br>"
 
-#  XXX 要覆查
-#: ../libpurple/protocols/sametime/sametime.c:4137
+#  XXX 要覆查
+#: ../libpurple/protocols/sametime/sametime.c:4183
 msgid "Last Known Client"
 msgstr "上次使用的用戶端程式(如已知)"
 
-#: ../libpurple/protocols/sametime/sametime.c:4301
-#: ../libpurple/protocols/sametime/sametime.c:5506
+#: ../libpurple/protocols/sametime/sametime.c:4347
+#: ../libpurple/protocols/sametime/sametime.c:5552
 msgid "User Name"
 msgstr "使用者名稱"
 
-#: ../libpurple/protocols/sametime/sametime.c:4304
-#: ../libpurple/protocols/sametime/sametime.c:5509
+#: ../libpurple/protocols/sametime/sametime.c:4350
+#: ../libpurple/protocols/sametime/sametime.c:5555
 msgid "Sametime ID"
 msgstr "Sametime ID"
 
-#: ../libpurple/protocols/sametime/sametime.c:4328
+#: ../libpurple/protocols/sametime/sametime.c:4374
 msgid "An ambiguous user ID was entered"
 msgstr "輸入了一個不明確的使用者 ID"
 
-#: ../libpurple/protocols/sametime/sametime.c:4329
+#: ../libpurple/protocols/sametime/sametime.c:4375
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
 "select the correct user from the list below to add them to your buddy list."
-msgstr ""
-"「%s」可能指下列任何一個使用者。請從清單選擇正確的使用者,以便新增至好友清單"
-"內。"
-
-#: ../libpurple/protocols/sametime/sametime.c:4334
+msgstr "「%s」可能指下列任何一個使用者。請從清單選擇正確的使用者,以便新增至好友清單內。"
+
+#: ../libpurple/protocols/sametime/sametime.c:4380
 msgid "Select User"
 msgstr "選擇使用者"
 
-#  TODO 請覆查,譯文有待改進
-#: ../libpurple/protocols/sametime/sametime.c:4418
+#  TODO 請覆查,譯文有待改進
+#: ../libpurple/protocols/sametime/sametime.c:4464
 msgid "Unable to add user: user not found"
 msgstr "無法新增使用者:找不到使用者"
 
-#: ../libpurple/protocols/sametime/sametime.c:4420
+#: ../libpurple/protocols/sametime/sametime.c:4466
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
 "entry has been removed from your buddy list."
-msgstr ""
-"「%s」與你在 Sametime 社羣中的任何使用者帳號不符。它將從你的好友清單中被移"
-"除。"
-
-#: ../libpurple/protocols/sametime/sametime.c:4425
-msgid "Unable to add user"
-msgstr "無法新增使用者"
-
-#: ../libpurple/protocols/sametime/sametime.c:5011
+msgstr "「%s」與你在 Sametime 社羣中的任何使用者帳號不符。它將從你的好友清單中被移除。"
+
+#: ../libpurple/protocols/sametime/sametime.c:5057
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -10456,167 +10548,161 @@
 "讀取檔案 %s 發生錯誤;\n"
 "%s\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5146
+#: ../libpurple/protocols/sametime/sametime.c:5192
 msgid "Remotely Stored Buddy List"
 msgstr "好友清單存放於遠端"
 
-#: ../libpurple/protocols/sametime/sametime.c:5151
+#: ../libpurple/protocols/sametime/sametime.c:5197
 msgid "Buddy List Storage Mode"
 msgstr "好友清單儲存模式"
 
-#: ../libpurple/protocols/sametime/sametime.c:5154
+#: ../libpurple/protocols/sametime/sametime.c:5200
 msgid "Local Buddy List Only"
 msgstr "好友清單只存放於本機"
 
-#: ../libpurple/protocols/sametime/sametime.c:5156
+#: ../libpurple/protocols/sametime/sametime.c:5202
 msgid "Merge List from Server"
 msgstr "合併伺服器上的好友清單至本機"
 
-#: ../libpurple/protocols/sametime/sametime.c:5158
+#: ../libpurple/protocols/sametime/sametime.c:5204
 msgid "Merge and Save List to Server"
 msgstr "合併並存放好友清單至伺服器"
 
-#: ../libpurple/protocols/sametime/sametime.c:5160
+#: ../libpurple/protocols/sametime/sametime.c:5206
 msgid "Synchronize List with Server"
 msgstr "與伺服器同步清單"
 
-#: ../libpurple/protocols/sametime/sametime.c:5215
+#: ../libpurple/protocols/sametime/sametime.c:5261
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "匯入 Sametime 清單給帳號「%s」"
 
-#: ../libpurple/protocols/sametime/sametime.c:5255
+#: ../libpurple/protocols/sametime/sametime.c:5301
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "匯出 Sametime 清單給帳號「%s」"
 
-#: ../libpurple/protocols/sametime/sametime.c:5309
+#: ../libpurple/protocols/sametime/sametime.c:5355
 msgid "Unable to add group: group exists"
 msgstr "無法新增羣組:羣組已存在"
 
-#: ../libpurple/protocols/sametime/sametime.c:5310
+#: ../libpurple/protocols/sametime/sametime.c:5356
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "羣組名稱「%s」已經存在於你的好友清單中。"
 
-#: ../libpurple/protocols/sametime/sametime.c:5313
-#: ../libpurple/protocols/sametime/sametime.c:5443
+#: ../libpurple/protocols/sametime/sametime.c:5359
+#: ../libpurple/protocols/sametime/sametime.c:5489
 msgid "Unable to add group"
 msgstr "無法新增羣組"
 
-#: ../libpurple/protocols/sametime/sametime.c:5372
+#: ../libpurple/protocols/sametime/sametime.c:5418
 msgid "Possible Matches"
 msgstr "可能相符的項目"
 
-#: ../libpurple/protocols/sametime/sametime.c:5388
+#: ../libpurple/protocols/sametime/sametime.c:5434
 msgid "Notes Address Book group results"
 msgstr "Notes 通訊錄結果"
 
-#: ../libpurple/protocols/sametime/sametime.c:5389
+#: ../libpurple/protocols/sametime/sametime.c:5435
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
 "Book groups. Please select the correct group from the list below to add it "
 "to your buddy list."
-msgstr ""
-"「%s」可能參考到下列的 Notes 通訊錄羣組。請自下方選取正確的羣組,以加入你的好"
-"友清單。"
-
-#: ../libpurple/protocols/sametime/sametime.c:5394
+msgstr "「%s」可能參考到下列的 Notes 通訊錄羣組。請自下方選取正確的羣組,以加入你的好友清單。"
+
+#: ../libpurple/protocols/sametime/sametime.c:5440
 msgid "Select Notes Address Book"
 msgstr "選擇 Notes 通訊錄"
 
-#: ../libpurple/protocols/sametime/sametime.c:5437
+#: ../libpurple/protocols/sametime/sametime.c:5483
 msgid "Unable to add group: group not found"
 msgstr "無法新增羣組:找不到羣組"
 
-#: ../libpurple/protocols/sametime/sametime.c:5439
+#: ../libpurple/protocols/sametime/sametime.c:5485
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
 msgstr "在你的 Sametime 社羣中,並沒有任何與「%s」相符的 Notes 通訊錄羣組。"
 
-#: ../libpurple/protocols/sametime/sametime.c:5480
+#: ../libpurple/protocols/sametime/sametime.c:5526
 msgid "Notes Address Book Group"
 msgstr "Notes 通訊錄羣組"
 
-#: ../libpurple/protocols/sametime/sametime.c:5481
+#: ../libpurple/protocols/sametime/sametime.c:5527
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
-msgstr ""
-"輸入 Notes 通訊錄羣組名稱於欄位中,以新增這個羣組及它所屬的成員到你的好友清單"
-"中。"
-
-#: ../libpurple/protocols/sametime/sametime.c:5530
+msgstr "輸入 Notes 通訊錄羣組名稱於欄位中,以新增這個羣組及它所屬的成員到你的好友清單中。"
+
+#: ../libpurple/protocols/sametime/sametime.c:5576
 #, c-format
 msgid "Search results for '%s'"
 msgstr "對「%s」的搜尋結果"
 
-#: ../libpurple/protocols/sametime/sametime.c:5531
+#: ../libpurple/protocols/sametime/sametime.c:5577
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
 "may add these users to your buddy list or send them messages with the action "
 "buttons below."
-msgstr ""
-"「%s」可能指下列任何一個使用者。你可使用下面的按紐,把他(她)們新增至好友清"
-"單內,或向他(她)們發出訊息。"
-
-#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:756
+msgstr "「%s」可能指下列任何一個使用者。你可使用下面的按紐,把他(她)們新增至好友清單內,或向他(她)們發出訊息。"
+
+#: ../libpurple/protocols/sametime/sametime.c:5584 ../pidgin/gtknotify.c:763
 msgid "Search Results"
 msgstr "搜尋結果"
 
-#: ../libpurple/protocols/sametime/sametime.c:5563
+#: ../libpurple/protocols/sametime/sametime.c:5609
 msgid "No matches"
 msgstr "沒有相符合的"
 
-#: ../libpurple/protocols/sametime/sametime.c:5564
+#: ../libpurple/protocols/sametime/sametime.c:5610
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr "「%s」與你在 Sametime 社羣中的任何使用者帳號不符。"
 
-#: ../libpurple/protocols/sametime/sametime.c:5568
+#: ../libpurple/protocols/sametime/sametime.c:5614
 msgid "No Matches"
 msgstr "沒有相符合的"
 
-#: ../libpurple/protocols/sametime/sametime.c:5605
+#: ../libpurple/protocols/sametime/sametime.c:5651
 msgid "Search for a user"
 msgstr "搜尋一個使用者"
 
-#: ../libpurple/protocols/sametime/sametime.c:5606
+#: ../libpurple/protocols/sametime/sametime.c:5652
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
 msgstr "輸入姓名或部份 ID 於下方的欄位,來查詢你 Sametime 社羣中符合的使用者。"
 
-#: ../libpurple/protocols/sametime/sametime.c:5609
+#: ../libpurple/protocols/sametime/sametime.c:5655
 msgid "User Search"
 msgstr "使用者搜尋"
 
-#: ../libpurple/protocols/sametime/sametime.c:5622
+#: ../libpurple/protocols/sametime/sametime.c:5668
 msgid "Import Sametime List..."
 msgstr "匯入 Sametime 清單..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5626
+#: ../libpurple/protocols/sametime/sametime.c:5672
 msgid "Export Sametime List..."
 msgstr "匯出 Sametime 清單..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5630
+#: ../libpurple/protocols/sametime/sametime.c:5676
 msgid "Add Notes Address Book Group..."
 msgstr "新增 Notes 通訊錄羣組"
 
-#: ../libpurple/protocols/sametime/sametime.c:5634
+#: ../libpurple/protocols/sametime/sametime.c:5680
 msgid "User Search..."
 msgstr "使用者搜尋..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5740
+#: ../libpurple/protocols/sametime/sametime.c:5786
 msgid "Force login (ignore server redirects)"
 msgstr "強行登入(忽略伺服器重新導向)"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5750
+#: ../libpurple/protocols/sametime/sametime.c:5796
 msgid "Hide client identity"
 msgstr "隱藏客戶端識別"
 
@@ -10745,8 +10831,8 @@
 #: ../libpurple/protocols/silc/buddy.c:496
 #: ../libpurple/protocols/silc/buddy.c:507
 #: ../libpurple/protocols/silc/buddy.c:540
-#: ../libpurple/protocols/silc/ops.c:1499
-#: ../libpurple/protocols/silc/ops.c:1510
+#: ../libpurple/protocols/silc/ops.c:1503
+#: ../libpurple/protocols/silc/ops.c:1514
 #: ../libpurple/protocols/silc10/buddy.c:513
 #: ../libpurple/protocols/silc10/buddy.c:548
 #: ../libpurple/protocols/silc10/ops.c:1494
@@ -10755,8 +10841,8 @@
 msgstr "取得公開密碼匙"
 
 #: ../libpurple/protocols/silc/buddy.c:541
-#: ../libpurple/protocols/silc/ops.c:1500
-#: ../libpurple/protocols/silc/ops.c:1511
+#: ../libpurple/protocols/silc/ops.c:1504
+#: ../libpurple/protocols/silc/ops.c:1515
 #: ../libpurple/protocols/silc10/buddy.c:549
 #: ../libpurple/protocols/silc10/ops.c:1495
 #: ../libpurple/protocols/silc10/ops.c:1506
@@ -10764,17 +10850,17 @@
 msgstr "無法取得公開密碼匙"
 
 #: ../libpurple/protocols/silc/buddy.c:622
-#: ../libpurple/protocols/silc/buddy.c:1655
+#: ../libpurple/protocols/silc/buddy.c:1658
 #: ../libpurple/protocols/silc10/buddy.c:635
-#: ../libpurple/protocols/silc10/buddy.c:1654
+#: ../libpurple/protocols/silc10/buddy.c:1657
 msgid "Show Public Key"
 msgstr "顯示公開密碼匙"
 
 #: ../libpurple/protocols/silc/buddy.c:623
-#: ../libpurple/protocols/silc/buddy.c:1027
-#: ../libpurple/protocols/silc/chat.c:237
+#: ../libpurple/protocols/silc/buddy.c:1030
+#: ../libpurple/protocols/silc/chat.c:239
 #: ../libpurple/protocols/silc10/buddy.c:636
-#: ../libpurple/protocols/silc10/buddy.c:1033
+#: ../libpurple/protocols/silc10/buddy.c:1036
 #: ../libpurple/protocols/silc10/chat.c:237
 msgid "Could not load public key"
 msgstr "無法載入公開密碼匙"
@@ -10782,9 +10868,9 @@
 #: ../libpurple/protocols/silc/buddy.c:701
 #: ../libpurple/protocols/silc/ops.c:1053
 #: ../libpurple/protocols/silc/ops.c:1168
-#: ../libpurple/protocols/silc/ops.c:1288
-#: ../libpurple/protocols/silc/ops.c:1289
-#: ../libpurple/protocols/silc/ops.c:1307
+#: ../libpurple/protocols/silc/ops.c:1290
+#: ../libpurple/protocols/silc/ops.c:1291
+#: ../libpurple/protocols/silc/ops.c:1309
 #: ../libpurple/protocols/silc10/buddy.c:713
 #: ../libpurple/protocols/silc10/ops.c:1087
 #: ../libpurple/protocols/silc10/ops.c:1159
@@ -10796,7 +10882,7 @@
 
 #: ../libpurple/protocols/silc/buddy.c:702
 #: ../libpurple/protocols/silc/ops.c:1169
-#: ../libpurple/protocols/silc/ops.c:1308
+#: ../libpurple/protocols/silc/ops.c:1310
 #: ../libpurple/protocols/silc10/buddy.c:714
 #: ../libpurple/protocols/silc10/ops.c:1160
 #: ../libpurple/protocols/silc10/ops.c:1314
@@ -10814,264 +10900,258 @@
 msgid ""
 "You cannot receive buddy notifications until you import his/her public key.  "
 "You can use the Get Public Key command to get the public key."
-msgstr ""
-"直至你匯入好友的公開密碼匙,你將無法收到該好友的好友通知。要取得公開密碼匙,"
-"用「取得公開密碼匙」指令即可。"
+msgstr "直至你匯入好友的公開密碼匙,你將無法收到該好友的好友通知。要取得公開密碼匙,用「取得公開密碼匙」指令即可。"
 
 #. Open file selector to select the public key.
-#: ../libpurple/protocols/silc/buddy.c:1059
-#: ../libpurple/protocols/silc10/buddy.c:1067
+#: ../libpurple/protocols/silc/buddy.c:1062
+#: ../libpurple/protocols/silc10/buddy.c:1070
 msgid "Open..."
 msgstr "開啟..."
 
-#: ../libpurple/protocols/silc/buddy.c:1070
-#: ../libpurple/protocols/silc10/buddy.c:1078
+#: ../libpurple/protocols/silc/buddy.c:1073
+#: ../libpurple/protocols/silc10/buddy.c:1081
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "好友 %s 不在網絡上"
 
-#: ../libpurple/protocols/silc/buddy.c:1073
-#: ../libpurple/protocols/silc10/buddy.c:1081
+#: ../libpurple/protocols/silc/buddy.c:1076
+#: ../libpurple/protocols/silc10/buddy.c:1084
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
-msgstr ""
-"要新增好友,必須匯入他(她)的公開密碼匙。要匯入公開密碼匙,請按「匯入」。"
-
-#: ../libpurple/protocols/silc/buddy.c:1077
-#: ../libpurple/protocols/silc10/buddy.c:1085
+msgstr "要新增好友,必須匯入他(她)的公開密碼匙。要匯入公開密碼匙,請按「匯入」。"
+
+#: ../libpurple/protocols/silc/buddy.c:1080
+#: ../libpurple/protocols/silc10/buddy.c:1088
 msgid "_Import..."
 msgstr "匯入(_I)..."
 
-#: ../libpurple/protocols/silc/buddy.c:1183
-#: ../libpurple/protocols/silc10/buddy.c:1181
+#: ../libpurple/protocols/silc/buddy.c:1186
+#: ../libpurple/protocols/silc10/buddy.c:1184
 msgid "Select correct user"
 msgstr "選擇正確的使用者"
 
-#: ../libpurple/protocols/silc/buddy.c:1185
-#: ../libpurple/protocols/silc10/buddy.c:1183
+#: ../libpurple/protocols/silc/buddy.c:1188
+#: ../libpurple/protocols/silc10/buddy.c:1186
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
-msgstr ""
-"超過一個使用者使用同一公開密碼匙。請從清單選擇正確的使用者,以便新增至好友清"
-"單內。"
-
-#: ../libpurple/protocols/silc/buddy.c:1187
-#: ../libpurple/protocols/silc10/buddy.c:1185
+msgstr "超過一個使用者使用同一公開密碼匙。請從清單選擇正確的使用者,以便新增至好友清單內。"
+
+#: ../libpurple/protocols/silc/buddy.c:1190
+#: ../libpurple/protocols/silc10/buddy.c:1188
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
-msgstr ""
-"超過一個使用者使用同一名稱。請從清單選擇正確的使用者,以便新增至好友清單內。"
-
-#: ../libpurple/protocols/silc/buddy.c:1474
-#: ../libpurple/protocols/silc10/buddy.c:1474
+msgstr "超過一個使用者使用同一名稱。請從清單選擇正確的使用者,以便新增至好友清單內。"
+
+#: ../libpurple/protocols/silc/buddy.c:1477
+#: ../libpurple/protocols/silc10/buddy.c:1477
 msgid "Detached"
 msgstr "暫停連線"
 
 #  NOTE (01:24:07) wing: what is a status of "indisposed"?
 #  NOTE (01:25:44) LSchiere: if you take the dictionary definition, its more or less the same as "sick"
 #  NOTE (01:25:51) LSchiere: or "not feeling well"
-#: ../libpurple/protocols/silc/buddy.c:1478
+#: ../libpurple/protocols/silc/buddy.c:1481
 #: ../libpurple/protocols/silc/silc.c:58
-#: ../libpurple/protocols/silc10/buddy.c:1478
+#: ../libpurple/protocols/silc10/buddy.c:1481
 #: ../libpurple/protocols/silc10/silc.c:49
 msgid "Indisposed"
 msgstr "不適"
 
 #  XXX
-#: ../libpurple/protocols/silc/buddy.c:1482
+#: ../libpurple/protocols/silc/buddy.c:1485
 #: ../libpurple/protocols/silc/silc.c:60
-#: ../libpurple/protocols/silc10/buddy.c:1482
+#: ../libpurple/protocols/silc10/buddy.c:1485
 #: ../libpurple/protocols/silc10/silc.c:51
 msgid "Wake Me Up"
 msgstr "叫醒我!"
 
 #  XXX
-#: ../libpurple/protocols/silc/buddy.c:1484
+#: ../libpurple/protocols/silc/buddy.c:1487
 #: ../libpurple/protocols/silc/silc.c:52
-#: ../libpurple/protocols/silc10/buddy.c:1484
+#: ../libpurple/protocols/silc10/buddy.c:1487
 #: ../libpurple/protocols/silc10/silc.c:43
 msgid "Hyper Active"
 msgstr "極度活躍"
 
-#: ../libpurple/protocols/silc/buddy.c:1486
-#: ../libpurple/protocols/silc10/buddy.c:1486
+#: ../libpurple/protocols/silc/buddy.c:1489
+#: ../libpurple/protocols/silc10/buddy.c:1489
 msgid "Robot"
 msgstr "機械人"
 
-#: ../libpurple/protocols/silc/buddy.c:1493
-#: ../libpurple/protocols/silc/silc.c:743
-#: ../libpurple/protocols/silc/util.c:516
-#: ../libpurple/protocols/silc10/buddy.c:1493
+#: ../libpurple/protocols/silc/buddy.c:1496
+#: ../libpurple/protocols/silc/silc.c:886
+#: ../libpurple/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc10/buddy.c:1496
 #: ../libpurple/protocols/silc10/silc.c:654
 #: ../libpurple/protocols/silc10/util.c:512
 msgid "Happy"
 msgstr "開心"
 
-#: ../libpurple/protocols/silc/buddy.c:1495
-#: ../libpurple/protocols/silc/silc.c:745
-#: ../libpurple/protocols/silc/util.c:518
-#: ../libpurple/protocols/silc10/buddy.c:1495
+#: ../libpurple/protocols/silc/buddy.c:1498
+#: ../libpurple/protocols/silc/silc.c:888
+#: ../libpurple/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc10/buddy.c:1498
 #: ../libpurple/protocols/silc10/silc.c:656
 #: ../libpurple/protocols/silc10/util.c:514
 msgid "Sad"
 msgstr "憂愁"
 
-#: ../libpurple/protocols/silc/buddy.c:1497
-#: ../libpurple/protocols/silc/silc.c:747
-#: ../libpurple/protocols/silc/util.c:520
-#: ../libpurple/protocols/silc10/buddy.c:1497
+#: ../libpurple/protocols/silc/buddy.c:1500
+#: ../libpurple/protocols/silc/silc.c:890
+#: ../libpurple/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc10/buddy.c:1500
 #: ../libpurple/protocols/silc10/silc.c:658
 #: ../libpurple/protocols/silc10/util.c:516
 msgid "Angry"
 msgstr "憤怒"
 
-#: ../libpurple/protocols/silc/buddy.c:1499
-#: ../libpurple/protocols/silc/silc.c:749
-#: ../libpurple/protocols/silc/util.c:522
-#: ../libpurple/protocols/silc10/buddy.c:1499
+#: ../libpurple/protocols/silc/buddy.c:1502
+#: ../libpurple/protocols/silc/silc.c:892
+#: ../libpurple/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc10/buddy.c:1502
 #: ../libpurple/protocols/silc10/silc.c:660
 #: ../libpurple/protocols/silc10/util.c:518
 msgid "Jealous"
 msgstr "嫉妒"
 
-#: ../libpurple/protocols/silc/buddy.c:1501
-#: ../libpurple/protocols/silc/silc.c:751
-#: ../libpurple/protocols/silc/util.c:524
-#: ../libpurple/protocols/silc10/buddy.c:1501
+#: ../libpurple/protocols/silc/buddy.c:1504
+#: ../libpurple/protocols/silc/silc.c:894
+#: ../libpurple/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc10/buddy.c:1504
 #: ../libpurple/protocols/silc10/silc.c:662
 #: ../libpurple/protocols/silc10/util.c:520
 msgid "Ashamed"
 msgstr "慚愧"
 
-#: ../libpurple/protocols/silc/buddy.c:1503
-#: ../libpurple/protocols/silc/silc.c:753
-#: ../libpurple/protocols/silc/util.c:526
-#: ../libpurple/protocols/silc10/buddy.c:1503
+#: ../libpurple/protocols/silc/buddy.c:1506
+#: ../libpurple/protocols/silc/silc.c:896
+#: ../libpurple/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc10/buddy.c:1506
 #: ../libpurple/protocols/silc10/silc.c:664
 #: ../libpurple/protocols/silc10/util.c:522
 msgid "Invincible"
 msgstr "無敵"
 
-#: ../libpurple/protocols/silc/buddy.c:1505
-#: ../libpurple/protocols/silc/util.c:528
-#: ../libpurple/protocols/silc10/buddy.c:1505
+#: ../libpurple/protocols/silc/buddy.c:1508
+#: ../libpurple/protocols/silc/util.c:534
+#: ../libpurple/protocols/silc10/buddy.c:1508
 #: ../libpurple/protocols/silc10/util.c:524
 msgid "In Love"
 msgstr "戀愛中"
 
-#: ../libpurple/protocols/silc/buddy.c:1507
-#: ../libpurple/protocols/silc/silc.c:757
-#: ../libpurple/protocols/silc/util.c:530
-#: ../libpurple/protocols/silc10/buddy.c:1507
+#: ../libpurple/protocols/silc/buddy.c:1510
+#: ../libpurple/protocols/silc/silc.c:900
+#: ../libpurple/protocols/silc/util.c:536
+#: ../libpurple/protocols/silc10/buddy.c:1510
 #: ../libpurple/protocols/silc10/silc.c:668
 #: ../libpurple/protocols/silc10/util.c:526
 msgid "Sleepy"
 msgstr "想睡"
 
-#: ../libpurple/protocols/silc/buddy.c:1509
-#: ../libpurple/protocols/silc/silc.c:759
-#: ../libpurple/protocols/silc/util.c:532
-#: ../libpurple/protocols/silc10/buddy.c:1509
+#: ../libpurple/protocols/silc/buddy.c:1512
+#: ../libpurple/protocols/silc/silc.c:902
+#: ../libpurple/protocols/silc/util.c:538
+#: ../libpurple/protocols/silc10/buddy.c:1512
 #: ../libpurple/protocols/silc10/silc.c:670
 #: ../libpurple/protocols/silc10/util.c:528
 msgid "Bored"
 msgstr "發悶"
 
-#: ../libpurple/protocols/silc/buddy.c:1511
-#: ../libpurple/protocols/silc/silc.c:761
-#: ../libpurple/protocols/silc/util.c:534
-#: ../libpurple/protocols/silc10/buddy.c:1511
+#: ../libpurple/protocols/silc/buddy.c:1514
+#: ../libpurple/protocols/silc/silc.c:904
+#: ../libpurple/protocols/silc/util.c:540
+#: ../libpurple/protocols/silc10/buddy.c:1514
 #: ../libpurple/protocols/silc10/silc.c:672
 #: ../libpurple/protocols/silc10/util.c:530
 msgid "Excited"
 msgstr "興奮"
 
-#: ../libpurple/protocols/silc/buddy.c:1513
-#: ../libpurple/protocols/silc/silc.c:763
-#: ../libpurple/protocols/silc/util.c:536
-#: ../libpurple/protocols/silc10/buddy.c:1513
+#: ../libpurple/protocols/silc/buddy.c:1516
+#: ../libpurple/protocols/silc/silc.c:906
+#: ../libpurple/protocols/silc/util.c:542
+#: ../libpurple/protocols/silc10/buddy.c:1516
 #: ../libpurple/protocols/silc10/silc.c:674
 #: ../libpurple/protocols/silc10/util.c:532
 msgid "Anxious"
 msgstr "憂慮"
 
-#: ../libpurple/protocols/silc/buddy.c:1545
+#: ../libpurple/protocols/silc/buddy.c:1548
 #: ../libpurple/protocols/silc/ops.c:1207
-#: ../libpurple/protocols/silc10/buddy.c:1545
+#: ../libpurple/protocols/silc10/buddy.c:1548
 #: ../libpurple/protocols/silc10/ops.c:1202
 msgid "User Modes"
 msgstr "使用者模式"
 
-#: ../libpurple/protocols/silc/buddy.c:1562
+#: ../libpurple/protocols/silc/buddy.c:1565
 #: ../libpurple/protocols/silc/ops.c:1224
-#: ../libpurple/protocols/silc10/buddy.c:1562
+#: ../libpurple/protocols/silc10/buddy.c:1565
 #: ../libpurple/protocols/silc10/ops.c:1219
 msgid "Preferred Contact"
 msgstr "聯絡方法"
 
-#: ../libpurple/protocols/silc/buddy.c:1567
+#: ../libpurple/protocols/silc/buddy.c:1570
 #: ../libpurple/protocols/silc/ops.c:1229
-#: ../libpurple/protocols/silc10/buddy.c:1567
+#: ../libpurple/protocols/silc10/buddy.c:1570
 #: ../libpurple/protocols/silc10/ops.c:1224
 msgid "Preferred Language"
 msgstr "選用語文"
 
-#: ../libpurple/protocols/silc/buddy.c:1572
+#: ../libpurple/protocols/silc/buddy.c:1575
 #: ../libpurple/protocols/silc/ops.c:1234
-#: ../libpurple/protocols/silc10/buddy.c:1572
+#: ../libpurple/protocols/silc10/buddy.c:1575
 #: ../libpurple/protocols/silc10/ops.c:1229
 msgid "Device"
 msgstr "所用裝置"
 
-#: ../libpurple/protocols/silc/buddy.c:1577
+#: ../libpurple/protocols/silc/buddy.c:1580
 #: ../libpurple/protocols/silc/ops.c:1239
-#: ../libpurple/protocols/silc10/buddy.c:1577
+#: ../libpurple/protocols/silc10/buddy.c:1580
 #: ../libpurple/protocols/silc10/ops.c:1234
 #: ../libpurple/protocols/silc10/silc.c:722
 #: ../libpurple/protocols/silc10/silc.c:724
 msgid "Timezone"
 msgstr "時區"
 
-#: ../libpurple/protocols/silc/buddy.c:1582
+#: ../libpurple/protocols/silc/buddy.c:1585
 #: ../libpurple/protocols/silc/ops.c:1244
-#: ../libpurple/protocols/silc10/buddy.c:1582
+#: ../libpurple/protocols/silc10/buddy.c:1585
 #: ../libpurple/protocols/silc10/ops.c:1239
 msgid "Geolocation"
 msgstr "所在位置"
 
-#: ../libpurple/protocols/silc/buddy.c:1638
-#: ../libpurple/protocols/silc10/buddy.c:1636
+#: ../libpurple/protocols/silc/buddy.c:1641
+#: ../libpurple/protocols/silc10/buddy.c:1639
 msgid "Reset IM Key"
 msgstr "清除即時訊息密碼匙"
 
-#: ../libpurple/protocols/silc/buddy.c:1643
-#: ../libpurple/protocols/silc10/buddy.c:1642
+#: ../libpurple/protocols/silc/buddy.c:1646
+#: ../libpurple/protocols/silc10/buddy.c:1645
 msgid "IM with Key Exchange"
 msgstr "要交換密碼匙之即時訊息"
 
-#: ../libpurple/protocols/silc/buddy.c:1648
-#: ../libpurple/protocols/silc10/buddy.c:1647
+#: ../libpurple/protocols/silc/buddy.c:1651
+#: ../libpurple/protocols/silc10/buddy.c:1650
 msgid "IM with Password"
 msgstr "有密碼之即時訊息"
 
-#: ../libpurple/protocols/silc/buddy.c:1661
-#: ../libpurple/protocols/silc10/buddy.c:1660
+#: ../libpurple/protocols/silc/buddy.c:1664
+#: ../libpurple/protocols/silc10/buddy.c:1663
 msgid "Get Public Key..."
 msgstr "取得公開密碼匙..."
 
-#: ../libpurple/protocols/silc/buddy.c:1668
-#: ../libpurple/protocols/silc/ops.c:1608
-#: ../libpurple/protocols/silc10/buddy.c:1667
+#: ../libpurple/protocols/silc/buddy.c:1671
+#: ../libpurple/protocols/silc/ops.c:1612
+#: ../libpurple/protocols/silc10/buddy.c:1670
 #: ../libpurple/protocols/silc10/ops.c:1624
 msgid "Kill User"
 msgstr "從網絡上移除使用者"
 
-#: ../libpurple/protocols/silc/buddy.c:1678
-#: ../libpurple/protocols/silc/chat.c:993
-#: ../libpurple/protocols/silc10/buddy.c:1677
+#: ../libpurple/protocols/silc/buddy.c:1681
+#: ../libpurple/protocols/silc/chat.c:997
+#: ../libpurple/protocols/silc10/buddy.c:1680
 #: ../libpurple/protocols/silc10/chat.c:977
 msgid "Draw On Whiteboard"
 msgstr "在白板上繪圖"
@@ -11088,7 +11168,7 @@
 msgstr "頻道 %s 不在網絡上"
 
 #: ../libpurple/protocols/silc/chat.c:81
-#: ../libpurple/protocols/silc/chat.c:175
+#: ../libpurple/protocols/silc/chat.c:177
 #: ../libpurple/protocols/silc10/chat.c:81
 #: ../libpurple/protocols/silc10/chat.c:174
 msgid "Channel Information"
@@ -11138,63 +11218,58 @@
 
 #: ../libpurple/protocols/silc/chat.c:153
 #: ../libpurple/protocols/silc10/chat.c:152
-#, c-format
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>頻道模式:</b>"
 
-#: ../libpurple/protocols/silc/chat.c:166
+#: ../libpurple/protocols/silc/chat.c:167
 #: ../libpurple/protocols/silc10/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>創立者之公開密碼匙指紋:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:167
+#: ../libpurple/protocols/silc/chat.c:168
 #: ../libpurple/protocols/silc10/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>創立者之公開密碼匙指紋可讀版本 (Babbleprint):</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:236
+#: ../libpurple/protocols/silc/chat.c:238
 #: ../libpurple/protocols/silc10/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "新增頻道公開密碼匙"
 
 #. Add new public key
-#: ../libpurple/protocols/silc/chat.c:304
+#: ../libpurple/protocols/silc/chat.c:306
 #: ../libpurple/protocols/silc10/chat.c:291
 msgid "Open Public Key..."
 msgstr "開啟公開密碼匙..."
 
-#: ../libpurple/protocols/silc/chat.c:423
+#: ../libpurple/protocols/silc/chat.c:425
 #: ../libpurple/protocols/silc10/chat.c:401
 msgid "Channel Passphrase"
 msgstr "頻道密碼"
 
-#: ../libpurple/protocols/silc/chat.c:430
+#: ../libpurple/protocols/silc/chat.c:432
 #: ../libpurple/protocols/silc10/chat.c:408
 msgid "Channel Public Keys List"
 msgstr "頻道公開密碼匙清單"
 
-#: ../libpurple/protocols/silc/chat.c:435
+#: ../libpurple/protocols/silc/chat.c:437
 #: ../libpurple/protocols/silc10/chat.c:413
-#, c-format
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
 "signatures. If passphrase is set, it is required to be able to join. If "
 "channel public keys are set then only users whose public keys are listed are "
 "able to join."
-msgstr ""
-"頻道認證是用來防止頻道未經授權而被存取,認證的方法可以是透過密碼或者透過數碼"
-"簽署。如果設定了密碼,加入頻道就必須事先輸入密碼;如果設定了頻道公開密碼匙,"
-"加入頻道就必須擁有所列公開密碼匙內之其一。"
-
-#  XXX 暫譯
-#: ../libpurple/protocols/silc/chat.c:444
-#: ../libpurple/protocols/silc/chat.c:445
-#: ../libpurple/protocols/silc/chat.c:479
-#: ../libpurple/protocols/silc/chat.c:480
-#: ../libpurple/protocols/silc/chat.c:927
+msgstr "頻道認證是用來防止頻道未經授權而被存取,認證的方法可以是透過密碼或者透過數碼簽署。如果設定了密碼,加入頻道就必須事先輸入密碼;如果設定了頻道公開密碼匙,加入頻道就必須擁有所列公開密碼匙內之其一。"
+
+#  XXX 暫譯
+#: ../libpurple/protocols/silc/chat.c:446
+#: ../libpurple/protocols/silc/chat.c:447
+#: ../libpurple/protocols/silc/chat.c:483
+#: ../libpurple/protocols/silc/chat.c:484
+#: ../libpurple/protocols/silc/chat.c:931
 #: ../libpurple/protocols/silc10/chat.c:422
 #: ../libpurple/protocols/silc10/chat.c:423
 #: ../libpurple/protocols/silc10/chat.c:461
@@ -11203,151 +11278,151 @@
 msgid "Channel Authentication"
 msgstr "頻道認證"
 
-#: ../libpurple/protocols/silc/chat.c:446
-#: ../libpurple/protocols/silc/chat.c:481
+#: ../libpurple/protocols/silc/chat.c:448
+#: ../libpurple/protocols/silc/chat.c:485
 #: ../libpurple/protocols/silc10/chat.c:424
 #: ../libpurple/protocols/silc10/chat.c:463
 msgid "Add / Remove"
 msgstr "新增/移除"
 
 # XXX may be wrong
-#: ../libpurple/protocols/silc/chat.c:597
+#: ../libpurple/protocols/silc/chat.c:601
 #: ../libpurple/protocols/silc10/chat.c:581
 msgid "Group Name"
 msgstr "聊天室名稱"
 
-#: ../libpurple/protocols/silc/chat.c:601
-#: ../libpurple/protocols/silc/ops.c:1813
-#: ../libpurple/protocols/silc/silc.c:1020
+#: ../libpurple/protocols/silc/chat.c:605
+#: ../libpurple/protocols/silc/ops.c:1817
+#: ../libpurple/protocols/silc/silc.c:1163
 #: ../libpurple/protocols/silc10/chat.c:585
 #: ../libpurple/protocols/silc10/ops.c:1901
 #: ../libpurple/protocols/silc10/silc.c:931
 msgid "Passphrase"
 msgstr "密碼"
 
-#: ../libpurple/protocols/silc/chat.c:612
+#: ../libpurple/protocols/silc/chat.c:616
 #: ../libpurple/protocols/silc10/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "請你給頻道 %s 內的小圈子輸入名稱及密碼。"
 
-#: ../libpurple/protocols/silc/chat.c:614
+#: ../libpurple/protocols/silc/chat.c:618
 #: ../libpurple/protocols/silc10/chat.c:598
 msgid "Add Channel Private Group"
 msgstr "新增頻道小圈子"
 
 # XXX may be wrong
-#: ../libpurple/protocols/silc/chat.c:742
+#: ../libpurple/protocols/silc/chat.c:746
 #: ../libpurple/protocols/silc10/chat.c:726
 msgid "User Limit"
 msgstr "使用者數目上限"
 
-#: ../libpurple/protocols/silc/chat.c:743
+#: ../libpurple/protocols/silc/chat.c:747
 #: ../libpurple/protocols/silc10/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr "設定使用者數目上限;要清除使用者數目上限,輸入零即可。"
 
-#: ../libpurple/protocols/silc/chat.c:907
+#: ../libpurple/protocols/silc/chat.c:911
 #: ../libpurple/protocols/silc10/chat.c:891
 msgid "Invite List"
 msgstr "邀請清單"
 
-#  XXX 暫譯
-#: ../libpurple/protocols/silc/chat.c:912
+#  XXX 暫譯
+#: ../libpurple/protocols/silc/chat.c:916
 #: ../libpurple/protocols/silc10/chat.c:896
 msgid "Ban List"
 msgstr "禁止清單"
 
-#: ../libpurple/protocols/silc/chat.c:920
+#: ../libpurple/protocols/silc/chat.c:924
 #: ../libpurple/protocols/silc10/chat.c:904
 msgid "Add Private Group"
 msgstr "新增小圈子"
 
-#: ../libpurple/protocols/silc/chat.c:933
+#: ../libpurple/protocols/silc/chat.c:937
 #: ../libpurple/protocols/silc10/chat.c:917
 msgid "Reset Permanent"
 msgstr "清除永久性頻道模式"
 
-#: ../libpurple/protocols/silc/chat.c:938
+#: ../libpurple/protocols/silc/chat.c:942
 #: ../libpurple/protocols/silc10/chat.c:922
 msgid "Set Permanent"
 msgstr "設定永久性頻道模式"
 
 #  XXX may be wrong
-#: ../libpurple/protocols/silc/chat.c:946
+#: ../libpurple/protocols/silc/chat.c:950
 #: ../libpurple/protocols/silc10/chat.c:930
 msgid "Set User Limit"
 msgstr "設定使用者數目上限"
 
-#: ../libpurple/protocols/silc/chat.c:952
+#: ../libpurple/protocols/silc/chat.c:956
 #: ../libpurple/protocols/silc10/chat.c:936
 msgid "Reset Topic Restriction"
 msgstr "清除主題限制"
 
-#: ../libpurple/protocols/silc/chat.c:957
+#: ../libpurple/protocols/silc/chat.c:961
 #: ../libpurple/protocols/silc10/chat.c:941
 msgid "Set Topic Restriction"
 msgstr "設定主題限制"
 
-#: ../libpurple/protocols/silc/chat.c:964
+#: ../libpurple/protocols/silc/chat.c:968
 #: ../libpurple/protocols/silc10/chat.c:948
 msgid "Reset Private Channel"
 msgstr "清除私用頻道模式"
 
-#: ../libpurple/protocols/silc/chat.c:969
+#: ../libpurple/protocols/silc/chat.c:973
 #: ../libpurple/protocols/silc10/chat.c:953
 msgid "Set Private Channel"
 msgstr "設定私用頻道模式"
 
-#: ../libpurple/protocols/silc/chat.c:976
+#: ../libpurple/protocols/silc/chat.c:980
 #: ../libpurple/protocols/silc10/chat.c:960
 msgid "Reset Secret Channel"
 msgstr "清除秘密頻道模式"
 
-#: ../libpurple/protocols/silc/chat.c:981
+#: ../libpurple/protocols/silc/chat.c:985
 #: ../libpurple/protocols/silc10/chat.c:965
 msgid "Set Secret Channel"
 msgstr "設定秘密頻道模式"
 
-#: ../libpurple/protocols/silc/chat.c:1045
+#: ../libpurple/protocols/silc/chat.c:1046
 #: ../libpurple/protocols/silc10/chat.c:1102
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr "加入小圈子前,你必須首先加入頻道 %s"
 
-#: ../libpurple/protocols/silc/chat.c:1047
+#: ../libpurple/protocols/silc/chat.c:1048
 #: ../libpurple/protocols/silc10/chat.c:1104
 msgid "Join Private Group"
 msgstr "加入小圈子"
 
-#: ../libpurple/protocols/silc/chat.c:1048
+#: ../libpurple/protocols/silc/chat.c:1049
 #: ../libpurple/protocols/silc10/chat.c:1105
 msgid "Cannot join private group"
 msgstr "無法加入小圈子"
 
-#: ../libpurple/protocols/silc/chat.c:1260
-#: ../libpurple/protocols/silc/silc.c:1217
+#: ../libpurple/protocols/silc/chat.c:1245
+#: ../libpurple/protocols/silc/silc.c:1360
 #: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1137
+#: ../libpurple/protocols/silc10/silc.c:1140
 msgid "Call Command"
 msgstr "呼叫指令"
 
-#: ../libpurple/protocols/silc/chat.c:1260
-#: ../libpurple/protocols/silc/silc.c:1218
+#: ../libpurple/protocols/silc/chat.c:1245
+#: ../libpurple/protocols/silc/silc.c:1361
 #: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1137
+#: ../libpurple/protocols/silc10/silc.c:1140
 msgid "Cannot call command"
 msgstr "無法執行指令"
 
-#: ../libpurple/protocols/silc/chat.c:1261
-#: ../libpurple/protocols/silc/silc.c:1219
+#: ../libpurple/protocols/silc/chat.c:1246
+#: ../libpurple/protocols/silc/silc.c:1362
 #: ../libpurple/protocols/silc10/chat.c:1300
-#: ../libpurple/protocols/silc10/silc.c:1138
+#: ../libpurple/protocols/silc10/silc.c:1141
 msgid "Unknown command"
 msgstr "未知的指令"
 
-#  NOTE 這些都是視窗標題
+#  NOTE 這些都是視窗標題
 #: ../libpurple/protocols/silc/ft.c:85 ../libpurple/protocols/silc/ft.c:101
 #: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:108
 #: ../libpurple/protocols/silc/ft.c:112 ../libpurple/protocols/silc/ft.c:116
@@ -11377,9 +11452,8 @@
 msgstr "檔案傳輸時發生錯誤"
 
 #: ../libpurple/protocols/silc/ft.c:87
-#, fuzzy
 msgid "Remote disconnected"
-msgstr "%s 結束連線"
+msgstr "遠端結束連線"
 
 #: ../libpurple/protocols/silc/ft.c:106 ../libpurple/protocols/silc10/ft.c:94
 msgid "Permission denied"
@@ -11390,12 +11464,10 @@
 msgstr "交換密碼匙失敗"
 
 #: ../libpurple/protocols/silc/ft.c:114
-#, fuzzy
 msgid "Connection timed out"
 msgstr "連線已逾時"
 
 #: ../libpurple/protocols/silc/ft.c:118
-#, fuzzy
 msgid "Creating connection failed"
 msgstr "連線失敗"
 
@@ -11423,11 +11495,9 @@
 msgid "Cannot send file"
 msgstr "無法傳送檔案"
 
-# TODO 要覆查 - 20061025
 #: ../libpurple/protocols/silc/ops.c:57
-#, fuzzy
 msgid "Error occurred"
-msgstr "錯誤訊息"
+msgstr "出現了錯誤"
 
 #: ../libpurple/protocols/silc/ops.c:533 ../libpurple/protocols/silc/ops.c:542
 #: ../libpurple/protocols/silc/ops.c:551
@@ -11486,7 +11556,7 @@
 msgid "Killed by %s (%s)"
 msgstr "被 %s 從網絡上移除 (%s)"
 
-#  XXX 要核實
+#  XXX 要核實
 #: ../libpurple/protocols/silc/ops.c:796
 #: ../libpurple/protocols/silc10/ops.c:829
 msgid "Server signoff"
@@ -11508,7 +11578,7 @@
 msgstr "職責"
 
 #: ../libpurple/protocols/silc/ops.c:1018
-#: ../libpurple/protocols/silc/silc.c:1013
+#: ../libpurple/protocols/silc/silc.c:1156
 #: ../libpurple/protocols/silc10/ops.c:1052
 #: ../libpurple/protocols/silc10/silc.c:924
 msgid "Organization"
@@ -11529,7 +11599,7 @@
 msgid "Join Chat"
 msgstr "加入聊天室"
 
-#  XXX 暫譯
+#  XXX 暫譯
 #: ../libpurple/protocols/silc/ops.c:1127
 #: ../libpurple/protocols/silc10/chat.c:1039
 #, c-format
@@ -11543,7 +11613,7 @@
 msgstr "<I>%s</I> 的頻道創立者為 <I>%s</I>"
 
 #: ../libpurple/protocols/silc/ops.c:1190
-#: ../libpurple/protocols/silc/ops.c:1326
+#: ../libpurple/protocols/silc/ops.c:1328
 #: ../libpurple/protocols/silc10/ops.c:1183
 #: ../libpurple/protocols/silc10/ops.c:1332
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1071
@@ -11555,91 +11625,91 @@
 msgid "Status Text"
 msgstr "狀態訊息"
 
-#: ../libpurple/protocols/silc/ops.c:1279
-#: ../libpurple/protocols/silc/ops.c:1351
+#: ../libpurple/protocols/silc/ops.c:1280
+#: ../libpurple/protocols/silc/ops.c:1354
 #: ../libpurple/protocols/silc10/ops.c:1285
 #: ../libpurple/protocols/silc10/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr "公開密碼匙指紋"
 
-#: ../libpurple/protocols/silc/ops.c:1280
-#: ../libpurple/protocols/silc/ops.c:1352
+#: ../libpurple/protocols/silc/ops.c:1281
+#: ../libpurple/protocols/silc/ops.c:1355
 #: ../libpurple/protocols/silc10/ops.c:1286
 #: ../libpurple/protocols/silc10/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr "公開密碼匙指紋可讀版本 (Babbleprint)"
 
-#: ../libpurple/protocols/silc/ops.c:1292
+#: ../libpurple/protocols/silc/ops.c:1294
 #: ../libpurple/protocols/silc10/ops.c:1298
 msgid "_More..."
 msgstr "更多(_M)..."
 
-#: ../libpurple/protocols/silc/ops.c:1369
-#: ../libpurple/protocols/silc/silc.c:1077
+#: ../libpurple/protocols/silc/ops.c:1373
+#: ../libpurple/protocols/silc/silc.c:1220
 #: ../libpurple/protocols/silc10/ops.c:1371
-#: ../libpurple/protocols/silc10/silc.c:988
+#: ../libpurple/protocols/silc10/silc.c:991
 msgid "Detach From Server"
 msgstr "與伺服器暫停連線"
 
-#: ../libpurple/protocols/silc/ops.c:1369
+#: ../libpurple/protocols/silc/ops.c:1373
 #: ../libpurple/protocols/silc10/ops.c:1371
 msgid "Cannot detach"
 msgstr "無法暫停連線"
 
-#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/silc/ops.c:1393
 #: ../libpurple/protocols/silc10/ops.c:1382
 msgid "Cannot set topic"
 msgstr "無法設定主題"
 
-#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/silc/ops.c:1422
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Failed to change nickname"
 msgstr "無法更改網名"
 
-#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc/ops.c:1471
 #: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Roomlist"
 msgstr "聊天室清單"
 
-#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc/ops.c:1471
 #: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Cannot get room list"
 msgstr "無法取得聊天室清單"
 
-#: ../libpurple/protocols/silc/ops.c:1468
-#, fuzzy
+#  FIXME 看了原始碼也不知所云,所以大概會是譯錯 - acli 20070614
+#: ../libpurple/protocols/silc/ops.c:1472
 msgid "Network is empty"
-msgstr "網絡統計資料"
-
-#: ../libpurple/protocols/silc/ops.c:1512
+msgstr "這個網絡是空白的"
+
+#: ../libpurple/protocols/silc/ops.c:1516
 #: ../libpurple/protocols/silc10/ops.c:1507
 msgid "No public key was received"
 msgstr "沒有收到公開密碼匙"
 
-#: ../libpurple/protocols/silc/ops.c:1524
-#: ../libpurple/protocols/silc/ops.c:1537
+#: ../libpurple/protocols/silc/ops.c:1528
+#: ../libpurple/protocols/silc/ops.c:1541
 #: ../libpurple/protocols/silc10/ops.c:1519
 #: ../libpurple/protocols/silc10/ops.c:1532
 msgid "Server Information"
 msgstr "伺服器資訊"
 
-#: ../libpurple/protocols/silc/ops.c:1525
+#: ../libpurple/protocols/silc/ops.c:1529
 #: ../libpurple/protocols/silc10/ops.c:1520
 msgid "Cannot get server information"
 msgstr "無法取得伺服器資訊"
 
-#: ../libpurple/protocols/silc/ops.c:1548
+#: ../libpurple/protocols/silc/ops.c:1552
 #: ../libpurple/protocols/silc10/ops.c:1549
 #: ../libpurple/protocols/silc10/ops.c:1558
 msgid "Server Statistics"
 msgstr "伺服器統計資料"
 
-#: ../libpurple/protocols/silc/ops.c:1549
+#: ../libpurple/protocols/silc/ops.c:1553
 #: ../libpurple/protocols/silc10/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr "無法取得伺服器的統計資料"
 
-#: ../libpurple/protocols/silc/ops.c:1556
+#: ../libpurple/protocols/silc/ops.c:1560
 #: ../libpurple/protocols/silc10/ops.c:1581
 #, c-format
 msgid ""
@@ -11675,55 +11745,55 @@
 "伺服器管理者總數:%d 人\n"
 "路由器管理者總數:%d 人\n"
 
-#: ../libpurple/protocols/silc/ops.c:1588
+#: ../libpurple/protocols/silc/ops.c:1592
 #: ../libpurple/protocols/silc10/ops.c:1604
 msgid "Network Statistics"
 msgstr "網絡統計資料"
 
-#: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc/ops.c:1600
 #: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "Ping 失敗"
 
-#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc/ops.c:1605
 #: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping reply received from server"
 msgstr "由伺服器收到 Ping 回應"
 
-#: ../libpurple/protocols/silc/ops.c:1609
+#: ../libpurple/protocols/silc/ops.c:1613
 #: ../libpurple/protocols/silc10/ops.c:1625
 msgid "Could not kill user"
 msgstr "無法傱網絡上移除使用者"
 
-#: ../libpurple/protocols/silc/ops.c:1648
+#  XXX acli 20070614
+#: ../libpurple/protocols/silc/ops.c:1652
 msgid "WATCH"
-msgstr ""
-
-#: ../libpurple/protocols/silc/ops.c:1648
-#, fuzzy
+msgstr "WATCH"
+
+#: ../libpurple/protocols/silc/ops.c:1652
 msgid "Cannot watch user"
-msgstr "無法新增你自己至好友清單"
-
-#: ../libpurple/protocols/silc/ops.c:1724
-#: ../libpurple/protocols/silc/ops.c:1775
-#: ../libpurple/protocols/silc/silc.c:277
+msgstr "無法追蹤使用者"
+
+#: ../libpurple/protocols/silc/ops.c:1728
+#: ../libpurple/protocols/silc/ops.c:1779
+#: ../libpurple/protocols/silc/silc.c:385
 #: ../libpurple/protocols/silc10/ops.c:1811
 #: ../libpurple/protocols/silc10/ops.c:1858
 #: ../libpurple/protocols/silc10/silc.c:190
 msgid "Resuming session"
 msgstr "恢復工作階段中"
 
-#: ../libpurple/protocols/silc/ops.c:1726
+#: ../libpurple/protocols/silc/ops.c:1730
 #: ../libpurple/protocols/silc10/ops.c:1813
 msgid "Authenticating connection"
 msgstr "為連線進行驗證中"
 
-#: ../libpurple/protocols/silc/ops.c:1777
+#: ../libpurple/protocols/silc/ops.c:1781
 #: ../libpurple/protocols/silc10/ops.c:1860
 msgid "Verifying server public key"
 msgstr "核實伺服器的公開密碼匙中"
 
-#: ../libpurple/protocols/silc/ops.c:1814
+#: ../libpurple/protocols/silc/ops.c:1818
 #: ../libpurple/protocols/silc10/ops.c:1902
 msgid "Passphrase required"
 msgstr "必須輸入密碼"
@@ -11733,9 +11803,7 @@
 msgid ""
 "Received %s's public key. Your local copy does not match this key. Would you "
 "still like to accept this public key?"
-msgstr ""
-"收到 %s 的公開密碼匙,但收到的公開密碼匙跟你現有的不同。仍然接受這個公開密碼"
-"匙嗎?"
+msgstr "收到 %s 的公開密碼匙,但收到的公開密碼匙跟你現有的不同。仍然接受這個公開密碼匙嗎?"
 
 #: ../libpurple/protocols/silc/pk.c:103 ../libpurple/protocols/silc10/pk.c:109
 #, c-format
@@ -11769,86 +11837,83 @@
 msgid "Unsupported public key type"
 msgstr "不支援的公開密碼匙類型"
 
-#: ../libpurple/protocols/silc/silc.c:217
+#: ../libpurple/protocols/silc/silc.c:319
 #: ../libpurple/protocols/silc10/ops.c:1749
 msgid "Disconnected by server"
 msgstr "伺服器中斷了連線"
 
-#: ../libpurple/protocols/silc/silc.c:224
+#: ../libpurple/protocols/silc/silc.c:327
 #: ../libpurple/protocols/silc10/ops.c:1700
 msgid "Error during connecting to SILC Server"
 msgstr "連線至 SILC 伺服器時發生錯誤"
 
-#: ../libpurple/protocols/silc/silc.c:229
+#: ../libpurple/protocols/silc/silc.c:333
 #: ../libpurple/protocols/silc10/ops.c:1705
 msgid "Key Exchange failed"
 msgstr "密碼匙交換失敗"
 
-#: ../libpurple/protocols/silc/silc.c:238
+#: ../libpurple/protocols/silc/silc.c:343
 #: ../libpurple/protocols/silc10/ops.c:1714
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr "恢復連線失敗,請按「重新連線」建立新的連線。"
 
-#: ../libpurple/protocols/silc/silc.c:265
-#: ../libpurple/protocols/silc/silc.c:311
+#: ../libpurple/protocols/silc/silc.c:373
+#: ../libpurple/protocols/silc/silc.c:420
 #: ../libpurple/protocols/silc10/silc.c:161
 msgid "Connection failed"
 msgstr "連線失敗"
 
-#: ../libpurple/protocols/silc/silc.c:280
+#: ../libpurple/protocols/silc/silc.c:388
 #: ../libpurple/protocols/silc10/silc.c:193
 msgid "Performing key exchange"
 msgstr "交換密碼匙中"
 
 #. Progress
-#: ../libpurple/protocols/silc/silc.c:343
+#: ../libpurple/protocols/silc/silc.c:445
 #: ../libpurple/protocols/silc10/silc.c:325
 msgid "Connecting to SILC Server"
 msgstr "連線至 SILC 伺服器中"
 
-#: ../libpurple/protocols/silc/silc.c:352
-#, fuzzy, c-format
+#: ../libpurple/protocols/silc/silc.c:455
 msgid "Could not load SILC key pair"
-msgstr "無法讀取 SILC 配對密碼匙:%s"
-
-#: ../libpurple/protocols/silc/silc.c:366
+msgstr "無法讀取 SILC 配對密碼匙"
+
+#: ../libpurple/protocols/silc/silc.c:469
 #: ../libpurple/protocols/silc10/silc.c:355
 msgid "Unable to create connection"
 msgstr "無法建立連結"
 
-#: ../libpurple/protocols/silc/silc.c:395
+#: ../libpurple/protocols/silc/silc.c:499
 #: ../libpurple/protocols/silc10/silc.c:267
 msgid "Out of memory"
 msgstr "記憶體不夠"
 
-#: ../libpurple/protocols/silc/silc.c:438
+#: ../libpurple/protocols/silc/silc.c:550
 #: ../libpurple/protocols/silc10/silc.c:313
 msgid "Cannot initialize SILC protocol"
 msgstr "無法初始化 SILC 協定"
 
-#: ../libpurple/protocols/silc/silc.c:445
-#, fuzzy
+#: ../libpurple/protocols/silc/silc.c:559
 msgid "Error loading SILC key pair"
-msgstr "建立 SILC key pair 中..."
-
-#: ../libpurple/protocols/silc/silc.c:739
+msgstr "讀取 SILC 配對密碼匙途中出現錯誤"
+
+#: ../libpurple/protocols/silc/silc.c:882
 #: ../libpurple/protocols/silc10/silc.c:650
 msgid "Your Current Mood"
 msgstr "你目前的心情"
 
-#: ../libpurple/protocols/silc/silc.c:741
-#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1641
-#, c-format
+#: ../libpurple/protocols/silc/silc.c:884
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1741
 msgid "Normal"
 msgstr "正常"
 
-#: ../libpurple/protocols/silc/silc.c:755
+#: ../libpurple/protocols/silc/silc.c:898
 #: ../libpurple/protocols/silc10/silc.c:666
 msgid "In love"
 msgstr "戀愛中"
 
-#: ../libpurple/protocols/silc/silc.c:766
+#: ../libpurple/protocols/silc/silc.c:909
 #: ../libpurple/protocols/silc10/silc.c:677
 msgid ""
 "\n"
@@ -11857,100 +11922,98 @@
 "\n"
 "聯絡方法"
 
-#: ../libpurple/protocols/silc/silc.c:774
-#: ../libpurple/protocols/silc/util.c:561
+#: ../libpurple/protocols/silc/silc.c:917
+#: ../libpurple/protocols/silc/util.c:567
 #: ../libpurple/protocols/silc10/silc.c:685
 #: ../libpurple/protocols/silc10/util.c:557
 msgid "SMS"
 msgstr "SMS"
 
-#: ../libpurple/protocols/silc/silc.c:776
-#: ../libpurple/protocols/silc/util.c:563
+#: ../libpurple/protocols/silc/silc.c:919
+#: ../libpurple/protocols/silc/util.c:569
 #: ../libpurple/protocols/silc10/silc.c:687
 #: ../libpurple/protocols/silc10/util.c:559
 msgid "MMS"
 msgstr "MMS"
 
-#: ../libpurple/protocols/silc/silc.c:778
+#: ../libpurple/protocols/silc/silc.c:921
 #: ../libpurple/protocols/silc10/silc.c:689
 msgid "Video conferencing"
 msgstr "視像會議中"
 
-#: ../libpurple/protocols/silc/silc.c:783
+#: ../libpurple/protocols/silc/silc.c:926
 #: ../libpurple/protocols/silc10/silc.c:694
 msgid "Your Current Status"
 msgstr "目前狀態"
 
-#  XXX 暫譯
-#: ../libpurple/protocols/silc/silc.c:790
+#  XXX 暫譯
+#: ../libpurple/protocols/silc/silc.c:933
 #: ../libpurple/protocols/silc10/silc.c:701
 msgid "Online Services"
 msgstr "所用之網上服務"
 
-#: ../libpurple/protocols/silc/silc.c:793
+#: ../libpurple/protocols/silc/silc.c:936
 #: ../libpurple/protocols/silc10/silc.c:704
 msgid "Let others see what services you are using"
 msgstr "讓他人可以得知你使用那些網上服務"
 
-#  NOTE XXX 原始碼顯示這個其實不是電腦類型,而是操作系統版本 :-/
-#: ../libpurple/protocols/silc/silc.c:799
+#  NOTE XXX 原始碼顯示這個其實不是電腦類型,而是操作系統版本 :-/
+#: ../libpurple/protocols/silc/silc.c:942
 #: ../libpurple/protocols/silc10/silc.c:710
 msgid "Let others see what computer you are using"
 msgstr "容許別人查看你用的是什麼電腦"
 
-#: ../libpurple/protocols/silc/silc.c:806
+#: ../libpurple/protocols/silc/silc.c:949
 #: ../libpurple/protocols/silc10/silc.c:717
 msgid "Your VCard File"
 msgstr "你的 VCard 檔案"
 
-#: ../libpurple/protocols/silc/silc.c:812
-#, fuzzy
+#  XXX 看了原始碼也不知所云,暫時只有直譯了事
+#: ../libpurple/protocols/silc/silc.c:955
 msgid "Timezone (UTC)"
-msgstr "時區"
-
-#  XXX 好像很怪
-#: ../libpurple/protocols/silc/silc.c:816
-#: ../libpurple/protocols/silc/silc.c:817
+msgstr "時區 (UTC)"
+
+#  XXX 好像很怪
+#: ../libpurple/protocols/silc/silc.c:959
+#: ../libpurple/protocols/silc/silc.c:960
 #: ../libpurple/protocols/silc10/silc.c:729
 #: ../libpurple/protocols/silc10/silc.c:730
 msgid "User Online Status Attributes"
 msgstr "使用者上線狀態屬性"
 
-#: ../libpurple/protocols/silc/silc.c:818
+#: ../libpurple/protocols/silc/silc.c:961
 #: ../libpurple/protocols/silc10/silc.c:731
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
 "about yourself."
-msgstr ""
-"你可以給其他使用者看見你的上線狀態及個人資料。有關你的資訊,只須輸入你希望別"
-"人看得見的各項。"
-
-#: ../libpurple/protocols/silc/silc.c:859
-#: ../libpurple/protocols/silc/silc.c:865
-#: ../libpurple/protocols/silc/silc.c:1486
+msgstr "你可以給其他使用者看見你的上線狀態及個人資料。有關你的資訊,只須輸入你希望別人看得見的各項。"
+
+#: ../libpurple/protocols/silc/silc.c:1002
+#: ../libpurple/protocols/silc/silc.c:1008
+#: ../libpurple/protocols/silc/silc.c:1629
 #: ../libpurple/protocols/silc10/silc.c:772
 #: ../libpurple/protocols/silc10/silc.c:778
-#: ../libpurple/protocols/silc10/silc.c:1415
+#: ../libpurple/protocols/silc10/silc.c:1418
 msgid "Message of the Day"
 msgstr "是日訊息"
 
-#: ../libpurple/protocols/silc/silc.c:859
+#: ../libpurple/protocols/silc/silc.c:1002
 #: ../libpurple/protocols/silc10/silc.c:772
 msgid "No Message of the Day available"
 msgstr "沒有是日訊息"
 
-#: ../libpurple/protocols/silc/silc.c:860
-#: ../libpurple/protocols/silc/silc.c:1481
+#: ../libpurple/protocols/silc/silc.c:1003
+#: ../libpurple/protocols/silc/silc.c:1624
 #: ../libpurple/protocols/silc10/silc.c:773
-#: ../libpurple/protocols/silc10/silc.c:1410
+#: ../libpurple/protocols/silc10/silc.c:1413
 msgid "There is no Message of the Day associated with this connection"
 msgstr "這個連結沒有相關的是日訊息"
 
-#: ../libpurple/protocols/silc/silc.c:911
-#: ../libpurple/protocols/silc/silc.c:957
-#: ../libpurple/protocols/silc/silc.c:1028
-#: ../libpurple/protocols/silc/silc.c:1029
+#: ../libpurple/protocols/silc/silc.c:1054
+#: ../libpurple/protocols/silc/silc.c:1100
+#: ../libpurple/protocols/silc/silc.c:1171
+#: ../libpurple/protocols/silc/silc.c:1172
 #: ../libpurple/protocols/silc10/silc.c:824
 #: ../libpurple/protocols/silc10/silc.c:868
 #: ../libpurple/protocols/silc10/silc.c:939
@@ -11958,258 +12021,252 @@
 msgid "Create New SILC Key Pair"
 msgstr "產生新的 SILC 密錀對"
 
-#: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc/silc.c:1054
 #: ../libpurple/protocols/silc10/silc.c:824
 msgid "Passphrases do not match"
 msgstr "密碼不符"
 
-#: ../libpurple/protocols/silc/silc.c:957
+#: ../libpurple/protocols/silc/silc.c:1100
 #: ../libpurple/protocols/silc10/silc.c:868
 msgid "Key Pair Generation failed"
 msgstr "配對密碼匙產生失敗"
 
-#: ../libpurple/protocols/silc/silc.c:996
+#: ../libpurple/protocols/silc/silc.c:1139
 #: ../libpurple/protocols/silc10/silc.c:907
 msgid "Key length"
 msgstr "密碼匙長度"
 
-#: ../libpurple/protocols/silc/silc.c:998
+#: ../libpurple/protocols/silc/silc.c:1141
 #: ../libpurple/protocols/silc10/silc.c:909
 msgid "Public key file"
 msgstr "公開密碼匙檔案"
 
-#: ../libpurple/protocols/silc/silc.c:1000
+#: ../libpurple/protocols/silc/silc.c:1143
 #: ../libpurple/protocols/silc10/silc.c:911
 msgid "Private key file"
 msgstr "私人密碼匙檔案"
 
-#: ../libpurple/protocols/silc/silc.c:1023
+#: ../libpurple/protocols/silc/silc.c:1166
 #: ../libpurple/protocols/silc10/silc.c:934
 msgid "Passphrase (retype)"
 msgstr "密碼(再次輸入)"
 
-#: ../libpurple/protocols/silc/silc.c:1030
+#: ../libpurple/protocols/silc/silc.c:1173
 #: ../libpurple/protocols/silc10/silc.c:941
 msgid "Generate Key Pair"
 msgstr "產生配對密碼匙"
 
-#: ../libpurple/protocols/silc/silc.c:1073
-#: ../libpurple/protocols/silc10/silc.c:984
+#: ../libpurple/protocols/silc/silc.c:1216
+#: ../libpurple/protocols/silc10/silc.c:987
 msgid "Online Status"
 msgstr "上線狀態"
 
-#: ../libpurple/protocols/silc/silc.c:1081
-#: ../libpurple/protocols/silc10/silc.c:992
+#: ../libpurple/protocols/silc/silc.c:1224
+#: ../libpurple/protocols/silc10/silc.c:995
 msgid "View Message of the Day"
 msgstr "顯示是日訊息 (MOTD)"
 
-#: ../libpurple/protocols/silc/silc.c:1085
-#: ../libpurple/protocols/silc10/silc.c:996
+#: ../libpurple/protocols/silc/silc.c:1228
+#: ../libpurple/protocols/silc10/silc.c:999
 msgid "Create SILC Key Pair..."
 msgstr "產生 SILC 配對密碼匙..."
 
-#: ../libpurple/protocols/silc/silc.c:1177
-#: ../libpurple/protocols/silc10/silc.c:1095
+#: ../libpurple/protocols/silc/silc.c:1320
+#: ../libpurple/protocols/silc10/silc.c:1098
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "使用者 <I>%s</I> 不在網絡上"
 
-#: ../libpurple/protocols/silc/silc.c:1357
-#: ../libpurple/protocols/silc10/silc.c:1286
+#: ../libpurple/protocols/silc/silc.c:1500
+#: ../libpurple/protocols/silc10/silc.c:1289
 msgid "Topic too long"
 msgstr "聊天主題過長"
 
-#: ../libpurple/protocols/silc/silc.c:1438
-#: ../libpurple/protocols/silc10/silc.c:1367
+#: ../libpurple/protocols/silc/silc.c:1581
+#: ../libpurple/protocols/silc10/silc.c:1370
 msgid "You must specify a nick"
 msgstr "必須指定網名"
 
-#: ../libpurple/protocols/silc/silc.c:1540
-#: ../libpurple/protocols/silc10/silc.c:1469
+#: ../libpurple/protocols/silc/silc.c:1683
+#: ../libpurple/protocols/silc10/silc.c:1472
 #, c-format
 msgid "channel %s not found"
 msgstr "找不到會議 %s"
 
-#: ../libpurple/protocols/silc/silc.c:1545
-#: ../libpurple/protocols/silc10/silc.c:1474
+#: ../libpurple/protocols/silc/silc.c:1688
+#: ../libpurple/protocols/silc10/silc.c:1477
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "%s 的頻道模式為:%s"
 
-#: ../libpurple/protocols/silc/silc.c:1547
-#: ../libpurple/protocols/silc10/silc.c:1476
+#: ../libpurple/protocols/silc/silc.c:1690
+#: ../libpurple/protocols/silc10/silc.c:1479
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "%s 沒有設定頻道模式"
 
-#: ../libpurple/protocols/silc/silc.c:1560
-#: ../libpurple/protocols/silc10/silc.c:1489
+#: ../libpurple/protocols/silc/silc.c:1703
+#: ../libpurple/protocols/silc10/silc.c:1492
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "無法為 %s 設定頻道模式"
 
-#: ../libpurple/protocols/silc/silc.c:1590
-#: ../libpurple/protocols/silc10/silc.c:1519
+#: ../libpurple/protocols/silc/silc.c:1733
+#: ../libpurple/protocols/silc10/silc.c:1522
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
 msgstr "未知的指令:%s(可能是客戶端的錯誤)"
 
-#: ../libpurple/protocols/silc/silc.c:1653
-#: ../libpurple/protocols/silc10/silc.c:1582
+#: ../libpurple/protocols/silc/silc.c:1796
+#: ../libpurple/protocols/silc10/silc.c:1585
 msgid "part [channel]:  Leave the chat"
 msgstr "part [頻道]:離開聊天室"
 
-#: ../libpurple/protocols/silc/silc.c:1657
-#: ../libpurple/protocols/silc10/silc.c:1586
+#: ../libpurple/protocols/silc/silc.c:1800
+#: ../libpurple/protocols/silc10/silc.c:1589
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [頻道]:離開聊天室"
 
-#: ../libpurple/protocols/silc/silc.c:1661
-#: ../libpurple/protocols/silc10/silc.c:1590
+#: ../libpurple/protocols/silc/silc.c:1804
+#: ../libpurple/protocols/silc10/silc.c:1593
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;新主題&gt;]:檢視或修改聊天主題"
 
-#: ../libpurple/protocols/silc/silc.c:1666
-#: ../libpurple/protocols/silc10/silc.c:1595
+#: ../libpurple/protocols/silc/silc.c:1809
+#: ../libpurple/protocols/silc10/silc.c:1598
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "join &lt;頻道&gt; [&lt;密碼&gt;]:加入一個在網絡上的聊天室"
 
-#: ../libpurple/protocols/silc/silc.c:1670
-#: ../libpurple/protocols/silc10/silc.c:1599
+#: ../libpurple/protocols/silc/silc.c:1813
+#: ../libpurple/protocols/silc10/silc.c:1602
 msgid "list:  List channels on this network"
 msgstr "list:列出目前在網絡上的聊天室清單"
 
-#: ../libpurple/protocols/silc/silc.c:1674
-#: ../libpurple/protocols/silc10/silc.c:1603
+#: ../libpurple/protocols/silc/silc.c:1817
+#: ../libpurple/protocols/silc10/silc.c:1606
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;網名&gt;:查看這個網名的相關資訊"
 
-#: ../libpurple/protocols/silc/silc.c:1678
-#: ../libpurple/protocols/silc10/silc.c:1607
+#: ../libpurple/protocols/silc/silc.c:1821
+#: ../libpurple/protocols/silc10/silc.c:1610
 #: ../libpurple/protocols/zephyr/zephyr.c:2685
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;網名&gt; &lt;訊息&gt;:送出一個私人訊息給指定的使用者"
 
-#: ../libpurple/protocols/silc/silc.c:1682
-#: ../libpurple/protocols/silc10/silc.c:1611
+#: ../libpurple/protocols/silc/silc.c:1825
+#: ../libpurple/protocols/silc10/silc.c:1614
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr "query &lt;網名&gt; [&lt;訊息&gt;]:送出一個私人訊息給指定的使用者"
 
-#: ../libpurple/protocols/silc/silc.c:1686
-#: ../libpurple/protocols/silc10/silc.c:1615
+#: ../libpurple/protocols/silc/silc.c:1829
+#: ../libpurple/protocols/silc10/silc.c:1618
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:顯示伺服器的是日訊息 (MOTD)"
 
-#: ../libpurple/protocols/silc/silc.c:1690
-#: ../libpurple/protocols/silc10/silc.c:1619
+#: ../libpurple/protocols/silc/silc.c:1833
+#: ../libpurple/protocols/silc10/silc.c:1622
 msgid "detach:  Detach this session"
 msgstr "detach:暫停連線這個工作階段"
 
-#: ../libpurple/protocols/silc/silc.c:1694
-#: ../libpurple/protocols/silc10/silc.c:1623
+#: ../libpurple/protocols/silc/silc.c:1837
+#: ../libpurple/protocols/silc10/silc.c:1626
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [訊息]:自伺服器離線,並可選擇送出指定的訊息"
 
-#: ../libpurple/protocols/silc/silc.c:1698
-#: ../libpurple/protocols/silc10/silc.c:1627
+#: ../libpurple/protocols/silc/silc.c:1841
+#: ../libpurple/protocols/silc10/silc.c:1630
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;指令&gt;:執行 SILC 指定的用戶端指令"
 
-#: ../libpurple/protocols/silc/silc.c:1704
-#: ../libpurple/protocols/silc10/silc.c:1633
+#: ../libpurple/protocols/silc/silc.c:1847
+#: ../libpurple/protocols/silc10/silc.c:1636
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;網名&gt; [-pubkey|&lt;理由&gt;]:從網絡上移除網名"
 
-#: ../libpurple/protocols/silc/silc.c:1708
-#: ../libpurple/protocols/silc10/silc.c:1637
+#: ../libpurple/protocols/silc/silc.c:1851
+#: ../libpurple/protocols/silc10/silc.c:1640
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;新網名&gt;:改變你的網名"
 
-#: ../libpurple/protocols/silc/silc.c:1712
-#: ../libpurple/protocols/silc10/silc.c:1641
+#: ../libpurple/protocols/silc/silc.c:1855
+#: ../libpurple/protocols/silc10/silc.c:1644
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;網名&gt;:查看網名的相關資訊"
 
-#: ../libpurple/protocols/silc/silc.c:1716
-#: ../libpurple/protocols/silc10/silc.c:1645
+#: ../libpurple/protocols/silc/silc.c:1859
+#: ../libpurple/protocols/silc10/silc.c:1648
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 msgstr "cmode &lt;頻道&gt; [+|-&lt;模式&gt;]; [參數]:設定或顯示頻道模式"
 
-#: ../libpurple/protocols/silc/silc.c:1720
-#: ../libpurple/protocols/silc10/silc.c:1649
+#: ../libpurple/protocols/silc/silc.c:1863
+#: ../libpurple/protocols/silc10/silc.c:1652
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
-msgstr ""
-"cumode &lt;頻道&gt; +|-&lt;模式&gt; &lt;網名&gt;:在指定頻道修改指定的網名的"
-"模式"
-
-#: ../libpurple/protocols/silc/silc.c:1724
-#: ../libpurple/protocols/silc10/silc.c:1653
+msgstr "cumode &lt;頻道&gt; +|-&lt;模式&gt; &lt;網名&gt;:在指定頻道修改指定的網名的模式"
+
+#: ../libpurple/protocols/silc/silc.c:1867
+#: ../libpurple/protocols/silc10/silc.c:1656
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;使用者模式&gt;:設定你在網絡上的模式"
 
-#: ../libpurple/protocols/silc/silc.c:1728
-#: ../libpurple/protocols/silc10/silc.c:1657
+#: ../libpurple/protocols/silc/silc.c:1871
+#: ../libpurple/protocols/silc10/silc.c:1660
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;網名&gt; [-pubkey]:取得伺服器管理者的權限"
 
-#: ../libpurple/protocols/silc/silc.c:1732
-#: ../libpurple/protocols/silc10/silc.c:1661
+#: ../libpurple/protocols/silc/silc.c:1875
+#: ../libpurple/protocols/silc10/silc.c:1664
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
-msgstr ""
-"invite &lt;頻道&gt; [-|+]&lt;網名&gt;:邀請指定的網名、新增指定的網名到頻道的"
-"被邀者列表、或把指定的網名從頻道的被邀者列表中移除"
-
-#: ../libpurple/protocols/silc/silc.c:1736
-#: ../libpurple/protocols/silc10/silc.c:1665
+msgstr "invite &lt;頻道&gt; [-|+]&lt;網名&gt;:邀請指定的網名、新增指定的網名到頻道的被邀者列表、或把指定的網名從頻道的被邀者列表中移除"
+
+#: ../libpurple/protocols/silc/silc.c:1879
+#: ../libpurple/protocols/silc10/silc.c:1668
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr "kick &lt;頻道&gt; &lt;網名&gt; [備註]:把指定的網名從頻道中踢出"
 
-#  XXX 暫譯
-#: ../libpurple/protocols/silc/silc.c:1740
-#: ../libpurple/protocols/silc10/silc.c:1669
+#  XXX 暫譯
+#: ../libpurple/protocols/silc/silc.c:1883
+#: ../libpurple/protocols/silc10/silc.c:1672
 msgid "info [server]:  View server administrative details"
 msgstr "info [伺服器]:觀看伺服器的管理細節"
 
-#  XXX 暫譯
-#: ../libpurple/protocols/silc/silc.c:1744
-#: ../libpurple/protocols/silc10/silc.c:1673
+#  XXX 暫譯
+#: ../libpurple/protocols/silc/silc.c:1887
+#: ../libpurple/protocols/silc10/silc.c:1676
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;頻道&gt; +|-&lt;網名&gt;]:於指定的頻道禁止指定的用戶端"
 
-#: ../libpurple/protocols/silc/silc.c:1748
-#: ../libpurple/protocols/silc10/silc.c:1677
+#: ../libpurple/protocols/silc/silc.c:1891
+#: ../libpurple/protocols/silc10/silc.c:1680
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr "getkey &lt;網名|伺服器&gt;:取得用戶端或伺服器的公開密碼匙"
 
-#: ../libpurple/protocols/silc/silc.c:1752
-#: ../libpurple/protocols/silc10/silc.c:1681
+#: ../libpurple/protocols/silc/silc.c:1895
+#: ../libpurple/protocols/silc10/silc.c:1684
 msgid "stats:  View server and network statistics"
 msgstr "stats:觀看伺服器及網絡的統計資料"
 
-#: ../libpurple/protocols/silc/silc.c:1756
-#: ../libpurple/protocols/silc10/silc.c:1685
+#: ../libpurple/protocols/silc/silc.c:1899
+#: ../libpurple/protocols/silc10/silc.c:1688
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:向連結的伺服器送出 PING"
 
-#: ../libpurple/protocols/silc/silc.c:1761
-#: ../libpurple/protocols/silc10/silc.c:1690
+#: ../libpurple/protocols/silc/silc.c:1904
+#: ../libpurple/protocols/silc10/silc.c:1693
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;頻道&gt;:列出頻道中的使用者"
 
-#: ../libpurple/protocols/silc/silc.c:1765
-#: ../libpurple/protocols/silc10/silc.c:1694
+#: ../libpurple/protocols/silc/silc.c:1908
+#: ../libpurple/protocols/silc10/silc.c:1697
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
-msgstr ""
-"names [-count|-ops|-halfops|-voices|-normal] &lt;頻道...&gt;:列出指定的一或"
-"多個頻道的使用者或某一類使用者"
+msgstr "names [-count|-ops|-halfops|-voices|-normal] &lt;頻道...&gt;:列出指定的一或多個頻道的使用者或某一類使用者"
 
 #. *< type
 #. *< ui_requirement
@@ -12220,145 +12277,146 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:1876
-#: ../libpurple/protocols/silc10/silc.c:1819
+#: ../libpurple/protocols/silc/silc.c:2019
+#: ../libpurple/protocols/silc10/silc.c:1822
 msgid "SILC Protocol Plugin"
 msgstr "SILC 協定模組"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:1878
-#: ../libpurple/protocols/silc10/silc.c:1821
+#: ../libpurple/protocols/silc/silc.c:2021
+#: ../libpurple/protocols/silc10/silc.c:1824
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "安全性互聯網即時會議 (SILC) 協定"
 
-#: ../libpurple/protocols/silc/silc.c:1910
-#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2036
+#: ../libpurple/protocols/silc/silc.c:2053
+#: ../libpurple/protocols/silc10/silc.c:1856 ../pidgin/gtkprefs.c:2138
 msgid "Network"
 msgstr "網絡"
 
-#: ../libpurple/protocols/silc/silc.c:1921
-#: ../libpurple/protocols/silc10/silc.c:1864
+#: ../libpurple/protocols/silc/silc.c:2064
+#: ../libpurple/protocols/silc10/silc.c:1867
 msgid "Public Key file"
 msgstr "公開密碼匙檔案"
 
-#: ../libpurple/protocols/silc/silc.c:1925
-#: ../libpurple/protocols/silc10/silc.c:1868
+#: ../libpurple/protocols/silc/silc.c:2068
+#: ../libpurple/protocols/silc10/silc.c:1871
 msgid "Private Key file"
 msgstr "私人密碼匙檔案"
 
-# XXX 暫譯 - 20061025
-#: ../libpurple/protocols/silc/silc.c:1935
-#: ../libpurple/protocols/silc10/silc.c:1878
+# XXX 暫譯 - 20061025
+#: ../libpurple/protocols/silc/silc.c:2078
+#: ../libpurple/protocols/silc10/silc.c:1881
 msgid "Cipher"
 msgstr "加密方法"
 
-#: ../libpurple/protocols/silc/silc.c:1945
-#: ../libpurple/protocols/silc10/silc.c:1888
+#: ../libpurple/protocols/silc/silc.c:2088
+#: ../libpurple/protocols/silc10/silc.c:1891
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../libpurple/protocols/silc/silc.c:1948
+#  XXX 譯文源自 http://www.cert.org.tw/document/column/show.php?key=28
+#  XXX 但其實譯文並不統一 - acli 20070614
+#: ../libpurple/protocols/silc/silc.c:2091
 msgid "Use Perfect Forward Secrecy"
-msgstr ""
+msgstr "使用完全向前保密 (PFS)"
 
 #  XXX
-#: ../libpurple/protocols/silc/silc.c:1952
-#: ../libpurple/protocols/silc10/silc.c:1891
+#: ../libpurple/protocols/silc/silc.c:2095
+#: ../libpurple/protocols/silc10/silc.c:1894
 msgid "Public key authentication"
 msgstr "使用公開密碼匙認證"
 
-#  XXX 好像聽來很怪
-#: ../libpurple/protocols/silc/silc.c:1955
-#: ../libpurple/protocols/silc10/silc.c:1894
+#  XXX 好像聽來很怪
+#: ../libpurple/protocols/silc/silc.c:2098
+#: ../libpurple/protocols/silc10/silc.c:1897
 msgid "Block IMs without Key Exchange"
 msgstr "拒絕沒有交換密碼匙的即時訊息"
 
-#: ../libpurple/protocols/silc/silc.c:1958
-#: ../libpurple/protocols/silc10/silc.c:1897
+#: ../libpurple/protocols/silc/silc.c:2101
+#: ../libpurple/protocols/silc10/silc.c:1900
 msgid "Block messages to whiteboard"
 msgstr "禁止傳送訊息至白板"
 
-# XXX 暫譯
-#: ../libpurple/protocols/silc/silc.c:1961
-#: ../libpurple/protocols/silc10/silc.c:1900
+# XXX 暫譯
+#: ../libpurple/protocols/silc/silc.c:2104
+#: ../libpurple/protocols/silc10/silc.c:1903
 msgid "Automatically open whiteboard"
 msgstr "自動打開白板"
 
-#: ../libpurple/protocols/silc/silc.c:1964
-#: ../libpurple/protocols/silc10/silc.c:1903
+#: ../libpurple/protocols/silc/silc.c:2107
+#: ../libpurple/protocols/silc10/silc.c:1906
 msgid "Digitally sign and verify all messages"
 msgstr "數碼簽署所有即時訊息"
 
 #: ../libpurple/protocols/silc/util.c:207
-#: ../libpurple/protocols/silc/util.c:249
+#: ../libpurple/protocols/silc/util.c:250
 #: ../libpurple/protocols/silc10/util.c:207
 #: ../libpurple/protocols/silc10/util.c:247
 msgid "Creating SILC key pair..."
-msgstr "建立 SILC key pair 中..."
-
-#: ../libpurple/protocols/silc/util.c:215
-#: ../libpurple/protocols/silc/util.c:257
-#, fuzzy
+msgstr "產生 SILC 配對密碼匙中..."
+
+#: ../libpurple/protocols/silc/util.c:216
+#: ../libpurple/protocols/silc/util.c:259
 msgid "Cannot create SILC key pair\n"
-msgstr "建立 SILC key pair 中..."
+msgstr "無法產生 SILC 配對密碼匙\n"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: ../libpurple/protocols/silc/util.c:358
+#: ../libpurple/protocols/silc/util.c:364
 #: ../libpurple/protocols/silc10/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "姓名:   \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:360
+#: ../libpurple/protocols/silc/util.c:366
 #: ../libpurple/protocols/silc10/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "使用者名稱:\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:362
+#: ../libpurple/protocols/silc/util.c:368
 #: ../libpurple/protocols/silc10/util.c:359
 #, c-format
 msgid "E-Mail: \t\t%s\n"
 msgstr "電子郵件:\t\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:364
+#: ../libpurple/protocols/silc/util.c:370
 #: ../libpurple/protocols/silc10/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "主機名稱: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:366
+#: ../libpurple/protocols/silc/util.c:372
 #: ../libpurple/protocols/silc10/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "所屬機構: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:368
+#: ../libpurple/protocols/silc/util.c:374
 #: ../libpurple/protocols/silc10/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "國家:   \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:369
+#: ../libpurple/protocols/silc/util.c:375
 #: ../libpurple/protocols/silc10/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "演算法:  \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc/util.c:376
 #: ../libpurple/protocols/silc10/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "密碼匙長度: \t%d 個位元\n"
 
-#: ../libpurple/protocols/silc/util.c:372
-#, fuzzy, c-format
+#: ../libpurple/protocols/silc/util.c:378
+#, c-format
 msgid "Version: \t%s\n"
-msgstr "原因:%s"
-
-#: ../libpurple/protocols/silc/util.c:374
+msgstr "版本:   \t%s\n"
+
+#: ../libpurple/protocols/silc/util.c:380
 #: ../libpurple/protocols/silc10/util.c:369
 #, c-format
 msgid ""
@@ -12370,7 +12428,7 @@
 "%s\n"
 "\n"
 
-#: ../libpurple/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc/util.c:381
 #: ../libpurple/protocols/silc10/util.c:370
 #, c-format
 msgid ""
@@ -12380,51 +12438,51 @@
 "公開密碼匙指紋可讀版本 (Babbleprint):\n"
 "%s"
 
-#: ../libpurple/protocols/silc/util.c:379
-#: ../libpurple/protocols/silc/util.c:380
+#: ../libpurple/protocols/silc/util.c:385
+#: ../libpurple/protocols/silc/util.c:386
 #: ../libpurple/protocols/silc10/util.c:374
 #: ../libpurple/protocols/silc10/util.c:375
 msgid "Public Key Information"
 msgstr "公開密碼匙資訊"
 
-#: ../libpurple/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc/util.c:565
 #: ../libpurple/protocols/silc10/util.c:555
 msgid "Paging"
 msgstr "傳呼"
 
-#: ../libpurple/protocols/silc/util.c:565
+#: ../libpurple/protocols/silc/util.c:571
 #: ../libpurple/protocols/silc10/util.c:561
 msgid "Video Conferencing"
 msgstr "視像會議"
 
-#: ../libpurple/protocols/silc/util.c:583
+#: ../libpurple/protocols/silc/util.c:589
 #: ../libpurple/protocols/silc10/util.c:579
 msgid "Computer"
 msgstr "電腦"
 
-#: ../libpurple/protocols/silc/util.c:587
+#: ../libpurple/protocols/silc/util.c:593
 #: ../libpurple/protocols/silc10/util.c:583
 msgid "PDA"
 msgstr "電子手帳"
 
-#: ../libpurple/protocols/silc/util.c:589
+#: ../libpurple/protocols/silc/util.c:595
 #: ../libpurple/protocols/silc10/util.c:585
 msgid "Terminal"
 msgstr "終端機"
 
-#: ../libpurple/protocols/silc/wb.c:284 ../libpurple/protocols/silc10/wb.c:284
+#: ../libpurple/protocols/silc/wb.c:288 ../libpurple/protocols/silc10/wb.c:287
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr "%s 傳送訊息到白板。你要開啟白板嗎?"
 
-#: ../libpurple/protocols/silc/wb.c:288 ../libpurple/protocols/silc10/wb.c:288
+#: ../libpurple/protocols/silc/wb.c:292 ../libpurple/protocols/silc10/wb.c:291
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
 "whiteboard?"
 msgstr "%s 傳送訊息到 %s 頻道的白板。你要開啟白板嗎?"
 
-#: ../libpurple/protocols/silc/wb.c:302 ../libpurple/protocols/silc10/wb.c:302
+#: ../libpurple/protocols/silc/wb.c:306 ../libpurple/protocols/silc10/wb.c:305
 msgid "Whiteboard"
 msgstr "白板"
 
@@ -12433,54 +12491,44 @@
 msgstr "伺服器沒有統計資料"
 
 #: ../libpurple/protocols/silc10/ops.c:1931
-#, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "失敗:版本不符,請更新你的用戶端程式"
 
 #: ../libpurple/protocols/silc10/ops.c:1934
-#, c-format
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "失敗:遠端不信任/不支援你的公開密碼匙"
 
 #: ../libpurple/protocols/silc10/ops.c:1937
-#, c-format
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "失敗:遠端不支援建議中的密碼匙交換羣組 (KE group)"
 
 #: ../libpurple/protocols/silc10/ops.c:1940
-#, c-format
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "失敗:遠端不支援建議中的加密方式 (cipher)"
 
-#  NOTE 譯文源自 http://www.nii.org.tw/cnt/info/Report/19980906.htm
+#  NOTE 譯文源自 http://www.nii.org.tw/cnt/info/Report/19980906.htm
 #: ../libpurple/protocols/silc10/ops.c:1943
-#, c-format
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "失敗:遠端不支援建議中的公開密碼匙證書標準 (PKCS)"
 
 #: ../libpurple/protocols/silc10/ops.c:1946
-#, c-format
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "失敗:遠端不支援建議中的雜湊函數 (hash function)"
 
-#  NOTE 譯文源自 http://www.cert.org.tw/document/column/show.php?key=28
+#  NOTE 譯文源自 http://www.cert.org.tw/document/column/show.php?key=28
 #: ../libpurple/protocols/silc10/ops.c:1949
-#, c-format
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "失敗:遠端不支援建議中的身份驗證代碼 (HMAC)"
 
 #: ../libpurple/protocols/silc10/ops.c:1951
-#, c-format
 msgid "Failure: Incorrect signature"
 msgstr "失敗:錯誤的簽署"
 
 #: ../libpurple/protocols/silc10/ops.c:1953
-#, c-format
 msgid "Failure: Invalid cookie"
 msgstr "失敗:無效的 Cookie"
 
 #: ../libpurple/protocols/silc10/ops.c:1964
-#, c-format
 msgid "Failure: Authentication failed"
 msgstr "失敗:認證失敗"
 
@@ -12488,7 +12536,7 @@
 msgid "Cannot initialize SILC Client connection"
 msgstr "無法初始化 SILC 的用戶端連線"
 
-# NOTE 香港會寫「陳大文」,台灣人會看不明(寫「老張」一類,港人看見會覺得很怪),頭痛 :P
+# NOTE 香港會寫「陳大文」,台灣人會看不明(寫「老張」一類,港人看見會覺得很怪),頭痛 :P
 #: ../libpurple/protocols/silc10/silc.c:290
 msgid "John Noname"
 msgstr "無名氏"
@@ -12502,37 +12550,35 @@
 msgid "Could not load SILC key pair: %s"
 msgstr "無法讀取 SILC 配對密碼匙:%s"
 
-#. TODO: do we really want to disconnect on a failure to write?
-#: ../libpurple/protocols/simple/simple.c:416
+#: ../libpurple/protocols/simple/simple.c:419
 msgid "Could not write"
 msgstr "無法寫入"
 
-#: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1529
+#: ../libpurple/protocols/simple/simple.c:443
+#: ../libpurple/protocols/simple/simple.c:1691
 msgid "Could not connect"
 msgstr "無法連結"
 
-#: ../libpurple/protocols/simple/simple.c:1059
-#, fuzzy
+#: ../libpurple/protocols/simple/simple.c:1127
 msgid "Unknown server response."
-msgstr "原因不明。"
-
-#: ../libpurple/protocols/simple/simple.c:1563
-#: ../libpurple/protocols/simple/simple.c:1605
-#: ../libpurple/protocols/simple/simple.c:1618
-#: ../libpurple/protocols/simple/simple.c:1669
+msgstr "不明的伺服器回應。"
+
+#: ../libpurple/protocols/simple/simple.c:1727
+#: ../libpurple/protocols/simple/simple.c:1773
+#: ../libpurple/protocols/simple/simple.c:1788
+#: ../libpurple/protocols/simple/simple.c:1843
 msgid "Could not create listen socket"
 msgstr "無法建立 Socket 監聽"
 
-#: ../libpurple/protocols/simple/simple.c:1586
+#: ../libpurple/protocols/simple/simple.c:1752
 msgid "Couldn't resolve host"
 msgstr "無法解析主機"
 
-#: ../libpurple/protocols/simple/simple.c:1677
+#: ../libpurple/protocols/simple/simple.c:1853
 msgid "Could not resolve hostname"
 msgstr "無法解析主機"
 
-#: ../libpurple/protocols/simple/simple.c:1694
+#: ../libpurple/protocols/simple/simple.c:1871
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "SIP 的帳號不可含有空白字符或「@」符號"
 
@@ -12544,36 +12590,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1870
+#: ../libpurple/protocols/simple/simple.c:2057
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE 通訊協定模組"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1871
+#: ../libpurple/protocols/simple/simple.c:2058
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE 通訊協定模組"
 
-#: ../libpurple/protocols/simple/simple.c:1899
+#: ../libpurple/protocols/simple/simple.c:2086
 msgid "Publish status (note: everyone may watch you)"
 msgstr "刊登狀態(請注意:任何人都能看到你)"
 
-#: ../libpurple/protocols/simple/simple.c:1905
+#: ../libpurple/protocols/simple/simple.c:2092
 msgid "Use UDP"
 msgstr "使用 UDP"
 
-#: ../libpurple/protocols/simple/simple.c:1907
+#: ../libpurple/protocols/simple/simple.c:2094
 msgid "Use proxy"
 msgstr "使用 Proxy"
 
-#: ../libpurple/protocols/simple/simple.c:1909
+#: ../libpurple/protocols/simple/simple.c:2096
 msgid "Proxy"
 msgstr "代理伺服器"
 
-#: ../libpurple/protocols/simple/simple.c:1911
+#: ../libpurple/protocols/simple/simple.c:2098
 msgid "Auth User"
 msgstr "認證使用者"
 
-#: ../libpurple/protocols/simple/simple.c:1913
+#: ../libpurple/protocols/simple/simple.c:2100
 msgid "Auth Domain"
 msgstr "認證域名"
 
@@ -12612,14 +12658,13 @@
 msgid "%s not currently logged in."
 msgstr "%s 目前並未登入。"
 
-#  NOTE 譯文更動 by Ambrose
+#  NOTE 譯文更動 by Ambrose
 #: ../libpurple/protocols/toc/toc.c:500
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "不允許對 %s 發出警告。"
 
 #: ../libpurple/protocols/toc/toc.c:503
-#, c-format
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "訊息被丟棄,因為你達到了伺服器所限制的發送速度。"
 
@@ -12644,49 +12689,40 @@
 msgstr "你遺失了一個由 %s 送來的訊息,因為它傳送的速度太快。"
 
 #: ../libpurple/protocols/toc/toc.c:518
-#, c-format
 msgid "Failure."
 msgstr "失敗。"
 
 #: ../libpurple/protocols/toc/toc.c:521
-#, c-format
 msgid "Too many matches."
 msgstr "匹配太多。"
 
 #: ../libpurple/protocols/toc/toc.c:524
-#, c-format
 msgid "Need more qualifiers."
 msgstr "需輸入更多檢索條件。"
 
-#  NOTE「暫時無法使用」應該比「暫時不存在」通順
-#  NOTE 譯文更動 by Ambrose
+#  NOTE「暫時無法使用」應該比「暫時不存在」通順
+#  NOTE 譯文更動 by Ambrose
 #: ../libpurple/protocols/toc/toc.c:527
-#, c-format
 msgid "Dir service temporarily unavailable."
 msgstr "暫時無法使用目錄服務。"
 
 #: ../libpurple/protocols/toc/toc.c:530
-#, c-format
 msgid "E-mail lookup restricted."
 msgstr "禁止 E-Mail 檢查。"
 
 #: ../libpurple/protocols/toc/toc.c:533
-#, c-format
 msgid "Keyword ignored."
 msgstr "關鍵字已被忽略。"
 
 #: ../libpurple/protocols/toc/toc.c:536
-#, c-format
 msgid "No keywords."
 msgstr "沒有關鍵字。"
 
 #: ../libpurple/protocols/toc/toc.c:539
-#, c-format
 msgid "User has no directory information."
 msgstr "這個使用者沒有他的相關資訊。"
 
 #: ../libpurple/protocols/toc/toc.c:543
-#, c-format
 msgid "Country not supported."
 msgstr "這個國家不被支援。"
 
@@ -12696,30 +12732,24 @@
 msgstr "未知的失敗原因:%s。"
 
 #: ../libpurple/protocols/toc/toc.c:549
-#, c-format
 msgid "Incorrect screen name or password."
 msgstr "錯誤的帳號或密碼"
 
-#  NOTE「暫時無法使用」應該比「暫時不存在」通順
-#  NOTE 譯文更動 by Ambrose
+#  NOTE「暫時無法使用」應該比「暫時不存在」通順
+#  NOTE 譯文更動 by Ambrose
 #: ../libpurple/protocols/toc/toc.c:552
-#, c-format
 msgid "The service is temporarily unavailable."
 msgstr "暫時無法使用該項服務。"
 
 #: ../libpurple/protocols/toc/toc.c:555
-#, c-format
 msgid "Your warning level is currently too high to log in."
 msgstr "你目前登入系統的警告等級太高,以致無法登入。"
 
 #: ../libpurple/protocols/toc/toc.c:558
-#, c-format
 msgid ""
 "You have been connecting and disconnecting too frequently.  Wait ten minutes "
 "and try again.  If you continue to try, you will need to wait even longer."
-msgstr ""
-"你的連線/斷線動作太過頻繁。請等待十分鐘後再行重試。如果你依然繼續嘗試連線,"
-"那麼你的等待時間將會更加的延長。"
+msgstr "你的連線/斷線動作太過頻繁。請等待十分鐘後再行重試。如果你依然繼續嘗試連線,那麼你的等待時間將會更加的延長。"
 
 #: ../libpurple/protocols/toc/toc.c:560
 #, c-format
@@ -12751,8 +12781,8 @@
 msgid "Password Change Successful"
 msgstr "密碼修改成功"
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5582
-#: ../pidgin/gtkblist.c:5932
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:6241
+#: ../pidgin/gtkblist.c:6599
 msgid "_Group:"
 msgstr "羣組(_G):"
 
@@ -12812,247 +12842,230 @@
 msgid "TOC Protocol Plugin"
 msgstr "TOC 協定模組"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:782
+#: ../libpurple/protocols/yahoo/yahoo.c:784
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-
-# NOTE 譯文更動 by Ambrose
-#: ../libpurple/protocols/yahoo/yahoo.c:838
+msgstr "%s 送來了一個視像聊天的邀請,但目前還沒有視像聊天的支援。"
+
+# NOTE 譯文更動 by Ambrose
+#: ../libpurple/protocols/yahoo/yahoo.c:840
 msgid "Your Yahoo! message did not get sent."
 msgstr "無法送出你的 Yahoo! 訊息。"
 
-# XXX 暫譯
-#: ../libpurple/protocols/yahoo/yahoo.c:960
+# XXX 暫譯
+#: ../libpurple/protocols/yahoo/yahoo.c:962
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "%s 的 Yahoo! 系統訊息:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1029
+#: ../libpurple/protocols/yahoo/yahoo.c:1031
 msgid "Authorization denied message:"
 msgstr "拒絕認證訊息:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1047
+#: ../libpurple/protocols/yahoo/yahoo.c:1049
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
-msgstr ""
-"使用者 %s 因為下列原因,剛剛拒絕了你先前將他(她)新增至你的好友清單的要求:%"
-"s"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1050
+msgstr "使用者 %s 因為下列原因,剛剛拒絕了你先前將他(她)新增至你的好友清單的要求:%s"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1052
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "使用者 %s 剛剛拒絕了你先前將他(她)新增至你的好友清單的要求。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1052
+#: ../libpurple/protocols/yahoo/yahoo.c:1054
 msgid "Add buddy rejected"
 msgstr "新增好友被拒"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1994
+#: ../libpurple/protocols/yahoo/yahoo.c:1996
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
 "method.  You will probably not be able to successfully sign on to Yahoo.  "
 "Check %s for updates."
-msgstr ""
-"Yahoo 伺服器要求了使用一種不明的認證方式,因此很可能不會成功登入 Yahoo。請到 "
-"%s 檢查有沒有更新的版本。"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1997
+msgstr "Yahoo 伺服器要求了使用一種不明的認證方式,因此很可能不會成功登入 Yahoo。請到 %s 檢查有沒有更新的版本。"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1999
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! 認證失敗"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2063
+#: ../libpurple/protocols/yahoo/yahoo.c:2065
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
 "\"Yes\" will remove and ignore the buddy."
-msgstr ""
-"你嘗試忽略在你的好友名單內的 %s。如果你打算把他(她)從你的好友清單中移除,並"
-"隨即忽略他(她),請按一下「是」。"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:2066
+msgstr "你嘗試忽略在你的好友名單內的 %s。如果你打算把他(她)從你的好友清單中移除,並隨即忽略他(她),請按一下「是」。"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2068
 msgid "Ignore buddy?"
 msgstr "忽略使用者?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2129
+#: ../libpurple/protocols/yahoo/yahoo.c:2133
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "你的帳戶目前被暫時關閉。請你登入 Yahoo! 網站。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2132
+#: ../libpurple/protocols/yahoo/yahoo.c:2136
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "未知的錯誤代碼 %d。已經登入到 Yahoo!,官方網站上可能已經修正這個錯誤。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2186
+#: ../libpurple/protocols/yahoo/yahoo.c:2189
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "無法將好友「%1$s」新增至帳號「%3$s」在伺服器上的清單內的羣組「%2$s」。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2189
+#: ../libpurple/protocols/yahoo/yahoo.c:2192
 msgid "Could not add buddy to server list"
 msgstr "無法將好友新增至伺服器上的清單內"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2308
+#: ../libpurple/protocols/yahoo/yahoo.c:2311
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ 音效檔 %s/%s/%s.swf ] %s"
 
-# XXX 暫譯 - 20061025
-#: ../libpurple/protocols/yahoo/yahoo.c:2651
+# XXX 暫譯 - 20061025
+#: ../libpurple/protocols/yahoo/yahoo.c:2657
 msgid "Received unexpected HTTP response from server."
 msgstr "伺服器發出了奇怪的 HTTP 回應。"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2675
-#: ../libpurple/protocols/yahoo/yahoo.c:2861
-#: ../libpurple/protocols/yahoo/yahoo.c:2964
+#: ../libpurple/protocols/yahoo/yahoo.c:2682
+#: ../libpurple/protocols/yahoo/yahoo.c:2870
 #: ../libpurple/protocols/yahoo/yahoo.c:2974
+#: ../libpurple/protocols/yahoo/yahoo.c:2985
 #: ../libpurple/protocols/yahoo/yahoochat.c:1514
 #: ../libpurple/protocols/yahoo/yahoochat.c:1584
-#: ../libpurple/protocols/yahoo/ycht.c:585
+#: ../libpurple/protocols/yahoo/ycht.c:586
 msgid "Connection problem"
 msgstr "連線錯誤"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2701
-#, fuzzy, c-format
+#: ../libpurple/protocols/yahoo/yahoo.c:2708
+#, c-format
 msgid ""
 "Lost connection with %s:\n"
 "%s"
 msgstr ""
-"與伺服器之間的連線突然中斷:\n"
+"與 %s 之間的連線突然中斷:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2726
-#, fuzzy, c-format
+#: ../libpurple/protocols/yahoo/yahoo.c:2733
+#, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
 "%s"
 msgstr ""
-"無法與伺服器建立連線:\n"
+"無法與 %s 建立連線:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3081
-#: ../libpurple/protocols/yahoo/yahoo.c:3767
+#: ../libpurple/protocols/yahoo/yahoo.c:3092
+#: ../libpurple/protocols/yahoo/yahoo.c:3778
 msgid "Not at Home"
 msgstr "不在家"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3083
-#: ../libpurple/protocols/yahoo/yahoo.c:3770
+#: ../libpurple/protocols/yahoo/yahoo.c:3094
+#: ../libpurple/protocols/yahoo/yahoo.c:3781
 msgid "Not at Desk"
 msgstr "不在座位"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3085
-#: ../libpurple/protocols/yahoo/yahoo.c:3773
+#: ../libpurple/protocols/yahoo/yahoo.c:3096
+#: ../libpurple/protocols/yahoo/yahoo.c:3784
 msgid "Not in Office"
 msgstr "不在辦公室"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3089
-#: ../libpurple/protocols/yahoo/yahoo.c:3779
+#: ../libpurple/protocols/yahoo/yahoo.c:3100
+#: ../libpurple/protocols/yahoo/yahoo.c:3790
 msgid "On Vacation"
 msgstr "渡假去了"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3093
-#: ../libpurple/protocols/yahoo/yahoo.c:3785
+#: ../libpurple/protocols/yahoo/yahoo.c:3104
+#: ../libpurple/protocols/yahoo/yahoo.c:3796
 msgid "Stepped Out"
 msgstr "走出去了"
 
-# NOTE marv (模組作者) 解說:「對,這是表示好友並不在伺服器上的清單中。
-# NOTE 這也表示你不會看見這個好友登入等等。」(yeah, it mean the buddy
+# NOTE marv (模組作者) 解說:「對,這是表示好友並不在伺服器上的清單中。
+# NOTE 這也表示你不會看見這個好友登入等等。」(yeah, it mean the buddy
 # NOTE isn't on the server's buddy list/ which also means you won't
 # NOTE be able to see when they log on, etc)
-#: ../libpurple/protocols/yahoo/yahoo.c:3186
-#: ../libpurple/protocols/yahoo/yahoo.c:3216
+#: ../libpurple/protocols/yahoo/yahoo.c:3197
+#: ../libpurple/protocols/yahoo/yahoo.c:3227
 msgid "Not on server list"
 msgstr "不在伺服器上的清單中"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3233
-#: ../libpurple/protocols/yahoo/yahoo.c:3291
+#: ../libpurple/protocols/yahoo/yahoo.c:3244
+#: ../libpurple/protocols/yahoo/yahoo.c:3302
 msgid "Appear Online"
 msgstr "報稱上線"
 
-# NOTE Yahoo 官方譯「永遠顯示離線」,說白一點其實即是(針對某人)「長期隠身」
-#: ../libpurple/protocols/yahoo/yahoo.c:3236
-#: ../libpurple/protocols/yahoo/yahoo.c:3312
+# NOTE Yahoo 官方譯「永遠顯示離線」,說白一點其實即是(針對某人)「長期隠身」
+#: ../libpurple/protocols/yahoo/yahoo.c:3247
+#: ../libpurple/protocols/yahoo/yahoo.c:3323
 msgid "Appear Permanently Offline"
 msgstr "長期報稱離線"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3254
+#: ../libpurple/protocols/yahoo/yahoo.c:3265
 msgid "Presence"
 msgstr "上線狀態"
 
-# NOTE 下次登入時不報稱離線,所以加「暫時」字眼
-#: ../libpurple/protocols/yahoo/yahoo.c:3297
+# NOTE 下次登入時不報稱離線,所以加「暫時」字眼
+#: ../libpurple/protocols/yahoo/yahoo.c:3308
 msgid "Appear Offline"
 msgstr "暫時報稱離線"
 
-#  NOTE 這是清單內的一個指令
-#: ../libpurple/protocols/yahoo/yahoo.c:3306
+#  NOTE 這是清單內的一個指令
+#: ../libpurple/protocols/yahoo/yahoo.c:3317
 msgid "Don't Appear Permanently Offline"
 msgstr "停止長期報稱離線"
 
-# NOTE #gaim 的 Vann 及 LSchiere 解:如果選取了的好友目前處於一個聊天,便加入該個聊天
-# NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
-#: ../libpurple/protocols/yahoo/yahoo.c:3354
+# NOTE #gaim 的 Vann 及 LSchiere 解:如果選取了的好友目前處於一個聊天,便加入該個聊天
+# NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
+#: ../libpurple/protocols/yahoo/yahoo.c:3365
 msgid "Join in Chat"
 msgstr "加入好友目前所在的聊天室"
 
-# NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
-#: ../libpurple/protocols/yahoo/yahoo.c:3360
+# NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
+#: ../libpurple/protocols/yahoo/yahoo.c:3371
 msgid "Initiate Conference"
 msgstr "開啟會議室"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3388
+#: ../libpurple/protocols/yahoo/yahoo.c:3399
 msgid "Presence Settings"
 msgstr "上線狀態設定"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3394
+#: ../libpurple/protocols/yahoo/yahoo.c:3405
 msgid "Start Doodling"
 msgstr "開始 Doodle"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3495
-#, fuzzy
+#: ../libpurple/protocols/yahoo/yahoo.c:3506
 msgid "Activate which ID?"
-msgstr "啟動哪一個 ID?"
-
-# NOTE #gaim 的 Vann 及 LSchiere 解:如果選取了的好友目前處於一個聊天,便加入該個聊天
-# NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
-#: ../libpurple/protocols/yahoo/yahoo.c:3506
-msgid "Join whom in chat?"
-msgstr "加入哪個好友目前所在的聊天室?"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3518
+msgstr "啟用哪一個 ID?"
+
+# NOTE #gaim 的 Vann 及 LSchiere 解:如果選取了的好友目前處於一個聊天,便加入該個聊天
+# NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
+#: ../libpurple/protocols/yahoo/yahoo.c:3517
+msgid "Join who in chat?"
+msgstr "加入誰的聊天室?"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3529
 msgid "Activate ID..."
 msgstr "啟動 ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3522
+#: ../libpurple/protocols/yahoo/yahoo.c:3533
 msgid "Join User in Chat..."
 msgstr "加入好友目前所在的聊天室..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3527
-#, fuzzy
+#: ../libpurple/protocols/yahoo/yahoo.c:3538
 msgid "Open Inbox"
-msgstr "開啟Hotmail收件匣"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4119
-msgid "Buzz"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4121
-#, c-format
-msgid "Buzzing %s..."
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4136
+msgstr "開啟收件匣"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4147
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt聊天室&gt;:加入位於 Yahoo! 網絡的一個聊天室"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4141
+#: ../libpurple/protocols/yahoo/yahoo.c:4152
 msgid "list: List rooms on the Yahoo network"
 msgstr "list:列出Yahoo網絡上的聊天室清單"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4149
+#: ../libpurple/protocols/yahoo/yahoo.c:4160
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: 要求使用者開始 Doodle Session"
 
@@ -13066,57 +13079,57 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4358
-#: ../libpurple/protocols/yahoo/yahoo.c:4360
+#: ../libpurple/protocols/yahoo/yahoo.c:4369
+#: ../libpurple/protocols/yahoo/yahoo.c:4371
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo 協定模組"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4383
+#: ../libpurple/protocols/yahoo/yahoo.c:4394
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4386
+#: ../libpurple/protocols/yahoo/yahoo.c:4397
 msgid "Pager server"
 msgstr "傳呼伺服器"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4389
+#: ../libpurple/protocols/yahoo/yahoo.c:4400
 msgid "Japan Pager server"
 msgstr "傳呼伺服器(日本地區)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4392
+#: ../libpurple/protocols/yahoo/yahoo.c:4403
 msgid "Pager port"
 msgstr "傳呼系統通訊埠"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4395
+#: ../libpurple/protocols/yahoo/yahoo.c:4406
 msgid "File transfer server"
 msgstr "檔案傳輸伺服器"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4398
+#: ../libpurple/protocols/yahoo/yahoo.c:4409
 msgid "Japan file transfer server"
 msgstr "檔案傳輸伺服器(日本地區)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4401
+#: ../libpurple/protocols/yahoo/yahoo.c:4412
 msgid "File transfer port"
 msgstr "檔案傳輸通訊埠"
 
-#  XXX 無劃一譯法,有譯「地區」、「區域」甚至「場所」(?!)
-#: ../libpurple/protocols/yahoo/yahoo.c:4404
+#  XXX 無劃一譯法,有譯「地區」、「區域」甚至「場所」(?!)
+#: ../libpurple/protocols/yahoo/yahoo.c:4415
 msgid "Chat room locale"
 msgstr "聊天室區域 (Locale)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4407
+#: ../libpurple/protocols/yahoo/yahoo.c:4418
 msgid "Ignore conference and chatroom invitations"
 msgstr "忽略會議室與聊天室邀請"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4415
+#: ../libpurple/protocols/yahoo/yahoo.c:4426
 msgid "Chat room list URL"
 msgstr "聊天室清單所在網址"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4418
+#: ../libpurple/protocols/yahoo/yahoo.c:4429
 msgid "Yahoo Chat server"
 msgstr "Yahoo 聊天伺服器"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4421
+#: ../libpurple/protocols/yahoo/yahoo.c:4432
 msgid "Yahoo Chat port"
 msgstr "Yahoo 聊天室通訊埠"
 
@@ -13127,14 +13140,13 @@
 msgid "Sent Doodle request."
 msgstr "送出 Doodle 要求。"
 
-# TODO - 覆查譯文 - 20061028
+# TODO - 覆查譯文 - 20061028
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:270
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:279
 #: ../libpurple/protocols/yahoo/yahoo_filexfer.c:288
 msgid "Unable to establish file descriptor."
 msgstr "無法建立檔案介紹。"
 
-#. TODO: what to do here - do we really have to disconnect?
 #: ../libpurple/protocols/yahoo/yahoo_packet.c:307
 msgid "Write Error"
 msgstr "寫入錯誤"
@@ -13153,7 +13165,7 @@
 "time."
 msgstr "對不起,暫時並不支援內容被列為兒童不宜的個人資料。"
 
-# NOTE 注意:鏈結在譯文之下顯示,故譯成「以下」
+# NOTE 注意:鏈結在譯文之下顯示,故譯成「以下」
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:840
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
@@ -13195,7 +13207,7 @@
 msgid "Last Update"
 msgstr "更新日期"
 
-# NOTE 譯文更動 by Ambrose
+# NOTE 譯文更動 by Ambrose
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1199
 #, c-format
 msgid "User information for %s unavailable"
@@ -13211,17 +13223,14 @@
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
-msgstr ""
-"無法取得使用者的個人資料。這很有可能只是伺服器出現暫時性的問題,請稍後重試。"
+msgstr "無法取得使用者的個人資料。這很有可能只是伺服器出現暫時性的問題,請稍後重試。"
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1224
 msgid ""
 "Could not retrieve the user's profile. This most likely means that the user "
 "does not exist; however, Yahoo! sometimes does fail to find a user's "
 "profile. If you know that the user exists, please try again later."
-msgstr ""
-"無法取得使用者的個人資料。這很有可能表示這個使用者並不存在;然而,Yahoo! 會不"
-"時找不到使用者的個人資料。若果你知道使用者確實存在,請稍後重試。"
+msgstr "無法取得使用者的個人資料。這很有可能表示這個使用者並不存在;然而,Yahoo! 會不時找不到使用者的個人資料。若果你知道使用者確實存在,請稍後重試。"
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1231
 msgid "The user's profile is empty."
@@ -13279,12 +13288,12 @@
 msgid "Fetching the room list failed."
 msgstr "讀取聊天室清單發生錯誤。"
 
-# NOTE 解「可語音聊天的使用者數目」(marv)
+# NOTE 解「可語音聊天的使用者數目」(marv)
 #: ../libpurple/protocols/yahoo/yahoochat.c:1500
 msgid "Voices"
 msgstr "可語音聊天"
 
-# NOTE 解「可視像聊天的使用者數目」(marv)
+# NOTE 解「可視像聊天的使用者數目」(marv)
 #: ../libpurple/protocols/yahoo/yahoochat.c:1503
 msgid "Webcams"
 msgstr "可視像聊天"
@@ -13301,11 +13310,11 @@
 msgid "User Rooms"
 msgstr "使用者建立之聊天室"
 
-#: ../libpurple/protocols/yahoo/ycht.c:456
+#: ../libpurple/protocols/yahoo/ycht.c:457
 msgid "Connection problem with the YCHT server."
 msgstr "與 YCHT 伺服器出現連線錯誤"
 
-#: ../libpurple/protocols/yahoo/ycht.c:475
+#: ../libpurple/protocols/yahoo/ycht.c:476
 #, c-format
 msgid ""
 "Lost connection with server\n"
@@ -13341,20 +13350,20 @@
 msgid "Anyone"
 msgstr "任何人"
 
-# XXX 暫譯
-# NOTE 之前的搜尋結果(下列第一個鏈結)是說 Class 不是類別,
-# NOTE 但另有說明(下列第二個鏈結)的實例似乎顯示 Class 基本上可以說是類別
-# NOTE 參閱 http://www.mit.edu/afs/sipb/project/doc/izephyr/html/node19.html 及其鏈結
-# NOTE 參閱 http://consult.stanford.edu/pub/communications/zephyr-guide
+# XXX 暫譯
+# NOTE 之前的搜尋結果(下列第一個鏈結)是說 Class 不是類別,
+# NOTE 但另有說明(下列第二個鏈結)的實例似乎顯示 Class 基本上可以說是類別
+# NOTE 參閱 http://www.mit.edu/afs/sipb/project/doc/izephyr/html/node19.html 及其鏈結
+# NOTE 參閱 http://consult.stanford.edu/pub/communications/zephyr-guide
 # NOTE (15:05:28) aatharuv: wing: A class is basically a high level chat. Any message sent to a class will also have "instance", and "recipient" parameters, which control who gets it. If someone "subscribes" to only a particular instance of the class, they'll only get messages sent to the specific class and instance, whereas someone who subs to all the instances of the class, instance "*", will get any message to the class.
 # NOTE (15:11:31) aatharuv: The "recipient" field also controls who gets a message. if the recipient is "", then anyone subbed to said class and instance will get the message, otherwise it will only be received by the person with that "username". This allows IM's in zephyr to be a special case of chats
 #: ../libpurple/protocols/zephyr/zephyr.c:2354
 msgid "_Class:"
 msgstr "類別/聊天室(_C):"
 
-# XXX 暫譯
-# NOTE 參閱 http://www.mit.edu/afs/sipb/project/doc/izephyr/html/node19.html 及其鏈結
-# NOTE 參閱 http://consult.stanford.edu/pub/communications/zephyr-guide
+# XXX 暫譯
+# NOTE 參閱 http://www.mit.edu/afs/sipb/project/doc/izephyr/html/node19.html 及其鏈結
+# NOTE 參閱 http://consult.stanford.edu/pub/communications/zephyr-guide
 #: ../libpurple/protocols/zephyr/zephyr.c:2360
 msgid "_Instance:"
 msgstr "實體/頻道(_I):"
@@ -13363,7 +13372,7 @@
 msgid "_Recipient:"
 msgstr "接受者(_R):"
 
-#  FIXME 暫譯
+#  FIXME 暫譯
 #: ../libpurple/protocols/zephyr/zephyr.c:2377
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
@@ -13403,24 +13412,19 @@
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
-msgstr ""
-"zi &lt;類別&gt; &lt;實體&gt:送出訊息至&lt;<i>類別</i>,<i>實體</i>,*&gt;"
+msgstr "zi &lt;類別&gt; &lt;實體&gt:送出訊息至&lt;<i>類別</i>,<i>實體</i>,*&gt;"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2733
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
-msgstr ""
-"zcir &lt;類別&gt; &lt;實體&gt; &lt;接受者&gt;:送出訊息至 &lt;<i>類別</i>,<i>"
-"實體</i>,<i>接受者</i>&gt;"
+msgstr "zcir &lt;類別&gt; &lt;實體&gt; &lt;接受者&gt;:送出訊息至 &lt;<i>類別</i>,<i>實體</i>,<i>接受者</i>&gt;"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2739
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
-msgstr ""
-"zir &lt;實體&gt; &lt;接受者&gt;:送出訊息至 &lt;MESSAGE,<i>實體</i>,<i>接受者"
-"</i>&gt;"
+msgstr "zir &lt;實體&gt; &lt;接受者&gt;:送出訊息至 &lt;MESSAGE,<i>實體</i>,<i>接受者</i>&gt;"
 
 #: ../libpurple/protocols/zephyr/zephyr.c:2744
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
@@ -13432,7 +13436,7 @@
 msgid "Resubscribe"
 msgstr "重新加入所有聊天室"
 
-#  FIXME 要覆查譯文
+#  FIXME 要覆查譯文
 #: ../libpurple/protocols/zephyr/zephyr.c:2853
 msgid "Retrieve subscriptions from server"
 msgstr "由伺服器取得目前所在聊天室的清單"
@@ -13460,7 +13464,7 @@
 msgid "tzc command"
 msgstr "TZC 指令"
 
-# NOTE: 這是Zephyr使用者會自然明白的術語,不用費心解釋
+# NOTE: 這是Zephyr使用者會自然明白的術語,不用費心解釋
 # NOTE: aatharuv: Most zephyr clients use ".anyone" to store the Zephyr
 # NOTE: buddylist. The export to .anyone option controls whether you want
 # NOTE: gaim to write to .anyone upon logout. Some people use multiple
@@ -13474,7 +13478,7 @@
 msgid "Export to .zephyr.subs"
 msgstr "匯出至 .zephyr.subs 檔"
 
-# NOTE: 這是Zephyr使用者會自然明白的術語,不用費心解釋
+# NOTE: 這是Zephyr使用者會自然明白的術語,不用費心解釋
 # NOTE: aatharuv: Most zephyr clients use ".anyone" to store the Zephyr
 # NOTE: buddylist. The export to .anyone option controls whether you want
 # NOTE: gaim to write to .anyone upon logout. Some people use multiple
@@ -13492,15 +13496,15 @@
 msgid "Realm"
 msgstr "域名"
 
-# FIXME 暫譯;譯得很差,有待改進
-# NOTE: Zephyr 的「Exposure」指隱身至現身之間的各種狀態
+# FIXME 暫譯;譯得很差,有待改進
+# NOTE: Zephyr 的「Exposure」指隱身至現身之間的各種狀態
 # NOTE: aatharuv: exposure in zephyr controls your visibility.
 #: ../libpurple/protocols/zephyr/zephyr.c:2994
 msgid "Exposure"
 msgstr "現身程度"
 
-#: ../libpurple/proxy.c:459 ../libpurple/proxy.c:894 ../libpurple/proxy.c:1049
-#: ../libpurple/proxy.c:1617
+#: ../libpurple/proxy.c:461 ../libpurple/proxy.c:902 ../libpurple/proxy.c:1061
+#: ../libpurple/proxy.c:1632
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -13509,46 +13513,60 @@
 "無法建立 Socket:\n"
 "%s"
 
-#: ../libpurple/proxy.c:659
+#: ../libpurple/proxy.c:662
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s\n"
 msgstr "無法解析 HTTP 代理伺服應的回應:%s\n"
 
-#: ../libpurple/proxy.c:698 ../libpurple/proxy.c:744 ../libpurple/proxy.c:780
-#: ../libpurple/proxy.c:792
+#: ../libpurple/proxy.c:702 ../libpurple/proxy.c:750 ../libpurple/proxy.c:786
+#: ../libpurple/proxy.c:798
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP 代理伺服器連線錯誤 %d"
 
-#: ../libpurple/proxy.c:788
+#: ../libpurple/proxy.c:794
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
 msgstr "拒絕存取:HTTP 代理伺服器禁止通訊埠 %d 的資料傳送。"
 
-#: ../libpurple/proxy.c:1012
+#: ../libpurple/proxy.c:1022
 #, c-format
 msgid "Error resolving %s"
 msgstr "解析 %s 途中發生了錯誤"
 
-#: ../libpurple/proxy.c:1714
+#: ../libpurple/proxy.c:1730
 msgid "Could not resolve host name"
 msgstr "無法解析主機"
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
+#. *
+#. * @since 2.3.0
 #.
-#: ../libpurple/request.h:1378
+#. *
+#. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
+#. *
+#. * @deprecated Please use purple_request_yes_no_with_hint instead.
+#.
+#: ../libpurple/request.h:1802 ../libpurple/request.h:1815
 msgid "_Yes"
 msgstr "是(_Y)"
 
-#: ../libpurple/request.h:1378
+#: ../libpurple/request.h:1802 ../libpurple/request.h:1815
 msgid "_No"
 msgstr "否(_N)"
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
+#. *
+#. * @since 2.3.0
 #.
-#: ../libpurple/request.h:1398
+#. *
+#. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
+#. *
+#. * @deprecated Please use purple_request_accept_cancel_with_hint instead.
+#.
+#: ../libpurple/request.h:1854 ../libpurple/request.h:1867
 msgid "_Accept"
 msgstr "接受(_A)"
 
@@ -13559,7 +13577,7 @@
 msgid "I'm not here right now"
 msgstr "我現在不在位子上"
 
-# FIXME 這很明顯是誤譯,但想不到怎樣寫才對 - 20061025
+# FIXME 這很明顯是誤譯,但想不到怎樣寫才對 - 20061025
 #: ../libpurple/savedstatuses.c:535
 msgid "saved statuses"
 msgstr "儲存狀態"
@@ -13572,14 +13590,14 @@
 #: ../libpurple/server.c:302
 #, c-format
 msgid "Requesting %s's attention..."
-msgstr ""
+msgstr "要求 %s 的注意中..."
 
 #: ../libpurple/server.c:347
 #, c-format
 msgid "%s has requested your attention!"
-msgstr ""
-
-#: ../libpurple/server.c:796
+msgstr "%s 要求你注意!"
+
+#: ../libpurple/server.c:793
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -13588,23 +13606,22 @@
 "%s 邀請 %s 到聊天室「%s」:\n"
 "%s"
 
-#: ../libpurple/server.c:801
+#: ../libpurple/server.c:798
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s 邀請了 %s 到聊天室「%s」:\n"
 
-#: ../libpurple/server.c:805
+#: ../libpurple/server.c:802
 msgid "Accept chat invitation?"
 msgstr "接受邀請嗎?"
 
 # FIXME ambiguous - 20061025
-# NOTE Jabber 協定 Stream Error 的一種,即 <remote-connection-failed/>
-# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-# XXX 真正的意思是「無法連線至認證所需的遠端資源」,不是「連線失敗」(見上列文章)
+# NOTE Jabber 協定 Stream Error 的一種,即 <remote-connection-failed/>
+# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
+# XXX 真正的意思是「無法連線至認證所需的遠端資源」,不是「連線失敗」(見上列文章)
 #: ../libpurple/sslconn.c:164
-#, fuzzy
 msgid "SSL Connection Failed"
-msgstr "無法連線至認證所需的遠端資源"
+msgstr "SSL 連線失敗"
 
 #: ../libpurple/sslconn.c:166
 msgid "SSL Handshake Failed"
@@ -13612,24 +13629,22 @@
 
 #: ../libpurple/sslconn.c:168
 msgid "SSL peer presented an invalid certificate"
-msgstr ""
+msgstr "SSL peer 出示了無效的證書"
 
 #: ../libpurple/sslconn.c:171
-#, fuzzy
 msgid "Unknown SSL error"
-msgstr "未知錯誤"
+msgstr "未知的 SSL 錯誤"
 
 #: ../libpurple/status.c:153
 msgid "Unset"
 msgstr "取消設定"
 
-#: ../libpurple/status.c:156 ../pidgin/gtkstatusbox.c:1059
-#, fuzzy
+#: ../libpurple/status.c:156 ../pidgin/gtkdocklet.c:553
+#: ../pidgin/gtkstatusbox.c:1059
 msgid "Do not disturb"
 msgstr "請勿打擾"
 
 #: ../libpurple/status.c:159
-#, fuzzy
 msgid "Extended away"
 msgstr "長時間離開"
 
@@ -13637,138 +13652,156 @@
 msgid "Mobile"
 msgstr "使用流動通訊器材"
 
-#: ../libpurple/status.c:609
+#: ../libpurple/status.c:161
+msgid "Listening to music"
+msgstr "聽音樂中"
+
+#: ../libpurple/status.c:610
 #, c-format
 msgid "%s changed status from %s to %s"
 msgstr "%s 從「%s」狀態改變為「%s」"
 
-#: ../libpurple/status.c:619
+#: ../libpurple/status.c:613
+#, c-format
+msgid "%s (%s) changed status from %s to %s"
+msgstr "%s (%s) 從「%s」狀態改變為「%s」"
+
+#: ../libpurple/status.c:624
 #, c-format
 msgid "%s is now %s"
 msgstr "%s 目前為%s"
 
-#: ../libpurple/status.c:624
+#: ../libpurple/status.c:626
+#, c-format
+msgid "%s (%s) is now %s"
+msgstr "%s (%s) 目前為%s"
+
+#: ../libpurple/status.c:632
 #, c-format
 msgid "%s is no longer %s"
 msgstr "%s 不再%s"
 
-#: ../libpurple/status.c:1234
+#: ../libpurple/status.c:634
+#, c-format
+msgid "%s (%s) is no longer %s"
+msgstr "%s (%s) 不再%s"
+
+#: ../libpurple/status.c:1247
 #, c-format
 msgid "%s became idle"
 msgstr "%s 更改狀態為閒置"
 
-#: ../libpurple/status.c:1251
+#: ../libpurple/status.c:1264
 #, c-format
 msgid "%s became unidle"
 msgstr "%s 不再閒置"
 
-#: ../libpurple/status.c:1314
+#: ../libpurple/status.c:1327
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s 更改狀態為閒置"
 
-#: ../libpurple/status.c:1316
+#: ../libpurple/status.c:1329
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s 不再閒置"
 
-#: ../libpurple/util.c:718
+#: ../libpurple/util.c:721
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2722
+#: ../libpurple/util.c:2783
 #, c-format
 msgid "Error Reading %s"
 msgstr "讀取 %s 途中發生了錯誤"
 
-# NOTE 「They」是什麼呢?譯成「它們」的話,「它們」又是什麼呢?寫長一點好了。
-#: ../libpurple/util.c:2723
+# NOTE 「They」是什麼呢?譯成「它們」的話,「它們」又是什麼呢?寫長一點好了。
+#: ../libpurple/util.c:2784
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
 "the old file has been renamed to %s~."
-msgstr ""
-"在解析你的%s時發生錯誤。檔案內的資料並沒有被讀入,同時舊檔案已移至 %s~。"
-
-#: ../libpurple/util.c:3223
+msgstr "在解析你的%s時發生錯誤。檔案內的資料並沒有被讀入,同時舊檔案已移至 %s~。"
+
+#: ../libpurple/util.c:3281
 msgid "Calculating..."
 msgstr "計算中..."
 
-#: ../libpurple/util.c:3226
+#: ../libpurple/util.c:3284
 msgid "Unknown."
 msgstr "未知。"
 
-#: ../libpurple/util.c:3252
+#: ../libpurple/util.c:3310
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d 秒"
 msgstr[1] "%d 秒"
 
-#: ../libpurple/util.c:3264
+#: ../libpurple/util.c:3322
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d 日"
 msgstr[1] "%d 日"
 
-#: ../libpurple/util.c:3272
+#: ../libpurple/util.c:3330
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s %d 小時"
 msgstr[1] "%s %d 小時"
 
-#: ../libpurple/util.c:3278
+#: ../libpurple/util.c:3336
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d 小時"
 msgstr[1] "%d 小時"
 
-#: ../libpurple/util.c:3286
+#: ../libpurple/util.c:3344
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s %d 分"
 msgstr[1] "%s %d 分"
 
-#: ../libpurple/util.c:3292
+#: ../libpurple/util.c:3350
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d 分"
 msgstr[1] "%d 分"
 
-#: ../libpurple/util.c:3552
+#: ../libpurple/util.c:3610
 #, c-format
 msgid "Could not open %s: Redirected too many times"
-msgstr ""
-
-#: ../libpurple/util.c:3589 ../libpurple/util.c:3885
+msgstr "無法打開 %s:重新導向的次數超過了上限"
+
+#: ../libpurple/util.c:3647 ../libpurple/util.c:3943
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "無法連線到「%s」"
 
-#: ../libpurple/util.c:3712
+#: ../libpurple/util.c:3770
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
 "server may be trying something malicious."
 msgstr "無法為讀入「%s」取得足夠的記憶體,網站的伺服器可能懷有惡意。"
 
-#: ../libpurple/util.c:3747
+#: ../libpurple/util.c:3805
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "讀入 %s 途中發生錯誤:%s"
 
-#: ../libpurple/util.c:3778
+#: ../libpurple/util.c:3836
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "寫入 %s 途中發生了錯誤:%s"
 
-#: ../libpurple/util.c:3803
+#: ../libpurple/util.c:3861
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "無法連線到 %s:%s"
@@ -13785,91 +13818,85 @@
 msgid "Send instant messages over multiple protocols"
 msgstr "透過多種通訊協定發送即時訊息"
 
-#: ../pidgin/eggtrayicon.c:129
+#: ../pidgin/eggtrayicon.c:128
 msgid "Orientation"
 msgstr "方向"
 
 #  NOTE: stolen from eggcups' zh_TW.po
-#: ../pidgin/eggtrayicon.c:130
+#: ../pidgin/eggtrayicon.c:129
 msgid "The orientation of the tray."
 msgstr "系統匣方向"
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:407
+#: ../pidgin/gtkaccount.c:410
 msgid "Login Options"
 msgstr "登入選項"
 
-#: ../pidgin/gtkaccount.c:428
-#, fuzzy
+#: ../pidgin/gtkaccount.c:431
 msgid "Pro_tocol:"
-msgstr "通訊協定:"
-
-#: ../pidgin/gtkaccount.c:439
-#, fuzzy
+msgstr "通訊協定(_T):"
+
+#: ../pidgin/gtkaccount.c:442
 msgid "Screen _name:"
-msgstr "帳號:"
-
-# NOTE Debian 譯「local」為「本地端」,「本機」是Windows譯法,但在這裏好像比較妥當
+msgstr "帳號(_N):"
+
+# NOTE Debian 譯「local」為「本地端」,「本機」是Windows譯法,但在這裏好像比較妥當
 # XXX
-#: ../pidgin/gtkaccount.c:529
-#, fuzzy
+#: ../pidgin/gtkaccount.c:532
 msgid "_Local alias:"
-msgstr "帳號別名(只在本機生效):"
-
-#: ../pidgin/gtkaccount.c:533
-#, fuzzy
+msgstr "帳號別名(只在本機生效)(_L):"
+
+#: ../pidgin/gtkaccount.c:536
 msgid "Remember pass_word"
-msgstr "記住密碼"
+msgstr "記住密碼(_W)"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:591
+#: ../pidgin/gtkaccount.c:594
 msgid "User Options"
 msgstr "使用者自定選項"
 
-#: ../pidgin/gtkaccount.c:604
-#, fuzzy
+#: ../pidgin/gtkaccount.c:607
 msgid "New _mail notifications"
-msgstr "新郵件通知"
+msgstr "新郵件通知(_M)"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:609
-#, fuzzy
+#: ../pidgin/gtkaccount.c:612
 msgid "Use this buddy _icon for this account:"
-msgstr "使用下列好友圖示:"
+msgstr "使用下列好友圖示(_I):"
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:731
+#: ../pidgin/gtkaccount.c:734
 #, c-format
 msgid "%s Options"
 msgstr "%s 選項"
 
-#: ../pidgin/gtkaccount.c:936
+#: ../pidgin/gtkaccount.c:939
 msgid "Use GNOME Proxy Settings"
 msgstr "使用 GNOME 的代理伺服器設定"
 
-#: ../pidgin/gtkaccount.c:937
+#: ../pidgin/gtkaccount.c:940
 msgid "Use Global Proxy Settings"
 msgstr "使用全域的代理伺服器設定"
 
-# NOTE 可以有代理伺服器但毋須用
-# NOTE 香港普遍用「毋須」,但講國語「毋須」會不通順,「不使用」較好
-#: ../pidgin/gtkaccount.c:943
+# NOTE 可以有代理伺服器但毋須用
+# NOTE 香港普遍用「毋須」,但講國語「毋須」會不通順,「不使用」較好
+#: ../pidgin/gtkaccount.c:946
 msgid "No Proxy"
 msgstr "不使用代理伺服器"
 
-#: ../pidgin/gtkaccount.c:949
+#: ../pidgin/gtkaccount.c:952
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:955
+#: ../pidgin/gtkaccount.c:958
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:961
+#: ../pidgin/gtkaccount.c:964
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1211
+#: ../pidgin/gtkaccount.c:970 ../pidgin/gtkprefs.c:1283
 msgid "Use Environmental Settings"
 msgstr "使用環境變數設定"
 
@@ -13878,73 +13905,72 @@
 #. A) your network is really slow and you have nothing better to do than
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
-#: ../pidgin/gtkaccount.c:1006
+#: ../pidgin/gtkaccount.c:1009
 msgid "If you look real closely"
 msgstr "如果你看得夠仔細"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:1009
+#: ../pidgin/gtkaccount.c:1012
 msgid "you can see the butterflies mating"
 msgstr "鴛鴦蝴蝶也看得見耶"
 
-#: ../pidgin/gtkaccount.c:1030
+#: ../pidgin/gtkaccount.c:1033
 msgid "Proxy Options"
 msgstr "代理伺服器選項"
 
-#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1205
+#: ../pidgin/gtkaccount.c:1047 ../pidgin/gtkprefs.c:1277
 msgid "Proxy _type:"
 msgstr "代理伺服器型態(_T):"
 
-#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1226
+#: ../pidgin/gtkaccount.c:1056 ../pidgin/gtkprefs.c:1298
 msgid "_Host:"
 msgstr "主機位址(_H):"
 
-#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1244
+#: ../pidgin/gtkaccount.c:1060 ../pidgin/gtkprefs.c:1316
 msgid "_Port:"
 msgstr "通訊埠(_P):"
 
-#: ../pidgin/gtkaccount.c:1065
+#: ../pidgin/gtkaccount.c:1068
 msgid "_Username:"
 msgstr "使用者(_U):"
 
-#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1281
+#: ../pidgin/gtkaccount.c:1075 ../pidgin/gtkprefs.c:1353
 msgid "Pa_ssword:"
 msgstr "密碼(_S):"
 
-#: ../pidgin/gtkaccount.c:1195
-#, fuzzy
+#: ../pidgin/gtkaccount.c:1199
 msgid "Unable to save new account"
-msgstr "無法建立連結"
-
-#: ../pidgin/gtkaccount.c:1196
+msgstr "無法儲存新帳號"
+
+#: ../pidgin/gtkaccount.c:1200
 msgid "An account already exists with the specified criteria."
-msgstr ""
-
-#: ../pidgin/gtkaccount.c:1473
+msgstr "已有一個乎合指定條件的帳號。"
+
+#: ../pidgin/gtkaccount.c:1478
 msgid "Add Account"
 msgstr "新增帳號"
 
-#: ../pidgin/gtkaccount.c:1492
+#: ../pidgin/gtkaccount.c:1497
 msgid "_Basic"
 msgstr "基本設定(_B)"
 
-#: ../pidgin/gtkaccount.c:1499
+#: ../pidgin/gtkaccount.c:1504
 msgid "Create this new account on the server"
-msgstr ""
-
-#: ../pidgin/gtkaccount.c:1515
+msgstr "在伺服器上建立這個新帳號"
+
+#: ../pidgin/gtkaccount.c:1520
 msgid "_Advanced"
 msgstr "進階設定(_A)"
 
-#: ../pidgin/gtkaccount.c:1973 ../pidgin/gtkplugin.c:569
+#: ../pidgin/gtkaccount.c:1978 ../pidgin/gtkplugin.c:595
 msgid "Enabled"
 msgstr "啟動"
 
-#: ../pidgin/gtkaccount.c:2001
+#: ../pidgin/gtkaccount.c:2006
 msgid "Protocol"
 msgstr "通訊協定"
 
-#: ../pidgin/gtkaccount.c:2201
+#: ../pidgin/gtkaccount.c:2207
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -13959,260 +13985,279 @@
 msgstr ""
 "<span size='larger' weight='bold'>歡迎使用 %s!</span>\n"
 "\n"
-"你尚未設定任何即時通訊的帳號。要使用 %s 來通訊,請先按下面的「加入」按紐,再"
-"設定好你的帳號即可。如果你希望 %s 使用多個即時通訊帳號,可在完成上一步後,繼"
-"續按「加入」按紐來設定其他的帳號。\n"
-"\n"
-"你如果希望新增、修改或刪除帳號,只要透過好友清單上的「帳號->新增/編輯」指"
-"令,即可返回這個畫面。"
-
-# TODO 看起來應該為加一個新的聊天室,並把聊天室歸類到某個群組。
-# NOTE 譯文更動 by Paladin
-#: ../pidgin/gtkblist.c:767
-msgid "Join a Chat"
-msgstr "加入聊天室"
-
-#: ../pidgin/gtkblist.c:788
+"你尚未設定任何即時通訊的帳號。要使用 %s 來通訊,請先按下面的「加入」按紐,再設定好你的帳號即可。如果你希望 %s 使用多個即時通訊帳號,可在完成上一步後,繼續按「加入」按紐來設定其他的帳號。\n"
+"\n"
+"你如果希望新增、修改或刪除帳號,只要透過好友清單上的「帳號->新增/編輯」指令,即可返回這個畫面。"
+
+#: ../pidgin/gtkblist.c:543
+#, c-format
+msgid "You have %d contact named %s. Would you like to merge them?"
+msgid_plural ""
+"You currently have %d contacts named %s. Would you like to merge them?"
+msgstr[0] "你目前有 %d 個稱為「%s」的好友,你要把這個好友合併嗎?"
+msgstr[1] "你目前有 %d 個稱為「%s」的好友,你要把這些好友合併嗎?"
+
+#: ../pidgin/gtkblist.c:544
+msgid ""
+"Merging these contacts will cause them to share a single entry on the buddy "
+"list and use a single conversation window. You can separate them again by "
+"choosing 'Expand' from the contact's context menu"
+msgstr "合併後,這些好友在好友清單將只出現一次,通訊時也會共用一個交談視窗。如果希望把這些好友再次分開,在好友清單中以滑鼠右鍵點擊好友名稱,再選擇「展開」即可。"
+
+#: ../pidgin/gtkblist.c:546
+msgid "_Merge"
+msgstr "合併(_M)"
+
+#: ../pidgin/gtkblist.c:961
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "請輸入關於你所想加入好友清單的聊天室的適當資訊。\n"
 
-#. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:799 ../pidgin/gtkblist.c:5530
-#: ../pidgin/gtkblist.c:5893 ../pidgin/gtkpounce.c:539
-#: ../pidgin/gtkroomlist.c:396
+#: ../pidgin/gtkblist.c:972 ../pidgin/gtkblist.c:6560
+#: ../pidgin/gtkpounce.c:554 ../pidgin/gtkroomlist.c:709
 msgid "_Account:"
 msgstr "帳號(_A):"
 
-#: ../pidgin/gtkblist.c:1088 ../pidgin/gtkprivacy.c:603
-#: ../pidgin/gtkprivacy.c:617
+#: ../pidgin/gtkblist.c:1261 ../pidgin/gtkprivacy.c:605
+#: ../pidgin/gtkprivacy.c:619
 msgid "_Block"
 msgstr "封鎖(_B)"
 
-#: ../pidgin/gtkblist.c:1088
+#: ../pidgin/gtkblist.c:1261
 msgid "Un_block"
 msgstr "解除封鎖(_B)"
 
-#: ../pidgin/gtkblist.c:1139
+#: ../pidgin/gtkblist.c:1304
+msgid "Move to"
+msgstr "移至"
+
+#: ../pidgin/gtkblist.c:1344
 msgid "Get _Info"
 msgstr "取得資訊(_I)"
 
-#: ../pidgin/gtkblist.c:1142 ../pidgin/pidginstock.c:90
+#: ../pidgin/gtkblist.c:1347 ../pidgin/pidginstock.c:90
 msgid "I_M"
 msgstr "即時訊息(_M)"
 
-#: ../pidgin/gtkblist.c:1148
-#, fuzzy
-msgid "_Send File"
-msgstr "傳送檔案"
-
-#: ../pidgin/gtkblist.c:1155
-msgid "Add Buddy _Pounce"
-msgstr "加入好友狀態捕捉(_P)"
-
-#: ../pidgin/gtkblist.c:1160 ../pidgin/gtkblist.c:1164
-#: ../pidgin/gtkblist.c:1269 ../pidgin/gtkblist.c:1292
+#: ../pidgin/gtkblist.c:1353
+msgid "_Send File..."
+msgstr "傳送檔案(_S)..."
+
+#: ../pidgin/gtkblist.c:1360
+msgid "Add Buddy _Pounce..."
+msgstr "加入好友狀態捕捉(_P)..."
+
+#: ../pidgin/gtkblist.c:1365 ../pidgin/gtkblist.c:1369
+#: ../pidgin/gtkblist.c:1484 ../pidgin/gtkblist.c:1507
 msgid "View _Log"
 msgstr "觀看日誌(_L)"
 
-#: ../pidgin/gtkblist.c:1177 ../pidgin/gtkblist.c:1186
-#: ../pidgin/gtkblist.c:1277 ../pidgin/gtkblist.c:1298
+#: ../pidgin/gtkblist.c:1375
+msgid "Hide when offline"
+msgstr "離線時隱藏"
+
+#: ../pidgin/gtkblist.c:1375
+msgid "Show when offline"
+msgstr "離線時顯示"
+
+#: ../pidgin/gtkblist.c:1389 ../pidgin/gtkblist.c:1398
+#: ../pidgin/gtkblist.c:1492 ../pidgin/gtkblist.c:1513
 msgid "_Alias..."
 msgstr "別名(_A)..."
 
-#: ../pidgin/gtkblist.c:1180 ../pidgin/gtkblist.c:1188
-#: ../pidgin/gtkblist.c:1279 ../pidgin/gtkblist.c:1300
+#: ../pidgin/gtkblist.c:1392 ../pidgin/gtkblist.c:1400
+#: ../pidgin/gtkblist.c:1494 ../pidgin/gtkblist.c:1515
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: ../pidgin/gtkblist.c:1238
-msgid "Add a _Buddy"
-msgstr "新增一個好友(_B)"
-
-#: ../pidgin/gtkblist.c:1241
-msgid "Add a C_hat"
-msgstr "新增一個聊天室(_H)"
-
-#: ../pidgin/gtkblist.c:1244
+#: ../pidgin/gtkblist.c:1450
+msgid "Add _Buddy..."
+msgstr "新增好友(_B)..."
+
+#: ../pidgin/gtkblist.c:1453
+msgid "Add C_hat..."
+msgstr "新增聊天室(_H)..."
+
+#: ../pidgin/gtkblist.c:1456
 msgid "_Delete Group"
 msgstr "刪除羣組(_D)"
 
-#: ../pidgin/gtkblist.c:1246
+#: ../pidgin/gtkblist.c:1458
 msgid "_Rename"
 msgstr "重命名(_R)"
 
 #. join button
-#: ../pidgin/gtkblist.c:1265 ../pidgin/gtkroomlist.c:307
-#: ../pidgin/gtkroomlist.c:460 ../pidgin/pidginstock.c:88
+#: ../pidgin/gtkblist.c:1478 ../pidgin/gtkroomlist.c:316
+#: ../pidgin/gtkroomlist.c:773 ../pidgin/pidginstock.c:88
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: ../pidgin/gtkblist.c:1267
+#: ../pidgin/gtkblist.c:1480
 msgid "Auto-Join"
 msgstr "自動加入"
 
-#: ../pidgin/gtkblist.c:1305 ../pidgin/gtkblist.c:1329
+# NOTE clarified by rekkanoryo on 20070920 in #pidgin:
+# NOTE (20時19分49秒) wing: another question... what exactly does "Persistent" in gtkblist.c:1466 refer to?
+# NOTE (20時37分09秒) rekkanoryo: wing: if you select that option, then close the chat, you don't actually leave.  History builds, and when you double-click the chat in the buddy list again, it opens complete with all the history
+#: ../pidgin/gtkblist.c:1482
+msgid "Persistent"
+msgstr "保持連線"
+
+#: ../pidgin/gtkblist.c:1520 ../pidgin/gtkblist.c:1543
 msgid "_Collapse"
 msgstr "收起(_C)"
 
-#: ../pidgin/gtkblist.c:1334
+#: ../pidgin/gtkblist.c:1548
 msgid "_Expand"
 msgstr "展開(_E)"
 
-#: ../pidgin/gtkblist.c:1585 ../pidgin/gtkblist.c:1597
-#: ../pidgin/gtkblist.c:4603 ../pidgin/gtkblist.c:4616
+#: ../pidgin/gtkblist.c:1799 ../pidgin/gtkblist.c:1811
+#: ../pidgin/gtkblist.c:5225 ../pidgin/gtkblist.c:5238
 msgid "/Tools/Mute Sounds"
 msgstr "/工具/靜音"
 
-# XXX 暫譯
-#: ../pidgin/gtkblist.c:2057 ../pidgin/gtkconv.c:4840
-#: ../pidgin/gtkpounce.c:430
+# XXX 暫譯
+#: ../pidgin/gtkblist.c:2271 ../pidgin/gtkconv.c:4922
+#: ../pidgin/gtkpounce.c:437
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "你並未登入任何一個可供你新增哪個好友的通訊協定。"
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2869
+#: ../pidgin/gtkblist.c:3103
 msgid "/_Buddies"
 msgstr "/好友(_B)"
 
-#: ../pidgin/gtkblist.c:2870
+#: ../pidgin/gtkblist.c:3104
 msgid "/Buddies/New Instant _Message..."
 msgstr "/好友/新即時訊息(_M)"
 
-#: ../pidgin/gtkblist.c:2871
+#: ../pidgin/gtkblist.c:3105
 msgid "/Buddies/Join a _Chat..."
 msgstr "/好友/加入聊天室(_C)"
 
-#: ../pidgin/gtkblist.c:2872
+#: ../pidgin/gtkblist.c:3106
 msgid "/Buddies/Get User _Info..."
 msgstr "/好友/取得使用者資訊(_I)..."
 
-#  NOTE 此處譯「讀取」似乎較「取得」好一點
-#: ../pidgin/gtkblist.c:2873
+#  NOTE 此處譯「讀取」似乎較「取得」好一點
+#: ../pidgin/gtkblist.c:3107
 msgid "/Buddies/View User _Log..."
 msgstr "/好友/讀取使用者日誌(_L)..."
 
-#: ../pidgin/gtkblist.c:2875
-#, fuzzy
-msgid "/Buddies/Show"
-msgstr "/好友(_B)"
-
-#: ../pidgin/gtkblist.c:2876
-#, fuzzy
+#: ../pidgin/gtkblist.c:3109
+msgid "/Buddies/Sh_ow"
+msgstr "/好友/顯示(_O)"
+
+#: ../pidgin/gtkblist.c:3110
 msgid "/Buddies/Show/_Offline Buddies"
-msgstr "/好友/顯示離線好友(_O)"
-
-#: ../pidgin/gtkblist.c:2877
-#, fuzzy
+msgstr "/好友/顯示/離線好友(_O)"
+
+#: ../pidgin/gtkblist.c:3111
 msgid "/Buddies/Show/_Empty Groups"
-msgstr "/好友/顯示空白的羣組(_E)"
-
-#: ../pidgin/gtkblist.c:2878
-#, fuzzy
+msgstr "/好友/顯示/空白羣組(_E)"
+
+#: ../pidgin/gtkblist.c:3112
 msgid "/Buddies/Show/Buddy _Details"
-msgstr "/好友/顯示好友細節(_D)"
-
-#: ../pidgin/gtkblist.c:2879
-#, fuzzy
+msgstr "/好友/顯示/好友細節(_D)"
+
+#: ../pidgin/gtkblist.c:3113
 msgid "/Buddies/Show/Idle _Times"
-msgstr "/好友/顯示閒置時間(_T)"
-
-#: ../pidgin/gtkblist.c:2880
-#, fuzzy
+msgstr "/好友/顯示/閒置時間(_T)"
+
+#: ../pidgin/gtkblist.c:3114
 msgid "/Buddies/Show/_Protocol Icons"
-msgstr "/好友/顯示空白的羣組(_E)"
-
-#: ../pidgin/gtkblist.c:2881
+msgstr "/好友/顯示/通訊協定圖示(_P)"
+
+#: ../pidgin/gtkblist.c:3115
 msgid "/Buddies/_Sort Buddies"
 msgstr "/好友/好友清單排序(_S)"
 
-#: ../pidgin/gtkblist.c:2883
+#: ../pidgin/gtkblist.c:3117
 msgid "/Buddies/_Add Buddy..."
 msgstr "/好友/新增好友(_A)..."
 
-#: ../pidgin/gtkblist.c:2884
+#: ../pidgin/gtkblist.c:3118
 msgid "/Buddies/Add C_hat..."
 msgstr "/好友/新增聊天室(_H)..."
 
-#: ../pidgin/gtkblist.c:2885
+#: ../pidgin/gtkblist.c:3119
 msgid "/Buddies/Add _Group..."
 msgstr "/好友/新增羣組(_G)..."
 
-#: ../pidgin/gtkblist.c:2887
+#: ../pidgin/gtkblist.c:3121
 msgid "/Buddies/_Quit"
 msgstr "/好友/結束程式(_Q)"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2890
+#: ../pidgin/gtkblist.c:3124
 msgid "/_Accounts"
 msgstr "/帳號(_A)"
 
-#: ../pidgin/gtkblist.c:2891 ../pidgin/gtkblist.c:6589
-msgid "/Accounts/Add\\/Edit"
-msgstr "/帳號(_A)/新增\\/編輯"
+#: ../pidgin/gtkblist.c:3125 ../pidgin/gtkblist.c:7262
+msgid "/Accounts/Manage"
+msgstr "/帳號/管理"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2894
+#: ../pidgin/gtkblist.c:3128
 msgid "/_Tools"
 msgstr "工具(_T)"
 
-#: ../pidgin/gtkblist.c:2895
+#: ../pidgin/gtkblist.c:3129
 msgid "/Tools/Buddy _Pounces"
 msgstr "/工具/好友狀態捕捉(_P)"
 
-#: ../pidgin/gtkblist.c:2896
-#, fuzzy
+#: ../pidgin/gtkblist.c:3130
 msgid "/Tools/_Certificates"
-msgstr "/工具/偏好設定(_E)"
-
-#: ../pidgin/gtkblist.c:2897
+msgstr "/工具/證書(_C)"
+
+#: ../pidgin/gtkblist.c:3131
 msgid "/Tools/Plu_gins"
 msgstr "/工具/模組(_G)"
 
-#: ../pidgin/gtkblist.c:2898
+#: ../pidgin/gtkblist.c:3132
 msgid "/Tools/Pr_eferences"
 msgstr "/工具/偏好設定(_E)"
 
-#: ../pidgin/gtkblist.c:2899
+#: ../pidgin/gtkblist.c:3133
 msgid "/Tools/Pr_ivacy"
 msgstr "/工具/私隱設定(_I)"
 
-#: ../pidgin/gtkblist.c:2901
+#: ../pidgin/gtkblist.c:3135
 msgid "/Tools/_File Transfers"
 msgstr "/工具/檔案傳輸(_F)"
 
-#: ../pidgin/gtkblist.c:2902
+#: ../pidgin/gtkblist.c:3136
 msgid "/Tools/R_oom List"
 msgstr "/工具/聊天室清單(_O)"
 
-#: ../pidgin/gtkblist.c:2903
+#: ../pidgin/gtkblist.c:3137
 msgid "/Tools/System _Log"
 msgstr "/工具/系統日誌(_L)"
 
-#: ../pidgin/gtkblist.c:2905
+#: ../pidgin/gtkblist.c:3139
 msgid "/Tools/Mute _Sounds"
 msgstr "/工具/靜音(_S)"
 
 #. Help
-#: ../pidgin/gtkblist.c:2907
+#: ../pidgin/gtkblist.c:3141
 msgid "/_Help"
-msgstr "說明(_H)"
-
-#: ../pidgin/gtkblist.c:2908
+msgstr "/說明(_H)"
+
+#: ../pidgin/gtkblist.c:3142
 msgid "/Help/Online _Help"
-msgstr "網上說明(_H)"
-
-#: ../pidgin/gtkblist.c:2909
+msgstr "/說明/網上說明(_H)"
+
+#: ../pidgin/gtkblist.c:3143
 msgid "/Help/_Debug Window"
 msgstr "/說明/除錯視窗(_D)"
 
-#: ../pidgin/gtkblist.c:2911 ../pidgin/gtkblist.c:2913
+#: ../pidgin/gtkblist.c:3145 ../pidgin/gtkblist.c:3147
 msgid "/Help/_About"
 msgstr "/說明/關於(_A)"
 
-#: ../pidgin/gtkblist.c:2942
+#: ../pidgin/gtkblist.c:3176
 #, c-format
 msgid ""
 "\n"
@@ -14221,727 +14266,719 @@
 "\n"
 "<b>帳號:</b>%s"
 
-#: ../pidgin/gtkblist.c:3020
+#: ../pidgin/gtkblist.c:3254
 msgid "Buddy Alias"
 msgstr "好友別名"
 
-#: ../pidgin/gtkblist.c:3049
+#: ../pidgin/gtkblist.c:3283
 msgid "Logged In"
 msgstr "已登入"
 
-#: ../pidgin/gtkblist.c:3095
+#: ../pidgin/gtkblist.c:3329
 msgid "Last Seen"
 msgstr "上次登入"
 
-# XXX
-#: ../pidgin/gtkblist.c:3116
+# XXX「Spooky」一般來說只是「恐怖」,不一定是「幽靈似的」才算「Spooky」
+#: ../pidgin/gtkblist.c:3350
 msgid "Spooky"
 msgstr "幽靈似的"
 
-#: ../pidgin/gtkblist.c:3118
+#: ../pidgin/gtkblist.c:3352
 msgid "Awesome"
 msgstr "頂呱呱"
 
-#: ../pidgin/gtkblist.c:3120
+#: ../pidgin/gtkblist.c:3354
 msgid "Rockin'"
 msgstr "頂呱呱"
 
-#: ../pidgin/gtkblist.c:3453
-#, fuzzy, c-format
+#: ../pidgin/gtkblist.c:3693
+#, c-format
 msgid "Idle %dd %dh %02dm"
-msgstr "閒置 %d 小時 %02d 分"
-
-#: ../pidgin/gtkblist.c:3455
+msgstr "閒置 %d 日 %d 小時 %02d 分"
+
+#: ../pidgin/gtkblist.c:3695
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "閒置 %d 小時 %02d 分"
 
-#: ../pidgin/gtkblist.c:3457
+#: ../pidgin/gtkblist.c:3697
 #, c-format
 msgid "Idle %dm"
 msgstr "閒置 %d 分"
 
-#: ../pidgin/gtkblist.c:3602
+#: ../pidgin/gtkblist.c:3851
 msgid "/Buddies/New Instant Message..."
 msgstr "/好友/新即時訊息..."
 
-#: ../pidgin/gtkblist.c:3603 ../pidgin/gtkblist.c:3636
+#: ../pidgin/gtkblist.c:3852 ../pidgin/gtkblist.c:3885
 msgid "/Buddies/Join a Chat..."
 msgstr "/好友/加入聊天室(_C)..."
 
-#: ../pidgin/gtkblist.c:3604
+#: ../pidgin/gtkblist.c:3853
 msgid "/Buddies/Get User Info..."
 msgstr "/好友/取得使用者資訊..."
 
-#: ../pidgin/gtkblist.c:3605
+#: ../pidgin/gtkblist.c:3854
 msgid "/Buddies/Add Buddy..."
 msgstr "/好友/新增好友..."
 
-#: ../pidgin/gtkblist.c:3606 ../pidgin/gtkblist.c:3639
+#: ../pidgin/gtkblist.c:3855 ../pidgin/gtkblist.c:3888
 msgid "/Buddies/Add Chat..."
 msgstr "/好友/新增聊天室..."
 
-#: ../pidgin/gtkblist.c:3607
+#: ../pidgin/gtkblist.c:3856
 msgid "/Buddies/Add Group..."
 msgstr "/好友/新增羣組..."
 
-#: ../pidgin/gtkblist.c:3642
+#: ../pidgin/gtkblist.c:3891
 msgid "/Tools/Privacy"
 msgstr "/工具/私隱設定"
 
-#: ../pidgin/gtkblist.c:3645
+#: ../pidgin/gtkblist.c:3894
 msgid "/Tools/Room List"
 msgstr "/工具/聊天室清單"
 
-#: ../pidgin/gtkblist.c:3742 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:4026 ../pidgin/gtkdocklet.c:155
+#: ../pidgin/gtkdocklet.c:160
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d 個由 %s 發出的未讀取訊息\n"
 msgstr[1] "%d 個由 %s 發出的未讀取訊息\n"
 
-#: ../pidgin/gtkblist.c:3822
+#: ../pidgin/gtkblist.c:4189
 msgid "Manually"
 msgstr "使用者自定"
 
-#: ../pidgin/gtkblist.c:3824
-msgid "Alphabetically"
-msgstr "根據字母"
-
-#: ../pidgin/gtkblist.c:3825
+#: ../pidgin/gtkblist.c:4192
 msgid "By status"
-msgstr "根據狀態"
-
-#: ../pidgin/gtkblist.c:3826
+msgstr "根據照狀態"
+
+#: ../pidgin/gtkblist.c:4193
 msgid "By log size"
-msgstr "根據日誌大小"
-
-#: ../pidgin/gtkblist.c:4031 ../pidgin/gtkconn.c:179
+msgstr "根據照日誌大小"
+
+#: ../pidgin/gtkblist.c:4483
 #, c-format
 msgid "%s disconnected"
 msgstr "%s 結束連線"
 
-#: ../pidgin/gtkblist.c:4067
-#, c-format
-msgid "<span color=\"red\">%s disconnected: %s</span>"
-msgstr "<span color=\"red\">%s 結束連線:%s</span>"
-
-#: ../pidgin/gtkblist.c:4219
+#: ../pidgin/gtkblist.c:4485
+#, c-format
+msgid "%s disabled"
+msgstr "%s 已被停用"
+
+#: ../pidgin/gtkblist.c:4489
+msgid "Reconnect"
+msgstr "重新連線"
+
+#: ../pidgin/gtkblist.c:4489 ../pidgin/gtkblist.c:4577
+msgid "Re-enable"
+msgstr "重新啟動"
+
+#  NOTE「Ignore」原譯「忽略使用者」,但 gtkprefs.c 中的「Ignore」
+#  NOTE 乃「忽略格式」的意思,故只能譯成「忽略」
+#: ../pidgin/gtkblist.c:4493 ../pidgin/gtkblist.c:4580
+#: ../pidgin/gtkconv.c:1679
+msgid "Ignore"
+msgstr "忽略"
+
+#: ../pidgin/gtkblist.c:4604
+#, c-format
+msgid "%d account was disabled because you signed on from another location."
+msgid_plural ""
+"%d accounts were disabled because you signed on from another location."
+msgstr[0] "%d個帳已被停用,因為你由其他的地方登入。"
+msgstr[1] "%d個帳已被停用,因為你由其他的地方登入。"
+
+#: ../pidgin/gtkblist.c:4831
 msgid "<b>Username:</b>"
 msgstr "<b>使用者名稱:</b>"
 
-#: ../pidgin/gtkblist.c:4226
+#: ../pidgin/gtkblist.c:4838
 msgid "<b>Password:</b>"
 msgstr "<b>密碼:</b>"
 
-#: ../pidgin/gtkblist.c:4237
+#: ../pidgin/gtkblist.c:4849
 msgid "_Login"
 msgstr "登入(_L)"
 
-#: ../pidgin/gtkblist.c:4320
+#: ../pidgin/gtkblist.c:4934
 msgid "/Accounts"
 msgstr "/帳號"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4334
-#, fuzzy, c-format
+#: ../pidgin/gtkblist.c:4948
+#, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
 "\n"
 "You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
-"b> window at <b>Accounts->Add/Edit</b>. Once you enable accounts, you'll be "
+"b> window at <b>Accounts->Manage</b>. Once you enable accounts, you'll be "
 "able to sign on, set your status, and talk to your friends."
 msgstr ""
 "<span weight='bold' size='larger'>歡迎使用 %s!</span>\n"
 "\n"
-"你未有啟動任何帳號,請透過好友清單上的「帳號->新增」指令,到「帳號清單」啟動"
-"帳號。帳號一經啟動,就隨時可以登入或更改狀態;這樣,你就可以跟你的好友通訊"
-"了!"
+"你未有啟動任何帳號,請透過好友清單上的「帳號->管理」指令,到「帳號清單」啟動帳號。帳號一經啟動,就隨時可以登入或更改狀態;這樣,你就可以跟你的好友通訊了!"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4597
-#, fuzzy
+#: ../pidgin/gtkblist.c:5219
 msgid "/Buddies/Show/Offline Buddies"
-msgstr "/好友/顯示離線好友"
-
-#: ../pidgin/gtkblist.c:4600
-#, fuzzy
+msgstr "/好友/顯示/離線好友"
+
+#: ../pidgin/gtkblist.c:5222
 msgid "/Buddies/Show/Empty Groups"
-msgstr "/好友/顯示空的好的羣組"
-
-#: ../pidgin/gtkblist.c:4606
-#, fuzzy
+msgstr "/好友/顯示/空羣組"
+
+#: ../pidgin/gtkblist.c:5228
 msgid "/Buddies/Show/Buddy Details"
-msgstr "/好友/顯示好友細節"
-
-#: ../pidgin/gtkblist.c:4609
-#, fuzzy
+msgstr "/好友/顯示/好友細節"
+
+#: ../pidgin/gtkblist.c:5231
 msgid "/Buddies/Show/Idle Times"
-msgstr "/好友/顯示閒置時間"
-
-#: ../pidgin/gtkblist.c:4612
-#, fuzzy
+msgstr "/好友/顯示/閒置時間"
+
+#: ../pidgin/gtkblist.c:5234
 msgid "/Buddies/Show/Protocol Icons"
-msgstr "/好友/顯示空的好的羣組"
-
-#: ../pidgin/gtkblist.c:5507
+msgstr "/好友/顯示/通訊協定圖示"
+
+#: ../pidgin/gtkblist.c:6166
 msgid ""
 "Please enter the screen name of the person you would like to add to your "
 "buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
 "The alias will be displayed in place of the screen name whenever possible.\n"
-msgstr ""
-"請輸入你所想要加入好友的帳號。你可以為這個好友設定別名或網名,而這個設定將會"
-"在好友清單中顯示。\n"
+msgstr "請輸入你所想要加入好友的帳號。你可以為這個好友設定別名或網名,而這個設定將會在好友清單中顯示。\n"
+
+#. Set up stuff for the account box
+#: ../pidgin/gtkblist.c:6189
+msgid "A_ccount:"
+msgstr "帳號(_C):"
 
 #. End of account box
-#: ../pidgin/gtkblist.c:5542
-#, fuzzy
+#: ../pidgin/gtkblist.c:6201
 msgid "_Screen name:"
-msgstr "帳號:"
-
-#: ../pidgin/gtkblist.c:5564 ../pidgin/gtkblist.c:5914
-#, fuzzy
+msgstr "帳號(_S):"
+
+#: ../pidgin/gtkblist.c:6223 ../pidgin/gtkblist.c:6581
 msgid "A_lias:"
-msgstr "別名:"
-
-#: ../pidgin/gtkblist.c:5826
+msgstr "別名(_L):"
+
+#: ../pidgin/gtkblist.c:6491
 msgid "This protocol does not support chat rooms."
 msgstr "這個通訊協定不支援聊天室。"
 
-#: ../pidgin/gtkblist.c:5842
+#: ../pidgin/gtkblist.c:6507
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "你並未登入任何一個可供你加入聊天室的通訊協定。"
 
-#: ../pidgin/gtkblist.c:5883
+#: ../pidgin/gtkblist.c:6550
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr "請輸入別名,或者關於你所想加入好友清單的聊天室的適當資訊。\n"
 
-#: ../pidgin/gtkblist.c:5964
+#: ../pidgin/gtkblist.c:6609
+msgid "Autojoin when account becomes online."
+msgstr "帳號上線後隨即自動加入。"
+
+#: ../pidgin/gtkblist.c:6610
+msgid "Hide chat when the window is closed."
+msgstr "關閉視窗時只將聊天隱藏。"
+
+#: ../pidgin/gtkblist.c:6636
 msgid "Please enter the name of the group to be added."
 msgstr "請給你新增的羣組輸入名稱。"
 
 # XXX
-#: ../pidgin/gtkblist.c:6609
+#: ../pidgin/gtkblist.c:7282
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/帳號/"
 
-#: ../pidgin/gtkblist.c:6633
+#: ../pidgin/gtkblist.c:7306
 msgid "_Edit Account"
 msgstr "編輯帳號(_E)"
 
-#  NOTE 這不是「不允許」而是「沒有」,尤其是在新的「模組相關指令」清單,
-#  NOTE 譯成「不允許」會非常怪
-#: ../pidgin/gtkblist.c:6646 ../pidgin/gtkconv.c:3073
+#  NOTE 這不是「不允許」而是「沒有」,尤其是在新的「模組相關指令」清單,
+#  NOTE 譯成「不允許」會非常怪
+#: ../pidgin/gtkblist.c:7319 ../pidgin/gtkconv.c:3146
 msgid "No actions available"
 msgstr "沒有相關指令"
 
-# #NOTE 和下一個「Enable Account」對應。
-#: ../pidgin/gtkblist.c:6654
+# #NOTE 和下一個「Enable Account」對應。
+#: ../pidgin/gtkblist.c:7327
 msgid "_Disable"
 msgstr "停用帳號(_D)"
 
-#: ../pidgin/gtkblist.c:6666
+#: ../pidgin/gtkblist.c:7339
 msgid "Enable Account"
 msgstr "啟動帳號"
 
 # XXX
-#: ../pidgin/gtkblist.c:6672
+#: ../pidgin/gtkblist.c:7345
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/帳號/啟動帳號"
 
-#: ../pidgin/gtkblist.c:6721
+#: ../pidgin/gtkblist.c:7394
 msgid "/Tools"
 msgstr "/工具"
 
-#: ../pidgin/gtkblist.c:6791
+#: ../pidgin/gtkblist.c:7464
 msgid "/Buddies/Sort Buddies"
 msgstr "/好友/好友清單排序"
 
 #. Widget creation function
-#: ../pidgin/gtkcertmgr.c:530
-#, fuzzy
+#: ../pidgin/gtkcertmgr.c:531
 msgid "SSL Servers"
-msgstr "伺服器"
-
-#: ../pidgin/gtkconn.c:180
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"%s will not attempt to reconnect the account until you correct the error and "
-"re-enable the account."
-msgstr ""
-"%s\n"
-"在你更正這個錯誤並重新啟動這個帳號前,%s 將不會再嘗試重新連線。"
-
-#: ../pidgin/gtkconv.c:482
-#, fuzzy
+msgstr "SSL 伺服器"
+
+#: ../pidgin/gtkconv.c:524
 msgid "Unknown command."
 msgstr "未知的指令"
 
-#: ../pidgin/gtkconv.c:754 ../pidgin/gtkconv.c:780
+#: ../pidgin/gtkconv.c:796 ../pidgin/gtkconv.c:822
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "該個好友與這個聊天並非使用同一種的通訊協定"
 
-# XXX 暫譯
-#: ../pidgin/gtkconv.c:774
+# XXX 暫譯
+#: ../pidgin/gtkconv.c:816
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr "你並未登入任何一個可供你邀請哪個好友的通訊協定。"
 
-#: ../pidgin/gtkconv.c:827
+#: ../pidgin/gtkconv.c:869
 msgid "Invite Buddy Into Chat Room"
 msgstr "邀請好友進入聊天室"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:857
+#: ../pidgin/gtkconv.c:899
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "請輸入你想邀請的使用者名稱,以及邀請的訊息。"
 
-#: ../pidgin/gtkconv.c:878
+#: ../pidgin/gtkconv.c:920
 msgid "_Buddy:"
 msgstr "好友(_B):"
 
-#: ../pidgin/gtkconv.c:889 ../pidgin/gtksavedstatuses.c:1194
-#: ../pidgin/gtksavedstatuses.c:1528
+#: ../pidgin/gtkconv.c:931 ../pidgin/gtksavedstatuses.c:1200
+#: ../pidgin/gtksavedstatuses.c:1536
 msgid "_Message:"
 msgstr "訊息(_M):"
 
-#: ../pidgin/gtkconv.c:947 ../pidgin/gtkconv.c:2598 ../pidgin/gtkdebug.c:219
-#: ../pidgin/gtkft.c:543
-msgid "Unable to open file."
-msgstr "無法開啟檔案。"
-
-#: ../pidgin/gtkconv.c:953
+#: ../pidgin/gtkconv.c:995
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>與 %s 的交談</h1>\n"
 
-#: ../pidgin/gtkconv.c:991
+#: ../pidgin/gtkconv.c:1033
 msgid "Save Conversation"
 msgstr "儲存聊天內容"
 
-#: ../pidgin/gtkconv.c:1140 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:743
+#: ../pidgin/gtkconv.c:1179 ../pidgin/gtkdebug.c:168 ../pidgin/gtkdebug.c:748
 msgid "Find"
 msgstr "搜尋"
 
-#: ../pidgin/gtkconv.c:1166 ../pidgin/gtkdebug.c:195
+#: ../pidgin/gtkconv.c:1205 ../pidgin/gtkdebug.c:196
 msgid "_Search for:"
 msgstr "搜尋(_S):"
 
-#: ../pidgin/gtkconv.c:1622
+#: ../pidgin/gtkconv.c:1676
 msgid "Un-Ignore"
 msgstr "取消忽略使用者"
 
-#  NOTE「Ignore」原譯「忽略使用者」,但 gtkprefs.c 中的「Ignore」
-#  NOTE 乃「忽略格式」的意思,故只能譯成「忽略」
-#: ../pidgin/gtkconv.c:1625
-msgid "Ignore"
-msgstr "忽略"
-
-#: ../pidgin/gtkconv.c:1645
+#: ../pidgin/gtkconv.c:1699
 msgid "Get Away Message"
 msgstr "取得離開訊息"
 
-#: ../pidgin/gtkconv.c:1668
+#: ../pidgin/gtkconv.c:1722
 msgid "Last said"
 msgstr "上次提到"
 
-#: ../pidgin/gtkconv.c:2606
+#: ../pidgin/gtkconv.c:2671
 msgid "Unable to save icon file to disk."
 msgstr "無法儲存圖示檔案至磁碟上。"
 
-#: ../pidgin/gtkconv.c:2657
+#: ../pidgin/gtkconv.c:2722
 msgid "Save Icon"
 msgstr "儲存圖示"
 
-#: ../pidgin/gtkconv.c:2709
+#: ../pidgin/gtkconv.c:2774
 msgid "Animate"
 msgstr "動畫"
 
-#: ../pidgin/gtkconv.c:2714
+#: ../pidgin/gtkconv.c:2779
 msgid "Hide Icon"
 msgstr "隱藏圖示"
 
-#  NOTE 這是Right-Click圖示時顯示的指令,譯「As」為「為」會很奇怪
-#: ../pidgin/gtkconv.c:2717
+#  NOTE 這是Right-Click圖示時顯示的指令,譯「As」為「為」會很奇怪
+#: ../pidgin/gtkconv.c:2782
 msgid "Save Icon As..."
 msgstr "儲存圖示..."
 
-#: ../pidgin/gtkconv.c:2721
+#: ../pidgin/gtkconv.c:2786
 msgid "Set Custom Icon..."
 msgstr "自定圖示..."
 
-#: ../pidgin/gtkconv.c:2734
+#: ../pidgin/gtkconv.c:2799
 msgid "Remove Custom Icon"
 msgstr "移除自定圖示"
 
-#: ../pidgin/gtkconv.c:2861
+#: ../pidgin/gtkconv.c:2931
 msgid "Show All"
-msgstr ""
+msgstr "全部顯示"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2880
+#: ../pidgin/gtkconv.c:2950
 msgid "/_Conversation"
 msgstr "/交談(_C)"
 
-#: ../pidgin/gtkconv.c:2882
+#: ../pidgin/gtkconv.c:2952
 msgid "/Conversation/New Instant _Message..."
 msgstr "/好友/新即時訊息(_M)..."
 
-#: ../pidgin/gtkconv.c:2887
+#: ../pidgin/gtkconv.c:2957
 msgid "/Conversation/_Find..."
 msgstr "/交談/搜尋(_F)..."
 
-#: ../pidgin/gtkconv.c:2889
+#: ../pidgin/gtkconv.c:2959
 msgid "/Conversation/View _Log"
 msgstr "/交談/觀看歷史記錄(_L)"
 
-#: ../pidgin/gtkconv.c:2890
+#: ../pidgin/gtkconv.c:2960
 msgid "/Conversation/_Save As..."
 msgstr "/交談/另存新檔(_S)..."
 
-#: ../pidgin/gtkconv.c:2892
+#: ../pidgin/gtkconv.c:2962
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/交談/清空交談內容(_R)"
 
-#: ../pidgin/gtkconv.c:2896
+#: ../pidgin/gtkconv.c:2966
 msgid "/Conversation/Se_nd File..."
 msgstr "/交談/傳送檔案(_N)..."
 
-#: ../pidgin/gtkconv.c:2897
+#: ../pidgin/gtkconv.c:2967
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/交談/新增好友狀態捕捉(_P)..."
 
-#: ../pidgin/gtkconv.c:2899
+#: ../pidgin/gtkconv.c:2969
 msgid "/Conversation/_Get Info"
 msgstr "/交談/取得資訊(_G)"
 
-#: ../pidgin/gtkconv.c:2901
+#: ../pidgin/gtkconv.c:2971
 msgid "/Conversation/In_vite..."
 msgstr "/交談/邀請(_V)..."
 
-#: ../pidgin/gtkconv.c:2903
+#: ../pidgin/gtkconv.c:2973
 msgid "/Conversation/M_ore"
 msgstr "/交談/更多(_O)"
 
-#: ../pidgin/gtkconv.c:2907
+#: ../pidgin/gtkconv.c:2977
 msgid "/Conversation/Al_ias..."
 msgstr "/交談/別名(_I)..."
 
-#: ../pidgin/gtkconv.c:2909
+#: ../pidgin/gtkconv.c:2979
 msgid "/Conversation/_Block..."
 msgstr "/交談/封鎖(_B)..."
 
-#: ../pidgin/gtkconv.c:2911
+#: ../pidgin/gtkconv.c:2981
 msgid "/Conversation/_Unblock..."
 msgstr "/交談/解除封鎖(_B)..."
 
-#: ../pidgin/gtkconv.c:2913
+#: ../pidgin/gtkconv.c:2983
 msgid "/Conversation/_Add..."
 msgstr "/交談/新增(_A)..."
 
-#: ../pidgin/gtkconv.c:2915
+#: ../pidgin/gtkconv.c:2985
 msgid "/Conversation/_Remove..."
 msgstr "/交談/移除(_R)..."
 
-#: ../pidgin/gtkconv.c:2920
-#, fuzzy
+#: ../pidgin/gtkconv.c:2990
 msgid "/Conversation/Insert Lin_k..."
-msgstr "/交談/邀請..."
-
-#: ../pidgin/gtkconv.c:2922
-#, fuzzy
+msgstr "/交談/插入連結(_k)..."
+
+#: ../pidgin/gtkconv.c:2992
 msgid "/Conversation/Insert Imag_e..."
-msgstr "/交談/邀請..."
-
-#: ../pidgin/gtkconv.c:2928
+msgstr "/交談/插入圖像(_E)..."
+
+#: ../pidgin/gtkconv.c:2998
 msgid "/Conversation/_Close"
 msgstr "/交談/關閉(_C)"
 
 #. Options
-#: ../pidgin/gtkconv.c:2932
+#: ../pidgin/gtkconv.c:3002
 msgid "/_Options"
 msgstr "/選項(_O)"
 
-#: ../pidgin/gtkconv.c:2933
+#: ../pidgin/gtkconv.c:3003
 msgid "/Options/Enable _Logging"
 msgstr "/選項/開始記錄日誌(_L)"
 
-#: ../pidgin/gtkconv.c:2934
+#: ../pidgin/gtkconv.c:3004
 msgid "/Options/Enable _Sounds"
 msgstr "/選項/開啟音效(_S)"
 
-#: ../pidgin/gtkconv.c:2936
+#: ../pidgin/gtkconv.c:3006
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/選項/顯示格式工具列(_T)"
 
-#: ../pidgin/gtkconv.c:2937
+#: ../pidgin/gtkconv.c:3007
 msgid "/Options/Show Ti_mestamps"
 msgstr "/選項/顯示時間戳記(_M)"
 
-#: ../pidgin/gtkconv.c:3061
+#: ../pidgin/gtkconv.c:3134
 msgid "/Conversation/More"
 msgstr "/交談/更多"
 
-#: ../pidgin/gtkconv.c:3117
-#, fuzzy
+#: ../pidgin/gtkconv.c:3190
 msgid "/Options"
-msgstr "/選項(_O)"
+msgstr "/選項"
 
 #. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
 #. * the 'Conversation' menu pops up.
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:3152 ../pidgin/gtkconv.c:3184
+#: ../pidgin/gtkconv.c:3225 ../pidgin/gtkconv.c:3257
 msgid "/Conversation"
 msgstr "/交談"
 
-#: ../pidgin/gtkconv.c:3192
+#: ../pidgin/gtkconv.c:3265
 msgid "/Conversation/View Log"
 msgstr "/交談/觀看歷史記錄"
 
-#: ../pidgin/gtkconv.c:3198
+#: ../pidgin/gtkconv.c:3271
 msgid "/Conversation/Send File..."
 msgstr "/交談/傳送檔案..."
 
-#: ../pidgin/gtkconv.c:3202
+#: ../pidgin/gtkconv.c:3275
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/交談/新增好友狀態捕捉..."
 
-#: ../pidgin/gtkconv.c:3208
+#: ../pidgin/gtkconv.c:3281
 msgid "/Conversation/Get Info"
 msgstr "/交談/取得資訊"
 
-#: ../pidgin/gtkconv.c:3212
+#: ../pidgin/gtkconv.c:3285
 msgid "/Conversation/Invite..."
 msgstr "/交談/邀請..."
 
-#: ../pidgin/gtkconv.c:3218
+#: ../pidgin/gtkconv.c:3291
 msgid "/Conversation/Alias..."
 msgstr "/交談/別名..."
 
-#: ../pidgin/gtkconv.c:3222
+#: ../pidgin/gtkconv.c:3295
 msgid "/Conversation/Block..."
 msgstr "/交談/封鎖..."
 
-#: ../pidgin/gtkconv.c:3226
+#: ../pidgin/gtkconv.c:3299
 msgid "/Conversation/Unblock..."
 msgstr "/交談/解除封鎖..."
 
-#: ../pidgin/gtkconv.c:3230
+#: ../pidgin/gtkconv.c:3303
 msgid "/Conversation/Add..."
 msgstr "/交談/新增..."
 
-#: ../pidgin/gtkconv.c:3234
+#: ../pidgin/gtkconv.c:3307
 msgid "/Conversation/Remove..."
 msgstr "/交談/移除..."
 
-#: ../pidgin/gtkconv.c:3240
-#, fuzzy
+#: ../pidgin/gtkconv.c:3313
 msgid "/Conversation/Insert Link..."
-msgstr "/交談/邀請..."
-
-#: ../pidgin/gtkconv.c:3244
-#, fuzzy
+msgstr "/交談/插入連結..."
+
+#: ../pidgin/gtkconv.c:3317
 msgid "/Conversation/Insert Image..."
-msgstr "/交談/邀請..."
-
-#: ../pidgin/gtkconv.c:3250
+msgstr "/交談/插入圖像..."
+
+#: ../pidgin/gtkconv.c:3323
 msgid "/Options/Enable Logging"
 msgstr "/選項/開始記錄日誌"
 
-#: ../pidgin/gtkconv.c:3253
+#: ../pidgin/gtkconv.c:3326
 msgid "/Options/Enable Sounds"
 msgstr "/選項/開啟音效"
 
-#: ../pidgin/gtkconv.c:3266
+#: ../pidgin/gtkconv.c:3339
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/選項/顯示格式工具列"
 
-#: ../pidgin/gtkconv.c:3269
+#: ../pidgin/gtkconv.c:3342
 msgid "/Options/Show Timestamps"
 msgstr "/選項/顯示時間戳記"
 
-#: ../pidgin/gtkconv.c:3346 ../pidgin/gtkconv.c:3388
+#: ../pidgin/gtkconv.c:3419 ../pidgin/gtkconv.c:3461
 msgid "User is typing..."
 msgstr "對方正在輸入..."
 
-#: ../pidgin/gtkconv.c:3391
+#: ../pidgin/gtkconv.c:3464
 msgid "User has typed something and stopped"
 msgstr "對方輸入了一些東西,不過暫停了"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3574 ../pidgin/gtkconv.c:8022
-msgid "_Send To"
-msgstr "傳送到(_S)"
-
-#: ../pidgin/gtkconv.c:4286
+#: ../pidgin/gtkconv.c:3648 ../pidgin/gtkconv.c:8248
+msgid "S_end To"
+msgstr "傳送到(_E)"
+
+#: ../pidgin/gtkconv.c:4360
 msgid "_Send"
 msgstr "傳送(_S)"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4390
+#: ../pidgin/gtkconv.c:4473
 msgid "0 people in room"
 msgstr "沒有人在這個房間"
 
-#: ../pidgin/gtkconv.c:5759 ../pidgin/gtkconv.c:5880
+#: ../pidgin/gtkconv.c:5846 ../pidgin/gtkconv.c:5967
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d 個人在這個房間"
 msgstr[1] "%d 個人在這個房間"
 
-#: ../pidgin/gtkconv.c:6486 ../pidgin/gtkstatusbox.c:660
+#: ../pidgin/gtkconv.c:6574 ../pidgin/gtkstatusbox.c:660
 msgid "Typing"
 msgstr "輸入中"
 
-#: ../pidgin/gtkconv.c:6490
+#: ../pidgin/gtkconv.c:6578
 msgid "Stopped Typing"
 msgstr "停止輸入"
 
-#: ../pidgin/gtkconv.c:6493
+#: ../pidgin/gtkconv.c:6581
 msgid "Nick Said"
 msgstr "網名被提及"
 
-#: ../pidgin/gtkconv.c:6496 ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6584 ../pidgin/gtkdocklet.c:685
 msgid "Unread Messages"
 msgstr "未讀訊息"
 
-#: ../pidgin/gtkconv.c:6499
+#: ../pidgin/gtkconv.c:6590
 msgid "New Event"
 msgstr "新事件"
 
 # XXX
-#: ../pidgin/gtkconv.c:7572
-#, fuzzy
+#: ../pidgin/gtkconv.c:7767
 msgid "clear: Clears all conversation scrollbacks."
-msgstr "clear:清空交談的回捲緩衝區"
-
-#: ../pidgin/gtkconv.c:7736
+msgstr "clear:清空所有交談的回捲緩衝區"
+
+#: ../pidgin/gtkconv.c:7930
 msgid "Confirm close"
 msgstr "確認關閉"
 
-#: ../pidgin/gtkconv.c:7768
+#: ../pidgin/gtkconv.c:7962
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "你還有未讀取的訊息。你確定要關閉這個視窗嗎?"
 
-#: ../pidgin/gtkconv.c:8355
+#: ../pidgin/gtkconv.c:8581
 msgid "Close other tabs"
 msgstr "關閉其他分頁"
 
-#: ../pidgin/gtkconv.c:8361
+#: ../pidgin/gtkconv.c:8587
 msgid "Close all tabs"
 msgstr "關閉所有分頁"
 
-#: ../pidgin/gtkconv.c:8369
+#: ../pidgin/gtkconv.c:8595
 msgid "Detach this tab"
 msgstr "分離這個分頁"
 
-#: ../pidgin/gtkconv.c:8375
+#: ../pidgin/gtkconv.c:8601
 msgid "Close this tab"
 msgstr "關閉這個分頁"
 
-#: ../pidgin/gtkconv.c:8875
+#: ../pidgin/gtkconv.c:9106
 msgid "Close conversation"
 msgstr "關閉交談"
 
-#: ../pidgin/gtkconv.c:9477
+#: ../pidgin/gtkconv.c:9708
 msgid "Last created window"
 msgstr "上一個開啟的視窗"
 
-#: ../pidgin/gtkconv.c:9479
+#: ../pidgin/gtkconv.c:9710
 msgid "Separate IM and Chat windows"
 msgstr "以不同的視窗顯示即時訊息和聊天"
 
-#: ../pidgin/gtkconv.c:9481 ../pidgin/gtkprefs.c:1415
+#: ../pidgin/gtkconv.c:9712 ../pidgin/gtkprefs.c:1510
 msgid "New window"
 msgstr "新視窗"
 
-#: ../pidgin/gtkconv.c:9483
+#: ../pidgin/gtkconv.c:9714
 msgid "By group"
 msgstr "根據羣組"
 
-#: ../pidgin/gtkconv.c:9485
+#: ../pidgin/gtkconv.c:9716
 msgid "By account"
 msgstr "根據帳號"
 
-#  NOTE「除錯日誌」很怪,「除錯紀錄」較順口,而且已經有人用
-#: ../pidgin/gtkdebug.c:234
+#  NOTE「除錯日誌」很怪,「除錯紀錄」較順口,而且已經有人用
+#: ../pidgin/gtkdebug.c:235
 msgid "Save Debug Log"
 msgstr "儲存除錯紀錄"
 
-# NOTE 可能是指「反向選取」
-#: ../pidgin/gtkdebug.c:582
+# NOTE 可能是指「反向選取」
+#: ../pidgin/gtkdebug.c:583
 msgid "Invert"
 msgstr "反向"
 
-# XXX TODO 我非常討厭把「Highlight」譯成「高亮度」,但譯文可以改進 - Ambrose 20061029
-#: ../pidgin/gtkdebug.c:585
+# XXX TODO 我非常討厭把「Highlight」譯成「高亮度」,但譯文可以改進 - Ambrose 20061029
+#: ../pidgin/gtkdebug.c:586
 msgid "Highlight matches"
 msgstr "標示匹配字串"
 
-#  NOTE 除錯視窗的工具列的快取選單的指令,指「工具列的按紐以圖示標示」,下二同
-#: ../pidgin/gtkdebug.c:652
+#  NOTE 除錯視窗的工具列的快取選單的指令,指「工具列的按紐以圖示標示」,下二同
+#: ../pidgin/gtkdebug.c:653
 msgid "_Icon Only"
 msgstr "顯示圖示(_I)"
 
-#: ../pidgin/gtkdebug.c:653
+#: ../pidgin/gtkdebug.c:654
 msgid "_Text Only"
 msgstr "顯示文字(_T)"
 
-#: ../pidgin/gtkdebug.c:654
+#: ../pidgin/gtkdebug.c:655
 msgid "_Both Icon & Text"
 msgstr "顯示圖示和文字(_B)"
 
-#: ../pidgin/gtkdebug.c:775
+#: ../pidgin/gtkdebug.c:780
 msgid "Filter"
 msgstr "過濾器"
 
-#: ../pidgin/gtkdebug.c:794
+#: ../pidgin/gtkdebug.c:799
 msgid "Right click for more options."
 msgstr "按右鍵以顯示更多選項。"
 
-# TODO 要覆查 - 20061025
-#: ../pidgin/gtkdebug.c:824
+# TODO 要覆查 - 20061025
+#: ../pidgin/gtkdebug.c:829
 msgid "Level "
 msgstr "過濾程度 "
 
-#: ../pidgin/gtkdebug.c:825 ../pidgin/gtkdebug.c:831
+#: ../pidgin/gtkdebug.c:830 ../pidgin/gtkdebug.c:836
 msgid "Select the debug filter level."
 msgstr "選擇除錯訊息的過濾程度。"
 
-# TODO 要覆查 - 20061025
-#: ../pidgin/gtkdebug.c:833
+# TODO 要覆查 - 20061025
+#: ../pidgin/gtkdebug.c:838
 msgid "All"
 msgstr "全部訊息"
 
-# NOTE 這個不是指「Info」(因為已經有「Info」一項),而是一種比「Info」還要低層次的除錯訊息,應是指「Debug」
-#: ../pidgin/gtkdebug.c:834
+# NOTE 這個不是指「Info」(因為已經有「Info」一項),而是一種比「Info」還要低層次的除錯訊息,應是指「Debug」
+#: ../pidgin/gtkdebug.c:839
 msgid "Misc"
 msgstr "閒雜訊息"
 
-# TODO 要覆查 - 20061025
-#: ../pidgin/gtkdebug.c:836
+# TODO 要覆查 - 20061025
+#: ../pidgin/gtkdebug.c:841
 msgid "Warning"
 msgstr "警告訊息"
 
-# TODO 要覆查 - 20061025
-#: ../pidgin/gtkdebug.c:837
+# TODO 要覆查 - 20061025
+#: ../pidgin/gtkdebug.c:842
 msgid "Error "
 msgstr "錯誤訊息"
 
-# TODO 要覆查 - 20061025
-#: ../pidgin/gtkdebug.c:838
+# TODO 要覆查 - 20061025
+#: ../pidgin/gtkdebug.c:843
 msgid "Fatal Error"
 msgstr "嚴重錯誤訊息"
 
@@ -14956,26 +14993,26 @@
 #: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
 #: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:84
 #: ../pidgin/gtkdialogs.c:85 ../pidgin/gtkdialogs.c:86
-#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:91
-#: ../pidgin/gtkdialogs.c:92
+#: ../pidgin/gtkdialogs.c:87 ../pidgin/gtkdialogs.c:90
+#: ../pidgin/gtkdialogs.c:92 ../pidgin/gtkdialogs.c:93
 msgid "developer"
 msgstr "開發者"
 
-#: ../pidgin/gtkdialogs.c:87
+#: ../pidgin/gtkdialogs.c:88
 msgid "support"
 msgstr "支援"
 
-#: ../pidgin/gtkdialogs.c:88
+#: ../pidgin/gtkdialogs.c:89
 msgid "support/QA"
 msgstr "支援兼品管"
 
-#: ../pidgin/gtkdialogs.c:90 ../pidgin/gtkdialogs.c:112
+#: ../pidgin/gtkdialogs.c:91 ../pidgin/gtkdialogs.c:112
 msgid "developer & webmaster"
 msgstr "開發者兼網站管理員"
 
 #: ../pidgin/gtkdialogs.c:99
 msgid "Senior Contributor/QA"
-msgstr ""
+msgstr "資深貢獻者兼品管"
 
 #: ../pidgin/gtkdialogs.c:108
 msgid "win32 port"
@@ -15002,7 +15039,7 @@
 msgid "original author"
 msgstr "原作者"
 
-#  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=A
+#  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=A
 #: ../pidgin/gtkdialogs.c:133
 msgid "Afrikaans"
 msgstr "南非荷蘭文"
@@ -15011,9 +15048,10 @@
 msgid "Arabic"
 msgstr "阿拉伯文"
 
+#  NOTE「Latin」係指譯文以「拉丁字母」(而非西里爾字母)書寫,中譯可以省略 - acli 20070918
 #: ../pidgin/gtkdialogs.c:135
 msgid "Belarusian Latin"
-msgstr ""
+msgstr "白俄羅斯文"
 
 #: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
 #: ../pidgin/gtkdialogs.c:227
@@ -15025,19 +15063,19 @@
 msgid "Bengali"
 msgstr "孟加拉文"
 
-# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=B&page=2
-# NOTE 港譯「波斯尼亞」,台一般譯「波士尼亞」
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=B&page=2
+# NOTE 港譯「波斯尼亞」,台一般譯「波士尼亞」
 #: ../pidgin/gtkdialogs.c:142
 msgid "Bosnian"
 msgstr "波希尼亞文"
 
-#  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=C
+#  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=C
 #: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:228
 #: ../pidgin/gtkdialogs.c:229
 msgid "Catalan"
 msgstr "加泰隆文"
 
-# NOTE 直譯是「瓦倫西亞式加泰隆文」,但正常的叫法是直接寫「瓦倫西亞語」(Valencian)
+# NOTE 直譯是「瓦倫西亞式加泰隆文」,但正常的叫法是直接寫「瓦倫西亞語」(Valencian)
 #: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:145
 msgid "Valencian-Catalan"
 msgstr "瓦倫西亞文"
@@ -15055,8 +15093,8 @@
 msgid "German"
 msgstr "德文"
 
-# NOTE 國名是「不丹」,中譯文依國名不依語文名
-# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=D
+# NOTE 國名是「不丹」,中譯文依國名不依語文名
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=D
 #: ../pidgin/gtkdialogs.c:151 ../pidgin/gtkdialogs.c:152
 #: ../pidgin/gtkdialogs.c:153
 msgid "Dzongkha"
@@ -15078,7 +15116,7 @@
 msgid "British English"
 msgstr "英式英文"
 
-#  XXX 寫下的應是文,不是語,但實在真是好像沒有人寫「世界文」的 - Ambrose
+#  XXX 寫下的應是文,不是語,但實在真是好像沒有人寫「世界文」的 - Ambrose
 #: ../pidgin/gtkdialogs.c:159
 msgid "Esperanto"
 msgstr "世界語"
@@ -15089,12 +15127,9 @@
 msgid "Spanish"
 msgstr "西班牙文"
 
-# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=B&page=2
-# NOTE 港譯「波斯尼亞」,台一般譯「波士尼亞」
 #: ../pidgin/gtkdialogs.c:161
-#, fuzzy
 msgid "Estonian"
-msgstr "波希尼亞文"
+msgstr "愛沙尼亞文"
 
 #: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163
 msgid "Euskera(Basque)"
@@ -15116,13 +15151,13 @@
 msgid "French"
 msgstr "法文"
 
-#  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=G&page=1
+#  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=G&page=1
 #: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
 #: ../pidgin/gtkdialogs.c:242
 msgid "Galician"
 msgstr "加里西亞文"
 
-#  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=G&page=2
+#  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=G&page=2
 #: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:172
 msgid "Gujarati"
 msgstr "古吉拉特文"
@@ -15135,7 +15170,7 @@
 msgid "Hebrew"
 msgstr "希伯來文"
 
-#  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=H
+#  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=H
 #: ../pidgin/gtkdialogs.c:174
 msgid "Hindi"
 msgstr "印度文"
@@ -15148,11 +15183,11 @@
 msgid "Indonesian"
 msgstr "印尼文"
 
-#  NOTE 港譯「意大利」,臺譯「義大利」。「意」為陰去聲,「義」為陽去聲;
-#  NOTE 國語去聲不分陰陽,廣東話兩聲卻相差甚遠。臺灣有網站寫「意大利」,
-#  NOTE 臺灣的中國圖書分類法亦有「意大利」條,譯「意大利」應該比較好。
-#  NOTE【參見「Slovenian」】
-#  NOTE 註:因 zh_TW 和 zh_HK 正式分家,還原成台式譯法「義大利」
+#  NOTE 港譯「意大利」,臺譯「義大利」。「意」為陰去聲,「義」為陽去聲;
+#  NOTE 國語去聲不分陰陽,廣東話兩聲卻相差甚遠。臺灣有網站寫「意大利」,
+#  NOTE 臺灣的中國圖書分類法亦有「意大利」條,譯「意大利」應該比較好。
+#  NOTE【參見「Slovenian」】
+#  NOTE 註:因 zh_TW 和 zh_HK 正式分家,還原成台式譯法「義大利」
 #: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:245
 msgid "Italian"
 msgstr "意大利文"
@@ -15166,13 +15201,13 @@
 msgid "Georgian"
 msgstr "格魯吉亞文"
 
-# FIXME 可以譯好一點 20070520 acli
+# FIXME 可以譯好一點 20070520 acli
 #: ../pidgin/gtkdialogs.c:179
 msgid "Ubuntu Georgian Translators"
 msgstr "Ubuntu 旗下所有格魯吉亞文翻譯人員"
 
-# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=K
-# NOTE 註:KDE 譯「坎納達」
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=K
+# NOTE 註:KDE 譯「坎納達」
 #: ../pidgin/gtkdialogs.c:180
 msgid "Kannada"
 msgstr "康納達文"
@@ -15186,34 +15221,33 @@
 msgid "Korean"
 msgstr "韓文"
 
-#  NOTE 港譯只有「庫爾德」,台譯有「庫德」(標準譯法,看來亦較常見)和「庫爾德」
-#  NOTE 註:因 zh_TW 和 zh_HK 正式分家,保留台式譯法「庫德」
+#  NOTE 港譯只有「庫爾德」,台譯有「庫德」(標準譯法,看來亦較常見)和「庫爾德」
+#  NOTE 註:因 zh_TW 和 zh_HK 正式分家,保留台式譯法「庫德」
 #: ../pidgin/gtkdialogs.c:182 ../pidgin/gtkdialogs.c:183
 #: ../pidgin/gtkdialogs.c:184
 msgid "Kurdish"
 msgstr "庫德文"
 
 #: ../pidgin/gtkdialogs.c:185
-#, fuzzy
 msgid "Lao"
-msgstr "獅子座"
+msgstr "寮國文"
 
 #: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:252
 #: ../pidgin/gtkdialogs.c:253
 msgid "Lithuanian"
 msgstr "立陶宛文"
 
-#  NOTE「馬其頓文」是一種東歐語文,跟希臘的馬其頓並無關係
+#  NOTE「馬其頓文」是一種東歐語文,跟希臘的馬其頓並無關係
 #: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:188
 #: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:254
 msgid "Macedonian"
 msgstr "馬其頓文"
 
-#  NOTE 譯文不統一,一般似乎偏向音譯,但譯音也不統一
-#  NOTE 音譯包括:博克馬爾、波克默爾、布克莫爾、巴克摩
-#  NOTE 其他譯法包括:丹麥-挪威文(大英百科)、丹麥式挪威文(維基百科)、東挪威文、標準挪威文(國內不是標準,國外是 :P)
-#  NOTE 譯音一般放在「挪威文」後的括弧內,也有不用括弧把譯音放在「挪威」和「文」之間
-#  NOTE 採用「標準」一詞,參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=N&page=2
+#  NOTE 譯文不統一,一般似乎偏向音譯,但譯音也不統一
+#  NOTE 音譯包括:博克馬爾、波克默爾、布克莫爾、巴克摩
+#  NOTE 其他譯法包括:丹麥-挪威文(大英百科)、丹麥式挪威文(維基百科)、東挪威文、標準挪威文(國內不是標準,國外是 :P)
+#  NOTE 譯音一般放在「挪威文」後的括弧內,也有不用括弧把譯音放在「挪威」和「文」之間
+#  NOTE 採用「標準」一詞,參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=N&page=2
 #: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:255
 #: ../pidgin/gtkdialogs.c:256
 msgid "Bokmål Norwegian"
@@ -15223,15 +15257,13 @@
 msgid "Nepali"
 msgstr "尼泊爾文"
 
-# NOTE Flemish 譯法是跟了http://www.ee.tku.edu.tw/~rexchen/cdict/
-# XXX Dutch 和 Flemish 是同一種語言,是否應該只寫「荷蘭文」,刪去「法蘭德斯文」?
+# NOTE Flemish 譯法是跟了http://www.ee.tku.edu.tw/~rexchen/cdict/
+# XXX Dutch 和 Flemish 是同一種語言,是否應該只寫「荷蘭文」,刪去「法蘭德斯文」?
 #: ../pidgin/gtkdialogs.c:192
 msgid "Dutch, Flemish"
 msgstr "荷蘭文/法蘭德斯文"
 
-#  NOTE 這是「nn」碼,即「Nynorsk Norwegian」,所以直譯「挪威文」並不恰當
 #: ../pidgin/gtkdialogs.c:193
-#, fuzzy
 msgid "Norwegian Nynorsk"
 msgstr "新挪威文"
 
@@ -15248,8 +15280,8 @@
 msgid "Portuguese-Brazil"
 msgstr "巴西萄文"
 
-#  NOTE「普什圖」在三地都看來是較正常的譯法
-#  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=P&page=2
+#  NOTE「普什圖」在三地都看來是較正常的譯法
+#  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=P&page=2
 #: ../pidgin/gtkdialogs.c:199
 msgid "Pashto"
 msgstr "普什圖文"
@@ -15269,10 +15301,10 @@
 msgid "Slovak"
 msgstr "斯洛伐克文"
 
-#  NOTE 港譯「斯洛文尼亞」,臺譯「斯洛維尼亞」。粵語「文」字為M起音,
-#  NOTE 以粵語發音,跟臺譯反而發音較準;況且,這至少名義上也是zh_TW;
-#  NOTE 所以不跟港譯(其實是大陸譯法),跟臺譯。
-#  NOTE【參見「Italian」】
+#  NOTE 港譯「斯洛文尼亞」,臺譯「斯洛維尼亞」。粵語「文」字為M起音,
+#  NOTE 以粵語發音,跟臺譯反而發音較準;況且,這至少名義上也是zh_TW;
+#  NOTE 所以不跟港譯(其實是大陸譯法),跟臺譯。
+#  NOTE【參見「Italian」】
 #: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:263
 msgid "Slovenian"
 msgstr "斯洛文尼亞文"
@@ -15291,13 +15323,13 @@
 msgid "Swedish"
 msgstr "瑞典文"
 
-# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=T
-# NOTE 港一般譯「泰米爾」,台一般譯「塔米爾」(看來較常見)或「泰米爾」
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=T
+# NOTE 港一般譯「泰米爾」,台一般譯「塔米爾」(看來較常見)或「泰米爾」
 #: ../pidgin/gtkdialogs.c:209
 msgid "Tamil"
 msgstr "泰米爾文"
 
-# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=T
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=T
 #: ../pidgin/gtkdialogs.c:210
 msgid "Telugu"
 msgstr "德拉威文"
@@ -15332,18 +15364,18 @@
 msgid "Traditional Chinese"
 msgstr "繁體中文"
 
-# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=A
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=A
 #: ../pidgin/gtkdialogs.c:225
 msgid "Amharic"
 msgstr "阿姆哈拉文"
 
-#: ../pidgin/gtkdialogs.c:357
+#: ../pidgin/gtkdialogs.c:368
 #, c-format
 msgid "About %s"
 msgstr "關於 %s"
 
-#: ../pidgin/gtkdialogs.c:400
-#, fuzzy, c-format
+#: ../pidgin/gtkdialogs.c:411
+#, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
 "capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
@@ -15354,112 +15386,114 @@
 "is copyrighted by its contributors.  See the 'COPYRIGHT' file for the "
 "complete list of contributors.  We provide no warranty for this program."
 "<BR><BR>"
-msgstr ""
-"%s 係一個以 GTK+ 開發,圖形介面式的模組化訊息程式,以 libpurple 為基礎,同時"
-"提供 AIM、MSN、Yahoo!、XMPP、ICQ、IRC、SILC、SIP/SIMPLE、Novell GroupWise、"
-"Lotus Sametime、Bonjour、Zephyr、Gadu-Gadu 及 QQ 等功能。<BR><BR>倘若你希望修"
-"改或發佈這個程式,只需按照 GPL(任擇第二版或較新的其他版本)的條款即可;%s 內"
-"已附有一份 GPL, 收錄在名為「COPYING」的檔案之內。%s 係有版權的著作,版權歸全"
-"部貢獻者共同所有,貢獻者芳名詳列在名為「COPYRIGHT」的檔案內。本程式恕不提供任"
-"何保用。<BR><BR>"
-
-#: ../pidgin/gtkdialogs.c:418
-#, c-format
+msgstr "%s 係一個以 GTK+ 開發,圖形介面式的模組化訊息程式,以 libpurple 為基礎,同時提供 AIM、MSN、Yahoo!、XMPP、ICQ、IRC、SILC、SIP/SIMPLE、Novell GroupWise、Lotus Sametime、Bonjour、Zephyr、MySpaceIM、Gadu-Gadu 及 QQ 等功能。<BR><BR>倘若你希望修改或發佈這個程式,只需按照 GPL(任擇第二版或較新的其他版本)的條款即可;%s 內已附有一份 GPL, 收錄在名為「COPYING」的檔案之內。%s 係有版權的著作,版權歸全部貢獻者共同所有,貢獻者芳名詳列在名為「COPYRIGHT」的檔案內。本程式恕不提供任何保用。<BR><BR>"
+
+#: ../pidgin/gtkdialogs.c:429
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-msgstr ""
-"<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #pidgin 頻道<BR><BR>"
-
-#: ../pidgin/gtkdialogs.c:423
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #pidgin 頻道<BR><BR>"
+
+#: ../pidgin/gtkdialogs.c:434
 msgid "Current Developers"
 msgstr "現任開發者"
 
 # NOTE LSchiere2: wing: it means they must be crazy or they wouldn't work on gaim ;-)
-# NOTE Luke Schierer 說:「這些人一個是瘋了,否則不會為 gaim 賣力」
-# NOTE 所以正確的譯文應是「瘋癲的模組作者」或者「模組的瘋癲作者」之類……
-# NOTE 不過這樣好像有點過份,所以翻成「狂熱的模組作者」會比較好 :P
-#: ../pidgin/gtkdialogs.c:438
+# NOTE Luke Schierer 說:「這些人一個是瘋了,否則不會為 gaim 賣力」
+# NOTE 所以正確的譯文應是「瘋癲的模組作者」或者「模組的瘋癲作者」之類……
+# NOTE 不過這樣好像有點過份,所以翻成「狂熱的模組作者」會比較好 :P
+#: ../pidgin/gtkdialogs.c:449
 msgid "Crazy Patch Writers"
 msgstr "狂熱的模組作者"
 
-#: ../pidgin/gtkdialogs.c:453
+#: ../pidgin/gtkdialogs.c:464
 msgid "Retired Developers"
 msgstr "前任開發者"
 
-# NOTE LSchiere2: wing: it means they must be crazy or they wouldn't work on gaim ;-)
-# NOTE Luke Schierer 說:「這些人一個是瘋了,否則不會為 gaim 賣力」
-# NOTE 所以正確的譯文應是「瘋癲的模組作者」或者「模組的瘋癲作者」之類……
-# NOTE 不過這樣好像有點過份,所以翻成「狂熱的模組作者」會比較好 :P
-#: ../pidgin/gtkdialogs.c:468
-#, fuzzy
+# NOTE 參見「Crazy Patch Writer」條
+#: ../pidgin/gtkdialogs.c:479
 msgid "Retired Crazy Patch Writers"
-msgstr "狂熱的模組作者"
-
-#  NOTE 可譯「美工人員」,但那是很保守的譯法;Pidgin 的 Artist 是做設計圖示、重新整理介面等等這些很難做的工作的人,所以很明顯是「設計員」
-#: ../pidgin/gtkdialogs.c:483
+msgstr "前任的狂熱模組作者"
+
+#  NOTE 可譯「美工人員」,但那是很保守的譯法;Pidgin 的 Artist 是做設計圖示、重新整理介面等等這些很難做的工作的人,所以很明顯是「設計員」
+#: ../pidgin/gtkdialogs.c:494
 msgid "Artists"
 msgstr "平面設計"
 
-#: ../pidgin/gtkdialogs.c:498
+#: ../pidgin/gtkdialogs.c:509
 msgid "Current Translators"
 msgstr "現任譯者"
 
-#: ../pidgin/gtkdialogs.c:518
+#: ../pidgin/gtkdialogs.c:529
 msgid "Past Translators"
 msgstr "前任譯者"
 
-# NOTE 這是「關於 Pidgin」視窗中,最後出現,用來作除錯用的各種資訊,不能譯成「訊息」
-#: ../pidgin/gtkdialogs.c:536
+# NOTE 這是「關於 Pidgin」視窗中,最後出現,用來作除錯用的各種資訊,不能譯成「訊息」
+#: ../pidgin/gtkdialogs.c:547
 msgid "Debugging Information"
 msgstr "除錯專用資訊"
 
-#: ../pidgin/gtkdialogs.c:906
+# NOTE 只能譯「名稱」,因為同時解作「人名」及「模組名稱」
+#: ../pidgin/gtkdialogs.c:764 ../pidgin/gtkdialogs.c:907
+#: ../pidgin/gtkdialogs.c:988
+msgid "_Name"
+msgstr "名稱(_N)"
+
+#: ../pidgin/gtkdialogs.c:769
+msgid "Buddy"
+msgstr "好友"
+
+#: ../pidgin/gtkdialogs.c:773 ../pidgin/gtkdialogs.c:912
+#: ../pidgin/gtkdialogs.c:993
+msgid "_Account"
+msgstr "帳號(_A)"
+
+#: ../pidgin/gtkdialogs.c:920
 msgid "Get User Info"
 msgstr "取得使用者資訊"
 
-#: ../pidgin/gtkdialogs.c:908
+#: ../pidgin/gtkdialogs.c:922
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
 msgstr "請輸入你所想要查詢對象的帳號。"
 
-#: ../pidgin/gtkdialogs.c:998
+#: ../pidgin/gtkdialogs.c:1012
 msgid "View User Log"
 msgstr "觀看使用者日誌"
 
-#: ../pidgin/gtkdialogs.c:1000
+#: ../pidgin/gtkdialogs.c:1014
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
 msgstr "請輸入你所想要讀取日誌的使用者的帳號或別名。"
 
-# XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
-#: ../pidgin/gtkdialogs.c:1020
+# XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
+#: ../pidgin/gtkdialogs.c:1034
 msgid "Alias Contact"
 msgstr "為這組好友加上別名"
 
-# XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
-#: ../pidgin/gtkdialogs.c:1021
+# XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
+#: ../pidgin/gtkdialogs.c:1035
 msgid "Enter an alias for this contact."
 msgstr "請為這組好友輸入一個別名。"
 
-#: ../pidgin/gtkdialogs.c:1043
+#: ../pidgin/gtkdialogs.c:1057
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "請為 %s 輸入一個別名"
 
-#: ../pidgin/gtkdialogs.c:1045
+#: ../pidgin/gtkdialogs.c:1059
 msgid "Alias Buddy"
 msgstr "為這個好友加上別名"
 
-#: ../pidgin/gtkdialogs.c:1066
+#: ../pidgin/gtkdialogs.c:1080
 msgid "Alias Chat"
 msgstr "給聊天室改別名"
 
-#: ../pidgin/gtkdialogs.c:1067
+#: ../pidgin/gtkdialogs.c:1081
 msgid "Enter an alias for this chat."
 msgstr "請為這個聊天室輸入一個別名。"
 
-#: ../pidgin/gtkdialogs.c:1106
+#: ../pidgin/gtkdialogs.c:1120
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -15467,122 +15501,116 @@
 msgid_plural ""
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
-msgstr[0] ""
-"你正嘗試將好友 %s 及相關的其他 %d 個好友從你的好友清單中移除。你要繼續這個動"
-"作嗎?"
-msgstr[1] ""
-"你正嘗試將好友 %s 及相關的其他 %d 個好友從你的好友清單中移除。你要繼續這個動"
-"作嗎?"
-
-# XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別;可能有改進的空間
-#: ../pidgin/gtkdialogs.c:1114
+msgstr[0] "你正嘗試將好友 %s 及相關的其他 %d 個好友從你的好友清單中移除。你要繼續這個動作嗎?"
+msgstr[1] "你正嘗試將好友 %s 及相關的其他 %d 個好友從你的好友清單中移除。你要繼續這個動作嗎?"
+
+# XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別;可能有改進的空間
+#: ../pidgin/gtkdialogs.c:1128
 msgid "Remove Contact"
 msgstr "移除這組好友"
 
-# XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別;可能有改進的空間
-#: ../pidgin/gtkdialogs.c:1117
+# XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別;可能有改進的空間
+#: ../pidgin/gtkdialogs.c:1131
 msgid "_Remove Contact"
 msgstr "移除聯絡人(_R)"
 
-# TODO 譯文有待改進 - 20061025
-#: ../pidgin/gtkdialogs.c:1148
+# TODO 譯文有待改進 - 20061025
+#: ../pidgin/gtkdialogs.c:1162
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
 "want to continue?"
 msgstr "你正嘗試將羣組 %s 與 %s 合併,新羣組以後者命名。你要繼續這個動作嗎?"
 
-#: ../pidgin/gtkdialogs.c:1155
+#: ../pidgin/gtkdialogs.c:1169
 msgid "Merge Groups"
 msgstr "合併羣組"
 
-#: ../pidgin/gtkdialogs.c:1158
+#: ../pidgin/gtkdialogs.c:1172
 msgid "_Merge Groups"
 msgstr "合併羣組(_M)"
 
-#: ../pidgin/gtkdialogs.c:1208
+#: ../pidgin/gtkdialogs.c:1222
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
 "list.  Do you want to continue?"
-msgstr ""
-"你正嘗試將羣組 %s 及相關的成員從你的好友清單中移除。你要繼續這個動作嗎?"
-
-#: ../pidgin/gtkdialogs.c:1211
+msgstr "你正嘗試將羣組 %s 及相關的成員從你的好友清單中移除。你要繼續這個動作嗎?"
+
+#: ../pidgin/gtkdialogs.c:1225
 msgid "Remove Group"
 msgstr "移除羣組"
 
-#: ../pidgin/gtkdialogs.c:1214
+#: ../pidgin/gtkdialogs.c:1228
 msgid "_Remove Group"
 msgstr "移除羣組(_R)"
 
-#: ../pidgin/gtkdialogs.c:1247
+#: ../pidgin/gtkdialogs.c:1261
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "你正嘗試將 %s  從你的好友清單中移除。你要繼續這個動作嗎?"
 
-# XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別;可能有改進的空間
-#: ../pidgin/gtkdialogs.c:1250
+# XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別;可能有改進的空間
+#: ../pidgin/gtkdialogs.c:1264
 msgid "Remove Buddy"
 msgstr "移除這個好友"
 
-# XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別;可能有改進的空間
-#: ../pidgin/gtkdialogs.c:1253
+# XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別;可能有改進的空間
+#: ../pidgin/gtkdialogs.c:1267
 msgid "_Remove Buddy"
 msgstr "移除這個好友(_R)"
 
-#: ../pidgin/gtkdialogs.c:1274
+#: ../pidgin/gtkdialogs.c:1288
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "你正嘗試將 %s 從你的好友清單中移除。你要繼續這個動作嗎?"
 
-#: ../pidgin/gtkdialogs.c:1277
+#: ../pidgin/gtkdialogs.c:1291
 msgid "Remove Chat"
 msgstr "移除聊天室"
 
-#: ../pidgin/gtkdialogs.c:1280
+#: ../pidgin/gtkdialogs.c:1294
 msgid "_Remove Chat"
 msgstr "移除聊天室(_R)"
 
-#  NOTE 譯文更動 by Ambrose
-#: ../pidgin/gtkdocklet.c:150
+#  NOTE 譯文更動 by Ambrose
+#: ../pidgin/gtkdocklet.c:152
 msgid "Right-click for more unread messages...\n"
 msgstr "按右鍵以讀取未讀訊息...\n"
 
-#: ../pidgin/gtkdocklet.c:435
+#: ../pidgin/gtkdocklet.c:533
 msgid "Change Status"
 msgstr "更改狀態"
 
-#: ../pidgin/gtkdocklet.c:487
+#: ../pidgin/gtkdocklet.c:680
 msgid "Show Buddy List"
 msgstr "顯示好友清單"
 
-#: ../pidgin/gtkdocklet.c:513
+#: ../pidgin/gtkdocklet.c:706
 msgid "New Message..."
 msgstr "新訊息..."
 
-#: ../pidgin/gtkdocklet.c:528
+#: ../pidgin/gtkdocklet.c:721
 msgid "Mute Sounds"
 msgstr "靜音"
 
-#: ../pidgin/gtkdocklet.c:535
-#, fuzzy
-msgid "Blink on new message"
+#: ../pidgin/gtkdocklet.c:728
+msgid "Blink on New Message"
 msgstr "有新訊息時閃動"
 
-#: ../pidgin/gtkdocklet.c:542
+#: ../pidgin/gtkdocklet.c:738
 msgid "Quit"
 msgstr "結束程式"
 
-#  NOTE 這是指「未開始」傳輸檔案,不是「未啟動」
+#  NOTE 這是指「未開始」傳輸檔案,不是「未啟動」
 #: ../pidgin/gtkft.c:154
 msgid "Not started"
 msgstr "未開始"
 
-# XXX 暫譯
+# XXX 暫譯
 #: ../pidgin/gtkft.c:274
 msgid "<b>Receiving As:</b>"
 msgstr "<b>以何身分接收:</b>"
@@ -15595,7 +15623,7 @@
 msgid "<b>Sending To:</b>"
 msgstr "<b>傳送到:</b>"
 
-# XXX 暫譯
+# XXX 暫譯
 #: ../pidgin/gtkft.c:282
 msgid "<b>Sending As:</b>"
 msgstr "<b>以何身分傳送:</b>"
@@ -15627,7 +15655,7 @@
 msgid "Filename:"
 msgstr "檔名:"
 
-# NOTE Debian 譯「local」為「本地端」
+# NOTE Debian 譯「local」為「本地端」
 # XXX
 #: ../pidgin/gtkft.c:698
 msgid "Local File:"
@@ -15653,7 +15681,7 @@
 msgid "C_lear finished transfers"
 msgstr "清除已完成的傳輸(_C)"
 
-# XXX 暫譯
+# XXX 暫譯
 #. "Download Details" arrow
 #: ../pidgin/gtkft.c:803
 msgid "File transfer _details"
@@ -15669,45 +15697,45 @@
 msgid "_Resume"
 msgstr "恢復(_R)"
 
-#  NOTE Nautilus譯「貼上文本」,Abiword譯「未格式化貼上」,聽來都有些怪
-#: ../pidgin/gtkimhtml.c:816
+#  NOTE Nautilus譯「貼上文本」,Abiword譯「未格式化貼上」,聽來都有些怪
+#: ../pidgin/gtkimhtml.c:815
 msgid "Paste as Plain _Text"
 msgstr "貼上純文字(_T)"
 
-#: ../pidgin/gtkimhtml.c:833 ../pidgin/gtkimhtmltoolbar.c:1194
+#: ../pidgin/gtkimhtml.c:832 ../pidgin/gtkimhtmltoolbar.c:1199
 msgid "_Reset formatting"
 msgstr "清除格式化(_R)"
 
-#: ../pidgin/gtkimhtml.c:1373
+#: ../pidgin/gtkimhtml.c:1359
 msgid "Hyperlink color"
 msgstr "連結顏色"
 
-#: ../pidgin/gtkimhtml.c:1374
+#: ../pidgin/gtkimhtml.c:1360
 msgid "Color to draw hyperlinks."
 msgstr "顯示連結時所用的顏色。"
 
-#: ../pidgin/gtkimhtml.c:1377
+#: ../pidgin/gtkimhtml.c:1363
 msgid "Hyperlink prelight color"
 msgstr "連結顏色"
 
-#: ../pidgin/gtkimhtml.c:1378
+#: ../pidgin/gtkimhtml.c:1364
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "當滑鼠經過連結時的連結顏色。"
 
-#: ../pidgin/gtkimhtml.c:1598
+#: ../pidgin/gtkimhtml.c:1581
 msgid "_Copy E-Mail Address"
 msgstr "複製電子郵件地址(_C)"
 
-#: ../pidgin/gtkimhtml.c:1610
+#: ../pidgin/gtkimhtml.c:1593
 msgid "_Open Link in Browser"
 msgstr "在瀏覽器中打開連結(_O)"
 
-#: ../pidgin/gtkimhtml.c:1620
+#: ../pidgin/gtkimhtml.c:1603
 msgid "_Copy Link Location"
 msgstr "複製連結位址(_C)"
 
-# NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
-#: ../pidgin/gtkimhtml.c:3369
+# NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
+#: ../pidgin/gtkimhtml.c:3353
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -15717,8 +15745,8 @@
 "\n"
 "暫且當成 PNG 檔處理。"
 
-# NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
-#: ../pidgin/gtkimhtml.c:3372
+# NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
+#: ../pidgin/gtkimhtml.c:3356
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -15728,7 +15756,7 @@
 "\n"
 "暫且當成 PNG 檔處理。"
 
-#: ../pidgin/gtkimhtml.c:3401
+#: ../pidgin/gtkimhtml.c:3385
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -15739,7 +15767,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3404
+#: ../pidgin/gtkimhtml.c:3388
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -15750,12 +15778,11 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3482 ../pidgin/gtkimhtml.c:3494
+#: ../pidgin/gtkimhtml.c:3466 ../pidgin/gtkimhtml.c:3478
 msgid "Save Image"
 msgstr "儲存圖像"
 
-#: ../pidgin/gtkimhtml.c:3522
-#, c-format
+#: ../pidgin/gtkimhtml.c:3506
 msgid "_Save Image..."
 msgstr "儲存圖像(_S)..."
 
@@ -15763,202 +15790,185 @@
 msgid "Select Font"
 msgstr "選擇字型"
 
-#: ../pidgin/gtkimhtmltoolbar.c:242
+#: ../pidgin/gtkimhtmltoolbar.c:244
 msgid "Select Text Color"
 msgstr "設定文字顏色"
 
-#: ../pidgin/gtkimhtmltoolbar.c:321
+#: ../pidgin/gtkimhtmltoolbar.c:323
 msgid "Select Background Color"
 msgstr "設定背景顏色"
 
-#: ../pidgin/gtkimhtmltoolbar.c:410
+#: ../pidgin/gtkimhtmltoolbar.c:412
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:418
+#: ../pidgin/gtkimhtmltoolbar.c:420
 msgid "_Description"
 msgstr "描述(_D)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:421
+#: ../pidgin/gtkimhtmltoolbar.c:423
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 msgstr "請輸入你所要插入的 URL 及它的描述,描述是選擇性的,可不用輸入。"
 
-#: ../pidgin/gtkimhtmltoolbar.c:425
+#: ../pidgin/gtkimhtmltoolbar.c:427
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "請輸入你所要插入的 URL。"
 
-#: ../pidgin/gtkimhtmltoolbar.c:430 ../pidgin/gtkimhtmltoolbar.c:1102
+#: ../pidgin/gtkimhtmltoolbar.c:432 ../pidgin/gtkimhtmltoolbar.c:1106
 msgid "Insert Link"
 msgstr "加入連結"
 
-#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtkimhtmltoolbar.c:1262
+#: ../pidgin/gtkimhtmltoolbar.c:436 ../pidgin/gtkimhtmltoolbar.c:1267
 msgid "_Insert"
 msgstr "插入(_I)"
 
-#: ../pidgin/gtkimhtmltoolbar.c:514
+#: ../pidgin/gtkimhtmltoolbar.c:516
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "無法儲存圖像:%s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:540 ../pidgin/gtkimhtmltoolbar.c:550
+#: ../pidgin/gtkimhtmltoolbar.c:542 ../pidgin/gtkimhtmltoolbar.c:552
 msgid "Insert Image"
 msgstr "插入圖像"
 
-#  XXX 譯文不通順
-#: ../pidgin/gtkimhtmltoolbar.c:761
+#  XXX 譯文不通順
+#: ../pidgin/gtkimhtmltoolbar.c:765
 msgid "This theme has no available smileys."
 msgstr "這個表情主題不含任何表情。"
 
 #. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:778
+#: ../pidgin/gtkimhtmltoolbar.c:782
 msgid "Smile!"
 msgstr "笑一個!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:846 ../pidgin/gtkimhtmltoolbar.c:1219
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:850 ../pidgin/gtkimhtmltoolbar.c:1224
 msgid "_Font"
-msgstr "字型"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1054
-#, fuzzy
+msgstr "字型(_F)"
+
+# XXX 暫譯
+#: ../pidgin/gtkimhtmltoolbar.c:1058
 msgid "Group Items"
-msgstr "羣組 ID:"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1054
+msgstr "建立羣組"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1058
 msgid "Ungroup Items"
-msgstr ""
-
-#: ../pidgin/gtkimhtmltoolbar.c:1088 ../pidgin/plugins/convcolors.c:287
+msgstr "解除羣組"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1092 ../pidgin/plugins/convcolors.c:287
 msgid "Bold"
 msgstr "粗體"
 
-# NOTE「Italic」本來是指某程度上模仿手寫、以曲線為主的字型,「斜體」其實是誤譯,但已根深蒂固,不可能改正
-#: ../pidgin/gtkimhtmltoolbar.c:1089 ../pidgin/plugins/convcolors.c:294
+# NOTE「Italic」本來是指某程度上模仿手寫、以曲線為主的字型,「斜體」其實是誤譯,但已根深蒂固,不可能改正
+#: ../pidgin/gtkimhtmltoolbar.c:1093 ../pidgin/plugins/convcolors.c:294
 msgid "Italic"
 msgstr "斜體"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1090 ../pidgin/plugins/convcolors.c:301
+#: ../pidgin/gtkimhtmltoolbar.c:1094 ../pidgin/plugins/convcolors.c:301
 msgid "Underline"
 msgstr "底線"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1091
+#: ../pidgin/gtkimhtmltoolbar.c:1095
 msgid "Strikethrough"
-msgstr ""
-
-#: ../pidgin/gtkimhtmltoolbar.c:1093
-msgid "Increase Font Size"
-msgstr ""
-
-#: ../pidgin/gtkimhtmltoolbar.c:1094
-msgid "Decrease Font Size"
-msgstr ""
-
-#: ../pidgin/gtkimhtmltoolbar.c:1096
-#, fuzzy
-msgid "Font Face"
-msgstr "字型"
+msgstr "刪除線"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1097
-#, fuzzy
-msgid "Background Color"
-msgstr "背景顏色"
+msgid "Increase Font Size"
+msgstr "放大字體"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1098
-#, fuzzy
+msgid "Decrease Font Size"
+msgstr "縮小字體"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1100
+msgid "Font Face"
+msgstr "字型"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1101
+msgid "Background Color"
+msgstr "背景顏色"
+
+#  XXX 譯「文字顏色」會否較好? - acli 20070614
+#: ../pidgin/gtkimhtmltoolbar.c:1102
 msgid "Foreground Color"
 msgstr "前景顏色"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1100
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:1104
 msgid "Reset Formatting"
 msgstr "清除格式化"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1103
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:1107
 msgid "Insert IM Image"
 msgstr "插入圖像"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1104
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:1108
 msgid "Insert Smiley"
 msgstr "插入表情"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1179
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:1184
 msgid "<b>_Bold</b>"
-msgstr "<b>密碼:</b>"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1180
-#, fuzzy
+msgstr "<b>粗體(_B)</b>"
+
+# NOTE「Italic」本來是指某程度上模仿手寫、以曲線為主的字型,「斜體」其實是誤譯,但已根深蒂固,不可能改正
+#: ../pidgin/gtkimhtmltoolbar.c:1185
 msgid "<i>_Italic</i>"
-msgstr " <i>(IRC 操作者)</i>"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1181
-#, fuzzy
+msgstr "<i>斜體(_I)</i>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1186
 msgid "<u>_Underline</u>"
-msgstr "底線"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1182
+msgstr "<u>底線(_U)</u>"
+
+#  NOTE 這看來是一般PO檔的譯法(印刷術語看來也沒有既有譯法)
+#: ../pidgin/gtkimhtmltoolbar.c:1187
 msgid "<span strikethrough='true'>Strikethrough</span>"
-msgstr ""
-
-#: ../pidgin/gtkimhtmltoolbar.c:1183
-#, fuzzy
+msgstr "<span strikethrough='true'>刪除線</span>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1188
 msgid "<span size='larger'>_Larger</span>"
-msgstr ""
-"<span size='larger' weight='bold'>儲存圖像途中發生錯誤</span>\n"
-"\n"
-"%s"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1185
-#, fuzzy
+msgstr "<span size='larger'>放大(_L)</span>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1190
 msgid "_Normal"
-msgstr "正常"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1187
+msgstr "正常(_N)"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1192
 msgid "<span size='smaller'>_Smaller</span>"
-msgstr ""
+msgstr "<span size='smaller'>縮小(_S)</span>"
 
 #. If we want to show the formatting for the following items, we would
 #. * need to update them when formatting changes. The above items don't need
 #. * no updating nor nothin'
-#: ../pidgin/gtkimhtmltoolbar.c:1191
-#, fuzzy
+#: ../pidgin/gtkimhtmltoolbar.c:1196
 msgid "_Font face"
-msgstr "字型"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1192
-#, fuzzy
+msgstr "字型(_F)"
+
+#  XXX 譯「文字顏色」會否較好? - acli 20070614
+#: ../pidgin/gtkimhtmltoolbar.c:1197
 msgid "Foreground _color"
-msgstr "前景顏色"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1193
-#, fuzzy
+msgstr "前景顏色(_C)"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1198
 msgid "Bac_kground color"
-msgstr "背景顏色"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1270
-#, fuzzy
-msgid "_Smiley"
-msgstr "笑一個!"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1276
-#, fuzzy
+msgstr "背景顏色(_K)"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1275
 msgid "_Image"
-msgstr "儲存圖像"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1282
-#, fuzzy
+msgstr "圖像(_I)"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1281
 msgid "_Link"
-msgstr "登入(_L)"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1288
+msgstr "連結(_L)"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1287
 msgid "_Horizontal rule"
-msgstr ""
-
-#  XXX 不通順 - ambrose 20070415
+msgstr "橫線(_H)"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1309
+msgid "_Smile!"
+msgstr "笑一個(_S)!"
+
+#  XXX 不通順 - ambrose 20070415
 #: ../pidgin/gtklog.c:293
 #, c-format
 msgid ""
@@ -15980,13 +15990,13 @@
 "s?"
 msgstr "你確定你要刪除由%s開始記錄的系統日誌?"
 
-#  NOTE 第一個 %s 是聊天室名稱,第二個 %s 是時間
+#  NOTE 第一個 %s 是聊天室名稱,第二個 %s 是時間
 #: ../pidgin/gtklog.c:453
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>在%s於 %s 的交談</span>"
 
-#  NOTE 第一個 %s 是聯絡人名稱,第二個 %s 是時間
+#  NOTE 第一個 %s 是聯絡人名稱,第二個 %s 是時間
 #: ../pidgin/gtklog.c:456
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
@@ -16000,9 +16010,7 @@
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
-msgstr ""
-"只有在「記錄所有狀態改變至系統日誌」選項被啟動時,系統事件才會被記錄到系統日"
-"誌中。"
+msgstr "只有在「記錄所有狀態改變至系統日誌」選項被啟動時,系統事件才會被記錄到系統日誌中。"
 
 #: ../pidgin/gtklog.c:554
 msgid ""
@@ -16028,28 +16036,29 @@
 msgid "Total log size:"
 msgstr "全部日誌大小:"
 
-#: ../pidgin/gtklog.c:709
+#: ../pidgin/gtklog.c:714
 #, c-format
 msgid "Conversations in %s"
 msgstr "於 %s 的交談"
 
-#: ../pidgin/gtklog.c:717 ../pidgin/gtklog.c:779
+#: ../pidgin/gtklog.c:722 ../pidgin/gtklog.c:793
 #, c-format
 msgid "Conversations with %s"
 msgstr "與 %s 的交談"
 
-#: ../pidgin/gtklog.c:804
+#: ../pidgin/gtklog.c:823
 msgid "System Log"
 msgstr "系統日誌"
 
-#: ../pidgin/gtkmain.c:386
+#: ../pidgin/gtkmain.c:398
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s。執行「%s -h」以獲得更進一步的資訊。\n"
 
 #  FIXME
-#: ../pidgin/gtkmain.c:388
-#, fuzzy, c-format
+#  NOTE hard-code 了一個「Pidgin」在譯文裏,但刪掉會有點困難(令文句難明),故暫時保留,待想到怎樣刪掉才算
+#: ../pidgin/gtkmain.c:400
+#, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -16061,6 +16070,7 @@
 "  -n, --nologin       don't automatically login\n"
 "  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
 "                      account(s) to use, separated by commas)\n"
+"  --display=DISPLAY   X display to use\n"
 "  -v, --version       display the current version and exit\n"
 msgstr ""
 "%s %s\n"
@@ -16069,15 +16079,17 @@
 "  -c, --config=DIR    設定檔所在目錄\n"
 "  -d, --debug         在標準輸出中顯示除錯訊息\n"
 "  -h, --help          顯示輔助訊息並離開\n"
+"  -m, --multiple      允許同時執行多個Pidgin進程\n"
 "  -n, --nologin       不自動登入\n"
 "  -l, --login[=NAME]  自動登入 (透過 NAME 參數來指定要使用\n"
 "哪些帳號,並使用逗號分隔) \n"
+"  --display=DISPLAY   使用指定的 X display\n"
 "  -v, --version       顯示版本訊息並離開\n"
 
-#: ../pidgin/gtkmain.c:512
-#, c-format
-msgid ""
-"%s has segfaulted and attempted to dump a core file.\n"
+#: ../pidgin/gtkmain.c:528
+#, c-format
+msgid ""
+"%s %s 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"
@@ -16099,48 +16111,48 @@
 #  TODO Untranslated - This will need to be translated (NOT transliterated) for Chinese, but that'd be too much work
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:699 ../pidgin/pidgin.h:51
+#: ../pidgin/gtkmain.c:718 ../pidgin/pidgin.h:51
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#: ../pidgin/gtknotify.c:349
+#: ../pidgin/gtknotify.c:350
 msgid "Open All Messages"
 msgstr "開啟所有訊息"
 
-#: ../pidgin/gtknotify.c:402
+#: ../pidgin/gtknotify.c:403
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">你有郵件!</span>"
 
-#: ../pidgin/gtknotify.c:540
+#: ../pidgin/gtknotify.c:546
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s 有 %d 封新郵件。"
 msgstr[1] "%s 有 %d 封新郵件。"
 
-#: ../pidgin/gtknotify.c:564
-#, fuzzy, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
-msgstr[0] "<b>你有 %d 封新郵件。</b>"
-msgstr[1] "<b>你有 %d 封新郵件。</b>"
-
-#: ../pidgin/gtknotify.c:989
+#: ../pidgin/gtknotify.c:570
+#, c-format
+msgid "<b>%d new e-mail.</b>"
+msgid_plural "<b>%d new e-mails.</b>"
+msgstr[0] "<b>%d 封新郵件。</b>"
+msgstr[1] "<b>%d 封新郵件。</b>"
+
+#: ../pidgin/gtknotify.c:998
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "瀏覽器指令「%s」是無效的。"
 
-#: ../pidgin/gtknotify.c:991 ../pidgin/gtknotify.c:1003
-#: ../pidgin/gtknotify.c:1016 ../pidgin/gtknotify.c:1144
+#: ../pidgin/gtknotify.c:1000 ../pidgin/gtknotify.c:1012
+#: ../pidgin/gtknotify.c:1025 ../pidgin/gtknotify.c:1153
 msgid "Unable to open URL"
 msgstr "無法開啟網頁"
 
-#: ../pidgin/gtknotify.c:1001 ../pidgin/gtknotify.c:1014
+#: ../pidgin/gtknotify.c:1010 ../pidgin/gtknotify.c:1023
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "啟動 \"%s\" 時發生錯誤:%s"
 
-#: ../pidgin/gtknotify.c:1145
+#: ../pidgin/gtknotify.c:1154
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "你選用了「使用者自定瀏覽器」,卻未有設定指令。"
@@ -16157,7 +16169,17 @@
 msgid "Unload Plugins"
 msgstr "卸載模組"
 
-#: ../pidgin/gtkplugin.c:400
+#: ../pidgin/gtkplugin.c:308
+msgid "Could not unload plugin"
+msgstr "無法卸載模組"
+
+#: ../pidgin/gtkplugin.c:309
+msgid ""
+"The plugin could not be unloaded now, but will be disabled at the next "
+"startup."
+msgstr "目前無法卸載模組,但用戶端下次啟動時模組將被停用。"
+
+#: ../pidgin/gtkplugin.c:417
 #, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
@@ -16168,7 +16190,7 @@
 "<span weight=\"bold\">網站:</span>\t\t%s\n"
 "<span weight=\"bold\">檔名:</span>\t%s"
 
-#: ../pidgin/gtkplugin.c:410
+#: ../pidgin/gtkplugin.c:427
 #, c-format
 msgid ""
 "%s\n"
@@ -16179,11 +16201,11 @@
 "<span foreground=\"#ff0000\" weight=\"bold\">錯誤: %s\n"
 "檢查模組的網站以獲得更新。</span>"
 
-#: ../pidgin/gtkplugin.c:536
+#: ../pidgin/gtkplugin.c:562
 msgid "Configure Pl_ugin"
 msgstr "設定模組(_U)"
 
-#: ../pidgin/gtkplugin.c:599
+#: ../pidgin/gtkplugin.c:625
 msgid "<b>Plugin Details</b>"
 msgstr "<b>模組明細</b>"
 
@@ -16192,131 +16214,128 @@
 msgstr "選擇檔案"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:532
+#: ../pidgin/gtkpounce.c:547
 msgid "Pounce on Whom"
 msgstr "捕捉誰的狀態"
 
-#: ../pidgin/gtkpounce.c:559
+#: ../pidgin/gtkpounce.c:574
 msgid "_Buddy name:"
 msgstr "好友名稱(_B):"
 
-#: ../pidgin/gtkpounce.c:593
+#: ../pidgin/gtkpounce.c:608
 msgid "Si_gns on"
 msgstr "登入(_G)"
 
-#: ../pidgin/gtkpounce.c:595
+#: ../pidgin/gtkpounce.c:610
 msgid "Signs o_ff"
 msgstr "登出(_F)"
 
-#: ../pidgin/gtkpounce.c:597
+#: ../pidgin/gtkpounce.c:612
 msgid "Goes a_way"
 msgstr "離開(_W)"
 
-#: ../pidgin/gtkpounce.c:599
+#: ../pidgin/gtkpounce.c:614
 msgid "Ret_urns from away"
 msgstr "返回(_U)"
 
-#: ../pidgin/gtkpounce.c:601
+#: ../pidgin/gtkpounce.c:616
 msgid "Becomes _idle"
 msgstr "閒置(_I)"
 
-#: ../pidgin/gtkpounce.c:603
+#: ../pidgin/gtkpounce.c:618
 msgid "Is no longer i_dle"
 msgstr "不再閒置(_D)"
 
-#: ../pidgin/gtkpounce.c:605
+#: ../pidgin/gtkpounce.c:620
 msgid "Starts _typing"
 msgstr "開始輸入(_T)"
 
-#: ../pidgin/gtkpounce.c:607
+#: ../pidgin/gtkpounce.c:622
 msgid "P_auses while typing"
 msgstr "暫停輸入(_A)"
 
-#: ../pidgin/gtkpounce.c:609
+#: ../pidgin/gtkpounce.c:624
 msgid "Stops t_yping"
 msgstr "停止輸入(_Y)"
 
-#: ../pidgin/gtkpounce.c:611
+#: ../pidgin/gtkpounce.c:626
 msgid "Sends a _message"
 msgstr "送出一個訊息(_M)"
 
-#: ../pidgin/gtkpounce.c:654
+#: ../pidgin/gtkpounce.c:669
 msgid "Ope_n an IM window"
 msgstr "開啟即時訊息視窗(_N)"
 
-#: ../pidgin/gtkpounce.c:656
+#: ../pidgin/gtkpounce.c:671
 msgid "_Pop up a notification"
 msgstr "彈出通知(_P)"
 
-#: ../pidgin/gtkpounce.c:658
+#: ../pidgin/gtkpounce.c:673
 msgid "Send a _message"
 msgstr "送出訊息(_M)"
 
-#: ../pidgin/gtkpounce.c:660
+#: ../pidgin/gtkpounce.c:675
 msgid "E_xecute a command"
 msgstr "執行指令(_X)"
 
-#: ../pidgin/gtkpounce.c:662
+#: ../pidgin/gtkpounce.c:677
 msgid "P_lay a sound"
 msgstr "播放音效(_L)"
 
-#: ../pidgin/gtkpounce.c:668
+#: ../pidgin/gtkpounce.c:683
 msgid "Brows_e..."
 msgstr "瀏覽(_E)..."
 
-#: ../pidgin/gtkpounce.c:670
+#: ../pidgin/gtkpounce.c:685
 msgid "Br_owse..."
 msgstr "瀏覽(_O)..."
 
-#: ../pidgin/gtkpounce.c:671
+#: ../pidgin/gtkpounce.c:686
 msgid "Pre_view"
 msgstr "預覽(_V)"
 
-#: ../pidgin/gtkpounce.c:798
-#, fuzzy
+#: ../pidgin/gtkpounce.c:818
 msgid "P_ounce only when my status is not Available"
 msgstr "只在我的狀態不為「上線」時啟用(_O)"
 
-#: ../pidgin/gtkpounce.c:803
+#: ../pidgin/gtkpounce.c:823
 msgid "_Recurring"
-msgstr "重複發生(_R)"
-
-#: ../pidgin/gtkpounce.c:1246
+msgstr "重覆發生(_R)"
+
+#: ../pidgin/gtkpounce.c:1266
 msgid "Pounce Target"
 msgstr "捕捉目標"
 
 #: ../pidgin/gtkprefs.c:386
 #: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
-#, fuzzy
 msgid "Default"
-msgstr "(預設)"
-
-# XXX 要覆查 - 20061025
+msgstr "預設"
+
+# XXX 要覆查 - 20061025
 #: ../pidgin/gtkprefs.c:517
 msgid "Smiley theme failed to unpack."
 msgstr "無法打開表情主題。"
 
+#  NOTE 直譯「安裝主題」好像很無棱兩可,加個「檔」字好像較好
 #: ../pidgin/gtkprefs.c:644
 msgid "Install Theme"
-msgstr ""
-
-#: ../pidgin/gtkprefs.c:697
+msgstr "安裝主題檔"
+
+#: ../pidgin/gtkprefs.c:698
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
-msgstr ""
-"在下面的清單中選取一個你所想喜歡的表情主題。你可以用拖曳的方式將新的表情主題"
-"安裝到清單中。"
-
-#: ../pidgin/gtkprefs.c:732
+msgstr "在下面的清單中選取一個你所想喜歡的表情主題。你可以用拖曳的方式將新的表情主題安裝到清單中。"
+
+#: ../pidgin/gtkprefs.c:733
 msgid "Icon"
 msgstr "圖示"
 
-#: ../pidgin/gtkprefs.c:894
+#: ../pidgin/gtkprefs.c:895
 msgid "System Tray Icon"
 msgstr "系統工作匣圖示"
 
-#: ../pidgin/gtkprefs.c:895
+#: ../pidgin/gtkprefs.c:896
 msgid "_Show system tray icon:"
 msgstr "顯示系統工作匣圖示(_S):"
 
@@ -16324,242 +16343,277 @@
 msgid "On unread messages"
 msgstr "有未讀訊息時"
 
-#: ../pidgin/gtkprefs.c:904
+#: ../pidgin/gtkprefs.c:905
 msgid "Conversation Window Hiding"
 msgstr "隱藏即時訊息交談視窗"
 
-#: ../pidgin/gtkprefs.c:905
+#: ../pidgin/gtkprefs.c:906
 msgid "_Hide new IM conversations:"
 msgstr "隱藏新的即時訊息交談(_H):"
 
-#: ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1944
+#: ../pidgin/gtkprefs.c:909 ../pidgin/gtkprefs.c:2045
 msgid "When away"
 msgstr "離開期間"
 
 #. All the tab options!
-#: ../pidgin/gtkprefs.c:916
+#: ../pidgin/gtkprefs.c:917
 msgid "Tabs"
 msgstr "分頁"
 
-#: ../pidgin/gtkprefs.c:918
+#: ../pidgin/gtkprefs.c:919
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "使用分頁視窗顯示即時訊息和聊天(_T)"
 
-#: ../pidgin/gtkprefs.c:932
+#: ../pidgin/gtkprefs.c:933
 msgid "Show close b_utton on tabs"
 msgstr "在分頁上顯示關閉鍵(_U)"
 
-#: ../pidgin/gtkprefs.c:935
+#: ../pidgin/gtkprefs.c:936
 msgid "_Placement:"
 msgstr "標籤位置(_P):"
 
-#: ../pidgin/gtkprefs.c:937
+#: ../pidgin/gtkprefs.c:938
 msgid "Top"
 msgstr "視窗上方"
 
-#: ../pidgin/gtkprefs.c:938
+#: ../pidgin/gtkprefs.c:939
 msgid "Bottom"
 msgstr "視窗下方"
 
-#: ../pidgin/gtkprefs.c:939
+#: ../pidgin/gtkprefs.c:940
 msgid "Left"
 msgstr "視窗左側"
 
-#: ../pidgin/gtkprefs.c:940
+#: ../pidgin/gtkprefs.c:941
 msgid "Right"
 msgstr "視窗右側"
 
-#: ../pidgin/gtkprefs.c:942
+#: ../pidgin/gtkprefs.c:943
 msgid "Left Vertical"
 msgstr "左邊垂直"
 
-#: ../pidgin/gtkprefs.c:943
+#: ../pidgin/gtkprefs.c:944
 msgid "Right Vertical"
 msgstr "右邊垂直"
 
-#: ../pidgin/gtkprefs.c:950
+#: ../pidgin/gtkprefs.c:951
 msgid "N_ew conversations:"
 msgstr "新交談(_E):"
 
-#: ../pidgin/gtkprefs.c:995
+#: ../pidgin/gtkprefs.c:997
 msgid "Show _formatting on incoming messages"
 msgstr "顯示所收訊息的格式化(_F)"
 
-#: ../pidgin/gtkprefs.c:998
-#, fuzzy
+#  TODO 要覆查 - acli 20070918
+#: ../pidgin/gtkprefs.c:999
+msgid "Close IMs immediately when the tab is closed"
+msgstr "關閉分頁時隨即關閉分頁內所有的即時通訊"
+
+#  TODO 要覆查 - acli 20070912
+#: ../pidgin/gtkprefs.c:1002
 msgid "Show _detailed information"
-msgstr "顯示登入資訊"
-
-#: ../pidgin/gtkprefs.c:1000
+msgstr "顯示詳細資訊(_D)"
+
+#: ../pidgin/gtkprefs.c:1004
 msgid "Enable buddy ic_on animation"
 msgstr "啟動好友圖示動畫(_O)"
 
-#: ../pidgin/gtkprefs.c:1007
+#: ../pidgin/gtkprefs.c:1011
 msgid "_Notify buddies that you are typing to them"
 msgstr "通知你的好友你正在發訊息給他們(_N)"
 
-#: ../pidgin/gtkprefs.c:1010
+#: ../pidgin/gtkprefs.c:1014
 msgid "Highlight _misspelled words"
 msgstr "標示出拼錯的字(_M)"
 
-#: ../pidgin/gtkprefs.c:1014
+#: ../pidgin/gtkprefs.c:1018
 msgid "Use smooth-scrolling"
 msgstr "使用平滑捲軸"
 
-#: ../pidgin/gtkprefs.c:1017
+#: ../pidgin/gtkprefs.c:1021
 msgid "F_lash window when IMs are received"
 msgstr "收到即時訊息後閃動視窗(_F)"
 
-#: ../pidgin/gtkprefs.c:1019
-#, fuzzy
+#: ../pidgin/gtkprefs.c:1023
 msgid "Minimi_ze new conversation windows"
-msgstr "浮現交談視窗(_A)"
-
-#: ../pidgin/gtkprefs.c:1023
-#, fuzzy
-msgid "Font"
-msgstr "字型"
-
-#: ../pidgin/gtkprefs.c:1025
-msgid "Use document font from _theme"
-msgstr ""
+msgstr "最小化所有新交談視窗(_Z)"
 
 #: ../pidgin/gtkprefs.c:1027
-msgid "Use font from _theme"
-msgstr ""
-
+msgid "Font"
+msgstr "字型"
+
+#  XXX 要覆查 - acli 20070614
 #: ../pidgin/gtkprefs.c:1029
-#, fuzzy
+msgid "Use document font from _theme"
+msgstr "使用主題指定的文件字型(_T)"
+
+#: ../pidgin/gtkprefs.c:1031
+msgid "Use font from _theme"
+msgstr "使用主題指定的字型(_T)"
+
+#: ../pidgin/gtkprefs.c:1033
 msgid "Conversation _font:"
-msgstr "交談視窗的輸入欄位"
-
-#: ../pidgin/gtkprefs.c:1043
+msgstr "交談用的字型(_F):"
+
+#: ../pidgin/gtkprefs.c:1047
 msgid "Default Formatting"
 msgstr "預設格式"
 
-# NOTE 這不是說明文,而是樣本本身,玩死人了 :P
-#: ../pidgin/gtkprefs.c:1062
-#, fuzzy
+# NOTE 這不是說明文,而是樣本本身,玩死人了 :P
+#: ../pidgin/gtkprefs.c:1066
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
-msgstr ""
-"這是一個樣本。假如你使用的協定支援格式化,送出訊息的式樣將會類似這段文字。"
-
-#: ../pidgin/gtkprefs.c:1128
+msgstr "這是一個樣本。假如你使用的協定支援格式化,送出訊息的式樣將會類似這段文字。"
+
+#: ../pidgin/gtkprefs.c:1126
+msgid "Cannot start proxy configuration program."
+msgstr "無法啟動代理伺服器設定程式。"
+
+#: ../pidgin/gtkprefs.c:1138
+msgid "Cannot start browser configuration program."
+msgstr "無法啟動瀏覽器設定程式。"
+
+#: ../pidgin/gtkprefs.c:1158
 msgid "ST_UN server:"
 msgstr "STUN 伺服器(_U):"
 
-#: ../pidgin/gtkprefs.c:1140
+#: ../pidgin/gtkprefs.c:1170
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">例:stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1144
+#: ../pidgin/gtkprefs.c:1174
 msgid "_Autodetect IP address"
 msgstr "自動偵測 IP 位址(_A)"
 
-#: ../pidgin/gtkprefs.c:1153
+#: ../pidgin/gtkprefs.c:1183
 msgid "Public _IP:"
 msgstr "公共IP (_I):"
 
-#: ../pidgin/gtkprefs.c:1182
+#: ../pidgin/gtkprefs.c:1214
 msgid "Ports"
 msgstr "通訊埠"
 
-#: ../pidgin/gtkprefs.c:1185
+#: ../pidgin/gtkprefs.c:1217
 msgid "_Manually specify range of ports to listen on"
 msgstr "自定通訊埠監聽範圍(_M)"
 
-#: ../pidgin/gtkprefs.c:1188
+#: ../pidgin/gtkprefs.c:1220
 msgid "_Start port:"
 msgstr "啟始通訊埠(_S):"
 
-#: ../pidgin/gtkprefs.c:1195
+#: ../pidgin/gtkprefs.c:1227
 msgid "_End port:"
 msgstr "結束通訊埠(_E):"
 
-#: ../pidgin/gtkprefs.c:1203
+#: ../pidgin/gtkprefs.c:1235
+msgid "Proxy Server &amp; Browser"
+msgstr "代理伺服器及瀏覽器"
+
+#: ../pidgin/gtkprefs.c:1243
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>找不到代理伺服器設定程式。</b>"
+
+#: ../pidgin/gtkprefs.c:1251
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>找不到瀏覽器設定程式。</b>"
+
+#: ../pidgin/gtkprefs.c:1256
+msgid ""
+"Proxy & Browser preferences are configured\n"
+"in GNOME Preferences"
+msgstr "請使用 GNOME 的「偏好設定」功能更改代理伺服器或瀏覽器設定。"
+
+#: ../pidgin/gtkprefs.c:1263
+msgid "Configure _Proxy"
+msgstr "設定代理伺服器(_P)"
+
+#: ../pidgin/gtkprefs.c:1268
+msgid "Configure _Browser"
+msgstr "設定瀏覽器(_B)"
+
+#: ../pidgin/gtkprefs.c:1274
 msgid "Proxy Server"
 msgstr "代理伺服器"
 
-# NOTE 理由同前,不用「毋須」,改為「不使用」
-#: ../pidgin/gtkprefs.c:1207
+# NOTE 理由同前,不用「毋須」,改為「不使用」
+#: ../pidgin/gtkprefs.c:1279
 msgid "No proxy"
 msgstr "不使用代理伺服器"
 
-#: ../pidgin/gtkprefs.c:1263
+#: ../pidgin/gtkprefs.c:1335
 msgid "_User:"
 msgstr "使用者(_U):"
 
-#: ../pidgin/gtkprefs.c:1328
+#: ../pidgin/gtkprefs.c:1423
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1329
+#: ../pidgin/gtkprefs.c:1424
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1330
+#: ../pidgin/gtkprefs.c:1425
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1331
+#: ../pidgin/gtkprefs.c:1426
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1332
+#: ../pidgin/gtkprefs.c:1427
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1333
+#: ../pidgin/gtkprefs.c:1428
 msgid "GNOME Default"
 msgstr "GNOME預設"
 
-#: ../pidgin/gtkprefs.c:1334
+#: ../pidgin/gtkprefs.c:1429
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1335
+#: ../pidgin/gtkprefs.c:1430
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1336
+#: ../pidgin/gtkprefs.c:1431
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1337
+#: ../pidgin/gtkprefs.c:1432
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1346
+#: ../pidgin/gtkprefs.c:1441
 msgid "Manual"
 msgstr "使用者自定"
 
-#: ../pidgin/gtkprefs.c:1399
+#: ../pidgin/gtkprefs.c:1494
 msgid "Browser Selection"
 msgstr "選擇瀏覽器"
 
-#: ../pidgin/gtkprefs.c:1403
+#: ../pidgin/gtkprefs.c:1498
 msgid "_Browser:"
 msgstr "瀏覽器(_B):"
 
-#: ../pidgin/gtkprefs.c:1411
+#: ../pidgin/gtkprefs.c:1506
 msgid "_Open link in:"
 msgstr "在瀏覽器中打開連結(_O):"
 
-#: ../pidgin/gtkprefs.c:1413
+#: ../pidgin/gtkprefs.c:1508
 msgid "Browser default"
 msgstr "瀏覽器預設"
 
-#: ../pidgin/gtkprefs.c:1414
+#: ../pidgin/gtkprefs.c:1509
 msgid "Existing window"
 msgstr "既有的視窗"
 
-#: ../pidgin/gtkprefs.c:1416
+#: ../pidgin/gtkprefs.c:1511
 msgid "New tab"
 msgstr "新分頁"
 
-#: ../pidgin/gtkprefs.c:1430
+#: ../pidgin/gtkprefs.c:1525
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -16568,69 +16622,63 @@
 "使用者自定(_M):\n"
 "(請以 %s 代表網址)"
 
-#: ../pidgin/gtkprefs.c:1470
+#: ../pidgin/gtkprefs.c:1566
 msgid "Log _format:"
 msgstr "日誌格式(_F):"
 
-#: ../pidgin/gtkprefs.c:1475
+#: ../pidgin/gtkprefs.c:1571
 msgid "Log all _instant messages"
 msgstr "記錄所有即時訊息(_I)"
 
-#: ../pidgin/gtkprefs.c:1477
+#: ../pidgin/gtkprefs.c:1573
 msgid "Log all c_hats"
 msgstr "記錄所有聊天內容(_H)"
 
-#: ../pidgin/gtkprefs.c:1479
+#: ../pidgin/gtkprefs.c:1575
 msgid "Log all _status changes to system log"
 msgstr "記錄所有狀態改變至系統日誌(_S)"
 
-#: ../pidgin/gtkprefs.c:1625
+#: ../pidgin/gtkprefs.c:1725
 msgid "Sound Selection"
 msgstr "選取音效"
 
-#: ../pidgin/gtkprefs.c:1635
-#, c-format
+#: ../pidgin/gtkprefs.c:1735
 msgid "Quietest"
 msgstr "最小聲"
 
-#: ../pidgin/gtkprefs.c:1637
-#, c-format
+#: ../pidgin/gtkprefs.c:1737
 msgid "Quieter"
 msgstr "再小聲"
 
-#: ../pidgin/gtkprefs.c:1639
-#, c-format
+#: ../pidgin/gtkprefs.c:1739
 msgid "Quiet"
 msgstr "小聲"
 
-#: ../pidgin/gtkprefs.c:1643
-#, c-format
+#: ../pidgin/gtkprefs.c:1743
 msgid "Loud"
 msgstr "大聲"
 
-#: ../pidgin/gtkprefs.c:1645
-#, c-format
+#: ../pidgin/gtkprefs.c:1745
 msgid "Louder"
 msgstr "再大聲"
 
-#: ../pidgin/gtkprefs.c:1647
-#, c-format
+#: ../pidgin/gtkprefs.c:1747
 msgid "Loudest"
 msgstr "最大聲"
 
-#: ../pidgin/gtkprefs.c:1713
+#: ../pidgin/gtkprefs.c:1813
 msgid "_Method:"
 msgstr "播放方式(_M):"
 
-#: ../pidgin/gtkprefs.c:1715
+#: ../pidgin/gtkprefs.c:1815
 msgid "Console beep"
 msgstr "嗶一聲"
 
-#: ../pidgin/gtkprefs.c:1722
+#: ../pidgin/gtkprefs.c:1822
 msgid "No sounds"
 msgstr "無音效"
 
-#: ../pidgin/gtkprefs.c:1730
+#: ../pidgin/gtkprefs.c:1830
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -16639,83 +16687,82 @@
 "音效指令(_C):\n"
 "(請以 %s 代表檔名)"
 
-#: ../pidgin/gtkprefs.c:1757
+#: ../pidgin/gtkprefs.c:1857
 msgid "Sounds when conversation has _focus"
 msgstr "當交談取得輸入焦點發出音效(_F)"
 
-#: ../pidgin/gtkprefs.c:1759
+#: ../pidgin/gtkprefs.c:1859
 msgid "Enable sounds:"
 msgstr "啟動音效:"
 
-#: ../pidgin/gtkprefs.c:1770
+#: ../pidgin/gtkprefs.c:1870
 msgid "Volume:"
 msgstr "音量:"
 
-#: ../pidgin/gtkprefs.c:1850
+#: ../pidgin/gtkprefs.c:1950
 msgid "Play"
 msgstr "播放"
 
-#: ../pidgin/gtkprefs.c:1927
+#: ../pidgin/gtkprefs.c:2028
 msgid "_Report idle time:"
 msgstr "閒置時間基準(_R)"
 
-#: ../pidgin/gtkprefs.c:1932
+#: ../pidgin/gtkprefs.c:2033
 msgid "Based on keyboard or mouse use"
 msgstr "以鍵盤及滑鼠的使用為基準"
 
-#: ../pidgin/gtkprefs.c:1941
+#: ../pidgin/gtkprefs.c:2042
 msgid "_Auto-reply:"
 msgstr "何時送出自動回應:"
 
-#: ../pidgin/gtkprefs.c:1945
+#: ../pidgin/gtkprefs.c:2046
 msgid "When both away and idle"
 msgstr "當離開並同時閒置時"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1951
+#: ../pidgin/gtkprefs.c:2052
 msgid "Auto-away"
 msgstr "自動離開"
 
-#: ../pidgin/gtkprefs.c:1953
+#: ../pidgin/gtkprefs.c:2054
 msgid "Change status when _idle"
 msgstr "閒置時更改狀態(_I)"
 
-# NOTE 譯文更動 by Ambrose
-#: ../pidgin/gtkprefs.c:1957
-#, fuzzy
+# NOTE 譯文更動 by Ambrose
+#: ../pidgin/gtkprefs.c:2058
 msgid "_Minutes before becoming idle:"
-msgstr "閒置多少分鐘設為離開(_M):"
-
-#: ../pidgin/gtkprefs.c:1965
+msgstr "閒置多少分鐘更改狀態(_M):"
+
+#: ../pidgin/gtkprefs.c:2066
 msgid "Change _status to:"
 msgstr "更改狀態為(_S):"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1986
+#: ../pidgin/gtkprefs.c:2087
 msgid "Status at Startup"
 msgstr "啟動時狀態"
 
-#: ../pidgin/gtkprefs.c:1988
+#: ../pidgin/gtkprefs.c:2089
 msgid "Use status from last _exit at startup"
 msgstr "使用上次結束前的狀態"
 
-#: ../pidgin/gtkprefs.c:1994
+#: ../pidgin/gtkprefs.c:2095
 msgid "Status to a_pply at startup:"
 msgstr "啟動時套用的狀態:"
 
-#: ../pidgin/gtkprefs.c:2032
+#: ../pidgin/gtkprefs.c:2134
 msgid "Interface"
 msgstr "介面"
 
-#: ../pidgin/gtkprefs.c:2034
+#: ../pidgin/gtkprefs.c:2136
 msgid "Smiley Themes"
 msgstr "表情主題"
 
-#: ../pidgin/gtkprefs.c:2041
+#: ../pidgin/gtkprefs.c:2143
 msgid "Browser"
 msgstr "瀏覽器"
 
-#: ../pidgin/gtkprefs.c:2045
+#: ../pidgin/gtkprefs.c:2147
 msgid "Status / Idle"
 msgstr "狀態/閒置"
 
@@ -16739,104 +16786,104 @@
 msgid "Block only the users below"
 msgstr "封鎖以下的使用者"
 
-#: ../pidgin/gtkprivacy.c:370
+#: ../pidgin/gtkprivacy.c:372
 msgid "Privacy"
 msgstr "私隱設定"
 
-#: ../pidgin/gtkprivacy.c:382
+#: ../pidgin/gtkprivacy.c:384
 msgid "Changes to privacy settings take effect immediately."
 msgstr "私隱設定將立刻生效。"
 
 #. "Set privacy for:" label
-#: ../pidgin/gtkprivacy.c:394
+#: ../pidgin/gtkprivacy.c:396
 msgid "Set privacy for:"
 msgstr "帳號:"
 
-#: ../pidgin/gtkprivacy.c:557 ../pidgin/gtkprivacy.c:574
+#: ../pidgin/gtkprivacy.c:559 ../pidgin/gtkprivacy.c:576
 msgid "Permit User"
 msgstr "許可使用者"
 
-#: ../pidgin/gtkprivacy.c:558
+#: ../pidgin/gtkprivacy.c:560
 msgid "Type a user you permit to contact you."
 msgstr "輸入你所許可聯絡你的使用者。"
 
-#: ../pidgin/gtkprivacy.c:559
+#: ../pidgin/gtkprivacy.c:561
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "請輸入你所許可聯絡你的使用者的名稱。"
 
-#: ../pidgin/gtkprivacy.c:562 ../pidgin/gtkprivacy.c:578
+#: ../pidgin/gtkprivacy.c:564 ../pidgin/gtkprivacy.c:580
 msgid "_Permit"
 msgstr "許可(_P)"
 
-#: ../pidgin/gtkprivacy.c:568
+#: ../pidgin/gtkprivacy.c:570
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "許可 %s 聯絡你?"
 
-#: ../pidgin/gtkprivacy.c:570
+#: ../pidgin/gtkprivacy.c:572
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "你確定許可 %s 聯絡你嗎?"
 
-#: ../pidgin/gtkprivacy.c:599 ../pidgin/gtkprivacy.c:613
+#: ../pidgin/gtkprivacy.c:601 ../pidgin/gtkprivacy.c:615
 msgid "Block User"
 msgstr "拒絕使用者"
 
-#: ../pidgin/gtkprivacy.c:600
+#: ../pidgin/gtkprivacy.c:602
 msgid "Type a user to block."
 msgstr "輸入被拒絕的使用者。"
 
-#: ../pidgin/gtkprivacy.c:601
+#: ../pidgin/gtkprivacy.c:603
 msgid "Please enter the name of the user you wish to block."
 msgstr "請輸入被你拒絕的使用者的名稱。"
 
-#: ../pidgin/gtkprivacy.c:609
+#: ../pidgin/gtkprivacy.c:611
 #, c-format
 msgid "Block %s?"
 msgstr "拒絕 %s?"
 
-#: ../pidgin/gtkprivacy.c:611
+#: ../pidgin/gtkprivacy.c:613
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "你確定要拒絕 %s?"
 
-#: ../pidgin/gtkrequest.c:272
+#: ../pidgin/gtkrequest.c:322
 msgid "Apply"
 msgstr "套用"
 
-#: ../pidgin/gtkrequest.c:1507
+#: ../pidgin/gtkrequest.c:1651
 msgid "That file already exists"
 msgstr "那個檔案已經存在"
 
-#: ../pidgin/gtkrequest.c:1508
+#: ../pidgin/gtkrequest.c:1652
 msgid "Would you like to overwrite it?"
 msgstr "你要覆蓋它嗎?"
 
-#: ../pidgin/gtkrequest.c:1511
+#: ../pidgin/gtkrequest.c:1655
 msgid "Overwrite"
 msgstr "覆寫"
 
-#: ../pidgin/gtkrequest.c:1512
+#: ../pidgin/gtkrequest.c:1656
 msgid "Choose New Name"
 msgstr "選取新名稱"
 
-#: ../pidgin/gtkrequest.c:1650 ../pidgin/gtkrequest.c:1664
+#: ../pidgin/gtkrequest.c:1797 ../pidgin/gtkrequest.c:1811
 msgid "Select Folder..."
 msgstr "選擇資料匣..."
 
 #. Create the window.
-#: ../pidgin/gtkroomlist.c:375
+#: ../pidgin/gtkroomlist.c:518 ../pidgin/gtkroomlist.c:688
 msgid "Room List"
 msgstr "聊天室清單"
 
 #  list button
 #. list button
-#: ../pidgin/gtkroomlist.c:443
+#: ../pidgin/gtkroomlist.c:756
 msgid "_Get List"
 msgstr "取得清單(_G)"
 
 #. add button
-#: ../pidgin/gtkroomlist.c:451
+#: ../pidgin/gtkroomlist.c:764
 msgid "_Add Chat"
 msgstr "新增聊天室(_A)"
 
@@ -16845,7 +16892,7 @@
 msgstr "你確定你要刪除被選取的狀態?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:620 ../pidgin/gtksavedstatuses.c:1266
+#: ../pidgin/gtksavedstatuses.c:620 ../pidgin/gtksavedstatuses.c:1273
 msgid "_Use"
 msgstr "使用(_U)"
 
@@ -16853,30 +16900,30 @@
 msgid "Title already in use.  You must choose a unique title."
 msgstr "目前標題正在使用中。你必須選取一個唯一的標題。"
 
-# TODO - 這個有點不妥,但想不到更好的 - 20061123
-#: ../pidgin/gtksavedstatuses.c:970
+# TODO - 這個有點不妥,但想不到更好的 - 20061123
+#: ../pidgin/gtksavedstatuses.c:976
 msgid "Different"
 msgstr "差異"
 
-#: ../pidgin/gtksavedstatuses.c:1159
+#: ../pidgin/gtksavedstatuses.c:1165
 msgid "_Title:"
 msgstr "標題(_T):"
 
-#: ../pidgin/gtksavedstatuses.c:1178 ../pidgin/gtksavedstatuses.c:1497
+#: ../pidgin/gtksavedstatuses.c:1184 ../pidgin/gtksavedstatuses.c:1505
 msgid "_Status:"
 msgstr "狀態(_S):"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1210
+#: ../pidgin/gtksavedstatuses.c:1217
 msgid "Use a _different status for some accounts"
 msgstr "為部份帳號設定不同的狀態(_D)"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1274
+#: ../pidgin/gtksavedstatuses.c:1281
 msgid "Sa_ve & Use"
 msgstr "儲存並使用(_V)"
 
-#: ../pidgin/gtksavedstatuses.c:1480
+#: ../pidgin/gtksavedstatuses.c:1488
 #, c-format
 msgid "Status for %s"
 msgstr "狀態:%s"
@@ -16885,93 +16932,94 @@
 msgid "Waiting for network connection"
 msgstr "等待網絡連線..."
 
-#: ../pidgin/gtkutils.c:632
+#: ../pidgin/gtkstatusbox.c:1072
+msgid "New status..."
+msgstr "新增狀態..."
+
+#: ../pidgin/gtkstatusbox.c:1073
+msgid "Saved statuses..."
+msgstr "狀態清單..."
+
+#: ../pidgin/gtkutils.c:634
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1399 ../pidgin/gtkutils.c:1422
+#: ../pidgin/gtkutils.c:1401 ../pidgin/gtkutils.c:1424
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "載入 %s 時發生以下錯誤:%s"
 
-#: ../pidgin/gtkutils.c:1402 ../pidgin/gtkutils.c:1424
+#: ../pidgin/gtkutils.c:1404 ../pidgin/gtkutils.c:1426
 msgid "Failed to load image"
 msgstr "讀取圖像失敗"
 
-#: ../pidgin/gtkutils.c:1498
+#: ../pidgin/gtkutils.c:1500
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "無法傳送目錄 %s。"
 
-#: ../pidgin/gtkutils.c:1499
+#: ../pidgin/gtkutils.c:1501
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
 "individually."
 msgstr "%s 沒有辦法傳送目錄,你需要個別傳送目錄內的檔案。"
 
-#: ../pidgin/gtkutils.c:1531 ../pidgin/gtkutils.c:1543
-#: ../pidgin/gtkutils.c:1550
+#: ../pidgin/gtkutils.c:1535 ../pidgin/gtkutils.c:1547
+#: ../pidgin/gtkutils.c:1554
 msgid "You have dragged an image"
 msgstr "你拖曳了一個圖像"
 
-#: ../pidgin/gtkutils.c:1532
+#: ../pidgin/gtkutils.c:1536
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
-msgstr ""
-"你可以透過檔案傳輸、插入訊息,或者把它當成是你的好友圖示等方式,來傳送圖像檔"
-"給這個使用者。"
-
-#: ../pidgin/gtkutils.c:1538 ../pidgin/gtkutils.c:1558
+msgstr "你可以透過檔案傳輸、插入訊息,或者把它當成是你的好友圖示等方式,來傳送圖像檔給這個使用者。"
+
+#: ../pidgin/gtkutils.c:1542 ../pidgin/gtkutils.c:1562
 msgid "Set as buddy icon"
 msgstr "設為好友圖示"
 
-#: ../pidgin/gtkutils.c:1539 ../pidgin/gtkutils.c:1559
+#: ../pidgin/gtkutils.c:1543 ../pidgin/gtkutils.c:1563
 msgid "Send image file"
 msgstr "傳送圖像檔"
 
-#: ../pidgin/gtkutils.c:1540 ../pidgin/gtkutils.c:1559
+#: ../pidgin/gtkutils.c:1544 ../pidgin/gtkutils.c:1563
 msgid "Insert in message"
 msgstr "插入到訊息"
 
-#: ../pidgin/gtkutils.c:1544
+#: ../pidgin/gtkutils.c:1548
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "你要把它設為這個使用者的好友圖示嗎?"
 
-#: ../pidgin/gtkutils.c:1551
-#, fuzzy
+#: ../pidgin/gtkutils.c:1555
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
-msgstr ""
-"你可以透過檔案傳輸、插入訊息,或者把它當成是你的好友圖示等方式,來傳送圖像檔"
-"給這個使用者。"
-
-#: ../pidgin/gtkutils.c:1552
+msgstr "你可以透過檔案傳輸,或者把它當成是你的好友圖示等方式,來傳送圖像檔給這個使用者。"
+
+#: ../pidgin/gtkutils.c:1556
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
-msgstr ""
-"你可以透過插入訊息,或者把它當成是你的好友圖示等方式,來傳送圖像檔給這個使用"
-"者。"
+msgstr "你可以透過插入訊息,或者把它當成是你的好友圖示等方式,來傳送圖像檔給這個使用者。"
 
 #. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
 #. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1610
+#: ../pidgin/gtkutils.c:1615
 msgid "Cannot send launcher"
 msgstr "無法傳送啟動器"
 
-#: ../pidgin/gtkutils.c:1610
+#: ../pidgin/gtkutils.c:1615
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
 msgstr "你拖曳了一個啟動器;你大概想傳送啟動器要啟動的檔案,而不是啟動器本身。"
 
-#: ../pidgin/gtkutils.c:2345
+#: ../pidgin/gtkutils.c:2350
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -16982,25 +17030,25 @@
 "<b>檔案大小:</b> %s\n"
 "<b>圖像尺寸:</b> %d×%d"
 
-#: ../pidgin/gtkutils.c:2641
+#: ../pidgin/gtkutils.c:2646
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr "'%s' 對 %s 來說太大了。請試試小一點的影象。\n"
 
-#: ../pidgin/gtkutils.c:2643
+#: ../pidgin/gtkutils.c:2648
 msgid "Icon Error"
 msgstr "圖像錯誤"
 
-#: ../pidgin/gtkutils.c:2644
+#: ../pidgin/gtkutils.c:2649
 msgid "Could not set icon"
 msgstr "無法設定圖像"
 
-#: ../pidgin/gtkutils.c:2744
+#: ../pidgin/gtkutils.c:2749
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "無法開啟檔案「%s」:%s"
 
-#: ../pidgin/gtkutils.c:2793
+#: ../pidgin/gtkutils.c:2798
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -17038,58 +17086,57 @@
 msgid "_Open Mail"
 msgstr "開啟郵件(_O)"
 
-#  TODO Untranslated - This will need to be translated (NOT transliterated) for Chinese, but that'd be too much work
+# NOTE 這是「Default」表情主題的說明
 #: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2
-#, fuzzy
 msgid "Pidgin smileys"
-msgstr "Pidgin"
-
+msgstr "為 Pidgin 特別設計的表情圖示"
+
+# NOTE 這是「none」表情主題的標題(太奇怪了,這是沒有圖示的主題喎)
 #: ../pidgin/pixmaps/emotes/none/none.theme.in.h:1
 msgid "Penguin Pimps"
 msgstr ""
 
 #: ../pidgin/pixmaps/emotes/none/none.theme.in.h:2
 msgid "Selecting this disables graphical emoticons."
-msgstr ""
-
-# TODO 要覆查 - 20061028
+msgstr "不使用表情圖示,選擇這個主題即可。"
+
+# NOTE 這個「none」是「none」表情主題(不使用圖示)的主題名稱(?!)
 #: ../pidgin/pixmaps/emotes/none/none.theme.in.h:3
-#, fuzzy
 msgid "none"
-msgstr "(沒有名字)"
-
-#: ../pidgin/plugins/cap/cap.c:450
+msgstr "無"
+
+#: ../pidgin/plugins/cap/cap.c:451
 msgid "Display Statistics"
 msgstr "顯示統計資料"
 
-#: ../pidgin/plugins/cap/cap.c:462 ../pidgin/plugins/cap/cap.c:465
+#: ../pidgin/plugins/cap/cap.c:464 ../pidgin/plugins/cap/cap.c:467
 msgid "Response Probability:"
 msgstr "「回答」或然率:"
 
-#: ../pidgin/plugins/cap/cap.c:811
+#: ../pidgin/plugins/cap/cap.c:813
 msgid "Statistics Configuration"
 msgstr "統計設定"
 
-#  NOTE 參閱 gtk/plugins/cap/README
+#  NOTE 參閱 gtk/plugins/cap/README
 #. msg_difference spinner
-#: ../pidgin/plugins/cap/cap.c:814
+#: ../pidgin/plugins/cap/cap.c:816
 msgid "Maximum response timeout:"
 msgstr "好友作出回覆的時間上限:"
 
-#: ../pidgin/plugins/cap/cap.c:817 ../pidgin/plugins/cap/cap.c:824
-#: ../pidgin/plugins/cap/cap.c:831 ../pidgin/plugins/timestamp.c:150
+#: ../pidgin/plugins/cap/cap.c:819 ../pidgin/plugins/cap/cap.c:826
+#: ../pidgin/plugins/cap/cap.c:833 ../pidgin/plugins/timestamp.c:150
 msgid "minutes"
 msgstr "分鐘"
 
 #. last_seen spinner
-#: ../pidgin/plugins/cap/cap.c:821
+#: ../pidgin/plugins/cap/cap.c:823
 msgid "Maximum last-seen difference:"
 msgstr ""
 
-#  NOTE 參閱 gtk/plugins/cap/README
-#  FIXME 但這只能是暫譯,譯文絕對有待改進
+#  NOTE 參閱 gtk/plugins/cap/README
+#  FIXME 但這只能是暫譯,譯文絕對有待改進
 #. threshold spinner
-#: ../pidgin/plugins/cap/cap.c:828
+#: ../pidgin/plugins/cap/cap.c:830
 msgid "Threshold:"
 msgstr "精密度:"
 
@@ -17099,24 +17146,22 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/cap/cap.c:936
+#: ../pidgin/plugins/cap/cap.c:938
 msgid "Contact Availability Prediction"
 msgstr "好友在線狀態預測"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/cap/cap.c:938
+#: ../pidgin/plugins/cap/cap.c:940
 msgid "Contact Availability Prediction plugin."
 msgstr "好友在線狀態預測模組"
 
 #. *  summary
-#: ../pidgin/plugins/cap/cap.c:939
+#: ../pidgin/plugins/cap/cap.c:941
 msgid ""
 "The contact availability plugin (cap) is used to display statistical "
 "information about buddies in a users contact list."
-msgstr ""
-"好友在線狀態預測模組 (contact availability plugin, 或稱 cap) 提供有關好友清單"
-"內好友的統計資料。"
+msgstr "好友在線狀態預測模組 (contact availability plugin, 或稱 cap) 提供有關好友清單內好友的統計資料。"
 
 #: ../pidgin/plugins/contact_priority.c:61
 msgid "Buddy is idle"
@@ -17143,7 +17188,7 @@
 msgid "Point values to use when..."
 msgstr "個別好友狀態的得分值:"
 
-# NOTE 每行不可太長,並要人手用「\n」分隔,否則視窗會過闊
+# NOTE 每行不可太長,並要人手用「\n」分隔,否則視窗會過闊
 #: ../pidgin/plugins/contact_priority.c:118
 msgid ""
 "The buddy with the <i>largest score</i> is the buddy who will have priority "
@@ -17153,12 +17198,12 @@
 "所指定的得分值計分,積分最多者為「優先」,成為當時實際\n"
 "使用的好友帳號。\n"
 
-# NOTE 舊版 (1.x) Pidgin 中此譯文經 Etan Reisner (開發者之一) 核實,新版 (2.0) Pidgin 譯文要重新核實
+# NOTE 舊版 (1.x) Pidgin 中此譯文經 Etan Reisner (開發者之一) 核實,新版 (2.0) Pidgin 譯文要重新核實
 #: ../pidgin/plugins/contact_priority.c:125
 msgid "Use last buddy when scores are equal"
 msgstr "得分相同時,使用最後(而非最先)一個匹配的好友帳號"
 
-# NOTE 怪怪的,不知道指的是什麼?!
+# NOTE 怪怪的,不知道指的是什麼?!
 #: ../pidgin/plugins/contact_priority.c:130
 msgid "Point values to use for account..."
 msgstr "個別帳號的得分值"
@@ -17169,26 +17214,24 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/contact_priority.c:187
+#: ../pidgin/plugins/contact_priority.c:188
 msgid "Contact Priority"
 msgstr "好友優先次序"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../pidgin/plugins/contact_priority.c:190
+#: ../pidgin/plugins/contact_priority.c:191
 msgid ""
 "Allows for controlling the values associated with different buddy states."
 msgstr "讓你自定各個好友狀態的得分值。"
 
 #. *< description
-#: ../pidgin/plugins/contact_priority.c:192
+#: ../pidgin/plugins/contact_priority.c:193
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
-msgstr ""
-"讓你自定「閒置」、「離開」及「離線」狀態的得分值,以便計算好友帳號的優先次"
-"序。"
+msgstr "讓你自定「閒置」、「離開」及「離線」狀態的得分值,以便計算好友帳號的優先次序。"
 
 #: ../pidgin/plugins/convcolors.c:23
 msgid "Conversation Colors"
@@ -17202,7 +17245,7 @@
 msgid "Error Messages"
 msgstr "錯誤訊息"
 
-# XXX TODO 我非常討厭把「Highlight」譯成「高亮度」,但譯文可以改進 - Ambrose 20061029
+# XXX TODO 我非常討厭把「Highlight」譯成「高亮度」,但譯文可以改進 - Ambrose 20061029
 #: ../pidgin/plugins/convcolors.c:83
 msgid "Highlighted Messages"
 msgstr "反白訊息"
@@ -17219,7 +17262,7 @@
 msgid "Received Messages"
 msgstr "收到訊息"
 
-#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:251
+#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:245
 #, c-format
 msgid "Select Color for %s"
 msgstr "為%s選擇顏色"
@@ -17255,7 +17298,7 @@
 msgid "Number of conversations per window"
 msgstr "視窗內之交談個數上限"
 
-#  XXX 要核實譯文!
+#  XXX 要核實譯文!
 #: ../pidgin/plugins/extplacement.c:117
 msgid "Separate IM and Chat windows when placing by number"
 msgstr "根據交談個數放置新交談時,以不同的視窗顯示即時訊息和聊天"
@@ -17276,7 +17319,7 @@
 msgid "Extra conversation placement options."
 msgstr "交談視窗位置額外選項。"
 
-#  XXX 譯得很差,請改良 :-(
+#  XXX 譯得很差,請改良 :-(
 #. *< summary
 #. *  description
 #: ../pidgin/plugins/extplacement.c:150
@@ -17337,8 +17380,8 @@
 "往上後向左拖曳為切換到前一個交談。\n"
 "往上後向右拖曳為切換到下一個交談。"
 
-#  NOTE 原始碼指這個解「(即時訊息系統的)帳別」,我覺得有點離譜
-#  NOTE 譯文更動 by Ambrose
+#  NOTE 原始碼指這個解「(即時訊息系統的)帳別」,我覺得有點離譜
+#  NOTE 譯文更動 by Ambrose
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:143
 msgid "Instant Messaging"
 msgstr "即時傳訊帳號"
@@ -17353,7 +17396,7 @@
 msgid "Group:"
 msgstr "羣組:"
 
-#  NOTE 對應 evolution PO 檔之譯法,詳見上面「Local Addressbook」條
+#  NOTE 對應 evolution PO 檔之譯法,詳見上面「Local Addressbook」條
 #. "New Person" button
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:576
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:467
@@ -17366,23 +17409,21 @@
 msgid "Select Buddy"
 msgstr "選擇好友"
 
-#  NOTE 對應 evolution PO 檔之譯法,詳見上面「Local Addressbook」條
+#  NOTE 對應 evolution PO 檔之譯法,詳見上面「Local Addressbook」條
 #. Add the label.
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:343
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
-msgstr ""
-"請從你的目錄服務選擇一個聯絡人,好把這個好友加進去;你亦可以選擇新增一個聯絡"
-"人。"
-
-# XXX 暫譯
+msgstr "請從你的目錄服務選擇一個聯絡人,好把這個好友加進去;你亦可以選擇新增一個聯絡人。"
+
+# XXX 暫譯
 #. Add the expander
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:431
 msgid "User _details"
 msgstr "使用者細節 (_D)"
 
-# XXX 暫譯
+# XXX 暫譯
 #. "Associate Buddy" button
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:484
 msgid "_Associate Buddy"
@@ -17401,7 +17442,7 @@
 msgid "An e-mail address was not found for this buddy."
 msgstr "找不到與這個好友相關的電郵地址。"
 
-#  NOTE 注意!evolution 本身的譯法是「目錄服務」而非「通訊錄」
+#  NOTE 注意!evolution 本身的譯法是「目錄服務」而非「通訊錄」
 #: ../pidgin/plugins/gevolution/gevolution.c:273
 msgid "Add to Address Book"
 msgstr "增加到通訊錄"
@@ -17457,7 +17498,7 @@
 msgid "Account type:"
 msgstr "帳號類型:"
 
-#  NOTE 選擇性資訊
+#  NOTE 選擇性資訊
 #. Optional Information section
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:309
 msgid "Optional information:"
@@ -17495,13 +17536,15 @@
 msgstr "檢查使用者介面的各種信號是否都能正常運作。"
 
 #: ../pidgin/plugins/gtkbuddynote.c:36
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "<b>Buddy Note</b>: %s"
-msgstr "好友備註"
-
-#: ../pidgin/plugins/history.c:188
+msgstr ""
+"\n"
+"<b>好友備註</b>:%s"
+
+#: ../pidgin/plugins/history.c:195
 msgid "History"
 msgstr "歷史記錄"
 
@@ -17535,17 +17578,17 @@
 msgid "Adds a small box to the buddy list that shows if you have new mail."
 msgstr "在好友清單內加一小格,用來顯示你有沒有新郵件。"
 
-#  FIXME 暫譯 - ambrose 20070415
+#  FIXME 暫譯 - ambrose 20070415
 #: ../pidgin/plugins/markerline.c:23
 msgid "Markerline"
 msgstr "標示線"
 
-#  FIXME 暫譯 - ambrose 20070415
+#  FIXME 暫譯 - ambrose 20070415
 #: ../pidgin/plugins/markerline.c:25 ../pidgin/plugins/markerline.c:26
 msgid "Draw a line to indicate new messages in a conversation."
 msgstr "在新訊息旁劃上標示線,以突顯交談內的新訊息。"
 
-#  FIXME 暫譯 - ambrose 20070415
+#  FIXME 暫譯 - ambrose 20070415
 #: ../pidgin/plugins/markerline.c:246
 msgid "Draw Markerline in "
 msgstr "在何處使用標示線"
@@ -17558,14 +17601,14 @@
 msgid "C_hat windows"
 msgstr "聊天視窗(_H)"
 
-# FIXME 暫譯 - 20061028
+# FIXME 暫譯 - 20061028
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:44
 msgid ""
 "A music messaging session has been requested. Please click the MM icon to "
 "accept."
 msgstr "你收到一個音樂訊息工作階段的要求,請按MM圖示開始交談。"
 
-# FIXME 暫譯 - 20061028
+# FIXME 暫譯 - 20061028
 #: ../pidgin/plugins/musicmessaging/musicmessaging.c:45
 msgid "Music messaging session confirmed."
 msgstr "成功確定音樂訊息工作階段。"
@@ -17616,8 +17659,7 @@
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
 "on a piece of music by editting a common score in real-time."
-msgstr ""
-"音樂訊息模組為音樂編寫提供即時傳訊功能,讓多個使用者能同時編輯同一份樂譜。"
+msgstr "音樂訊息模組為音樂編寫提供即時傳訊功能,讓多個使用者能同時編輯同一份樂譜。"
 
 #. ---------- "Notify For" ----------
 #: ../pidgin/plugins/notify.c:678
@@ -17646,15 +17688,15 @@
 msgid "Insert c_ount of new messages into window title"
 msgstr "加入新訊息數目到視窗標題中(_O)"
 
-#  TODO 要覆查 - 20061029
+#  TODO 要覆查 - 20061029
 #. Count xprop method button
 #: ../pidgin/plugins/notify.c:750
 msgid "Insert count of new message into _X property"
 msgstr "加入新訊息數目到 X 屬性中(_X)"
 
-# NOTE 有關「_URGENT」的資料可參閱 http://tronche.com/gui/x/icccm/sec-4.html
-# NOTE「URGENT」一字大概應該保留,因為絕大多數的視窗管理員都不支援,而且會引致奇怪的後果
-# NOTE 譯文更動 by Ambrose
+# NOTE 有關「_URGENT」的資料可參閱 http://tronche.com/gui/x/icccm/sec-4.html
+# NOTE「URGENT」一字大概應該保留,因為絕大多數的視窗管理員都不支援,而且會引致奇怪的後果
+# NOTE 譯文更動 by Ambrose
 #. Urgent method button
 #: ../pidgin/plugins/notify.c:758
 msgid "Set window manager \"_URGENT\" hint"
@@ -17730,7 +17772,7 @@
 msgid "An example plugin that does stuff - see the description."
 msgstr "範例模組————請看介紹。"
 
-# NOTE 譯文更動 by Ambrose
+# NOTE 譯文更動 by Ambrose
 #. *  description
 #: ../pidgin/plugins/pidgininc.c:96
 msgid ""
@@ -17748,7 +17790,7 @@
 msgid "Cursor Color"
 msgstr "游標顏色"
 
-#  XXX 只有一個軟件這樣譯,在無更好的譯文可供參考下暫且借用
+#  XXX 只有一個軟件這樣譯,在無更好的譯文可供參考下暫且借用
 #: ../pidgin/plugins/pidginrc.c:42
 msgid "Secondary Cursor Color"
 msgstr "第二游標顏色"
@@ -17761,46 +17803,37 @@
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView 水平間隔距離"
 
-#: ../pidgin/plugins/pidginrc.c:73
+#: ../pidgin/plugins/pidginrc.c:69
 msgid "Conversation Entry"
 msgstr "交談視窗的輸入欄位"
 
-#: ../pidgin/plugins/pidginrc.c:74
-msgid "Conversation History"
-msgstr "交談歷史"
-
-#: ../pidgin/plugins/pidginrc.c:75
-msgid "Log Viewer"
-msgstr "日誌檢視器"
-
-#  XXX 這譯文絶對有問題,但想不到怎樣譯較好 - ambrose 20070415
-#: ../pidgin/plugins/pidginrc.c:76
+#  XXX 這譯文絶對有問題,但想不到怎樣譯較好 - ambrose 20070415
+#: ../pidgin/plugins/pidginrc.c:70
 msgid "Request Dialog"
 msgstr "對話視窗 (Request Dialog)"
 
-#: ../pidgin/plugins/pidginrc.c:77
+#: ../pidgin/plugins/pidginrc.c:71
 msgid "Notify Dialog"
 msgstr "通知視窗 (Notify Dialog)"
 
-#: ../pidgin/plugins/pidginrc.c:253
+#: ../pidgin/plugins/pidginrc.c:247
 msgid "Select Color"
 msgstr "選擇顏色"
 
-#: ../pidgin/plugins/pidginrc.c:300
-#, c-format
+#: ../pidgin/plugins/pidginrc.c:294
 msgid "Select Interface Font"
 msgstr "選擇介面字型"
 
-#: ../pidgin/plugins/pidginrc.c:303
+#: ../pidgin/plugins/pidginrc.c:297
 #, c-format
 msgid "Select Font for %s"
 msgstr "為%s選擇字型"
 
-#: ../pidgin/plugins/pidginrc.c:371
+#: ../pidgin/plugins/pidginrc.c:365
 msgid "GTK+ Interface Font"
 msgstr "GTK+介面字型"
 
-#: ../pidgin/plugins/pidginrc.c:391
+#: ../pidgin/plugins/pidginrc.c:385
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
@@ -17824,46 +17857,46 @@
 #. widget_bool_widgets[i]);
 #. }
 #.
-#: ../pidgin/plugins/pidginrc.c:428
+#: ../pidgin/plugins/pidginrc.c:422
 msgid "Interface colors"
 msgstr "介面顏色"
 
-#: ../pidgin/plugins/pidginrc.c:452
+#: ../pidgin/plugins/pidginrc.c:446
 msgid "Widget Sizes"
 msgstr "Widget 大小"
 
-#: ../pidgin/plugins/pidginrc.c:473
+#: ../pidgin/plugins/pidginrc.c:467
 msgid "Fonts"
 msgstr "字型"
 
-#: ../pidgin/plugins/pidginrc.c:497
+#: ../pidgin/plugins/pidginrc.c:491
 msgid "Gtkrc File Tools"
-msgstr ""
-
-#: ../pidgin/plugins/pidginrc.c:502
+msgstr "Gtkrc檔專用工具"
+
+#: ../pidgin/plugins/pidginrc.c:496
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "將設定寫入%s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:511
+#: ../pidgin/plugins/pidginrc.c:505
 msgid "Re-read gtkrc files"
 msgstr "重新讀取gtkrc檔案"
 
-#: ../pidgin/plugins/pidginrc.c:544
+#: ../pidgin/plugins/pidginrc.c:543
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Pidgin GTK+ 佈景主題設定"
 
-#: ../pidgin/plugins/pidginrc.c:546 ../pidgin/plugins/pidginrc.c:547
+#: ../pidgin/plugins/pidginrc.c:545 ../pidgin/plugins/pidginrc.c:546
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "提供一般 gtkrc 設定的存取"
 
 # TODO Untranslated
-# TODO 微軟視窗的Adobe印表機驅動程式可以找到一個「Raw」的譯法 (但我忘了)
+# TODO 微軟視窗的Adobe印表機驅動程式可以找到一個「Raw」的譯法 (但我忘了)
 #: ../pidgin/plugins/raw.c:175
 msgid "Raw"
 msgstr ""
 
-# NOTE: 舊的譯文不清楚,而且唸起來怪怪的。
+# NOTE: 舊的譯文不清楚,而且唸起來怪怪的。
 #: ../pidgin/plugins/raw.c:177
 msgid "Lets you send raw input to text-based protocols."
 msgstr "讓你直接輸入指令對各種文字模式的通訊協定進行操作。"
@@ -17872,24 +17905,19 @@
 msgid ""
 "Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
-msgstr ""
-"讓你直接輸入指令對各種文字模式的通訊協定(例如 XMPP、MSN、IRC 及 TOC)進行操"
-"作。在輸入欄位輸入指令,按 Enter 後鍵送出;相關資訊會在除錯視窗顯示。"
-
-# XXX 暫譯
+msgstr "讓你直接輸入指令對各種文字模式的通訊協定(例如 XMPP、MSN、IRC 及 TOC)進行操作。在輸入欄位輸入指令,按 Enter 後鍵送出;相關資訊會在除錯視窗顯示。"
+
 #: ../pidgin/plugins/relnot.c:71
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You are using %s version %s.  The current version is %s.  You can get it "
 "from <a href=\"%s\">%s</a><hr>"
-msgstr "你目前使用的 %s 版本為 %s ,最新的版本是 %s。<hr>"
+msgstr "你目前使用的 %s 版本為 %s,最新的版本是 %s。新版本可由以下網址取得:<a href=\"%s\">%s</a><hr>"
 
 #: ../pidgin/plugins/relnot.c:79
-#, fuzzy, c-format
+#, c-format
 msgid "<b>ChangeLog:</b><br>%s"
-msgstr ""
-"<b>功能說明:</b>\n"
-"%s<br><br>"
+msgstr "<b>功能說明:</b><br>%s"
 
 #: ../pidgin/plugins/relnot.c:84 ../pidgin/plugins/relnot.c:85
 msgid "New Version Available"
@@ -17917,15 +17945,14 @@
 msgid ""
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
-msgstr ""
-"不時查看有沒有新版本。一發現有,就隨即連同該版本的功能說明一併通知使用者。"
-
-# FIXME 譯文有譯改進 - 20061027
+msgstr "不時查看有沒有新版本。一發現有,就隨即連同該版本的功能說明一併通知使用者。"
+
+# FIXME 譯文有譯改進 - 20061027
 #: ../pidgin/plugins/spellchk.c:1962
 msgid "Duplicate Correction"
-msgstr "重複的改正"
-
-# FIXME 譯文有譯改進 - 20061027
+msgstr "重覆的改正"
+
+# FIXME 譯文有譯改進 - 20061027
 #: ../pidgin/plugins/spellchk.c:1963
 msgid "The specified word already exists in the correction list."
 msgstr "改正列表內經已存有你所指定的字詞。"
@@ -17942,7 +17969,7 @@
 msgid "You send"
 msgstr "將會送出"
 
-# XXX 譯文有待改進 - 20061027
+# XXX 譯文有待改進 - 20061027
 #: ../pidgin/plugins/spellchk.c:2228
 msgid "Whole words only"
 msgstr "只匹配完整字詞"
@@ -17963,7 +17990,7 @@
 msgid "You _send:"
 msgstr "將會送出(_S):"
 
-#  XXX 加「須」字意思較為清楚 - ambrose 20070415
+#  XXX 加「須」字意思較為清楚 - ambrose 20070415
 #. Created here so it can be passed to whole_words_button_toggled.
 #: ../pidgin/plugins/spellchk.c:2311
 msgid "_Exact case match (uncheck for automatic case handling)"
@@ -17981,13 +18008,13 @@
 msgid "Enable replacement of last word on send"
 msgstr "最後輸入的一個字也進行文字取代"
 
-#: ../pidgin/plugins/spellchk.c:2370
+#: ../pidgin/plugins/spellchk.c:2372
 msgid "Text replacement"
 msgstr "文字取代"
 
-#: ../pidgin/plugins/spellchk.c:2372 ../pidgin/plugins/spellchk.c:2373
+#: ../pidgin/plugins/spellchk.c:2374 ../pidgin/plugins/spellchk.c:2375
 msgid "Replaces text in outgoing messages according to user-defined rules."
-msgstr "根據使用者所定義的規則來取代送出訊息中的文字。"
+msgstr "根據照使用者所定義的規則來取代送出訊息中的文字。"
 
 #. *< type
 #. *< ui_requirement
@@ -17995,7 +18022,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/ticker/ticker.c:74 ../pidgin/plugins/ticker/ticker.c:354
+#: ../pidgin/plugins/ticker/ticker.c:74 ../pidgin/plugins/ticker/ticker.c:356
 msgid "Buddy Ticker"
 msgstr "好友跑馬燈"
 
@@ -18003,7 +18030,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/ticker/ticker.c:357 ../pidgin/plugins/ticker/ticker.c:359
+#: ../pidgin/plugins/ticker/ticker.c:359 ../pidgin/plugins/ticker/ticker.c:361
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "好友清單的水平捲動版本"
 
@@ -18038,7 +18065,6 @@
 msgstr "時間戳記格式選項"
 
 #: ../pidgin/plugins/timestamp_format.c:26
-#, c-format
 msgid "_Force 24-hour time format"
 msgstr "強制使用24小時制時間格式(_F)"
 
@@ -18055,7 +18081,7 @@
 msgid "For delayed messages"
 msgstr "未讀訊息"
 
-#  TODO 要覆查譯文
+#  TODO 要覆查譯文
 #: ../pidgin/plugins/timestamp_format.c:41
 #: ../pidgin/plugins/timestamp_format.c:50
 msgid "For delayed messages and in chats"
@@ -18112,7 +18138,7 @@
 msgid "Remove IM window transparency on focus"
 msgstr "在即時訊息視窗取得焦點時移除透明度"
 
-# XXX 應該是指W32程式中「將視窗保持於桌面最上層」功能。
+# XXX 應該是指W32程式中「將視窗保持於桌面最上層」功能。
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:587
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:635
 msgid "Always on top"
@@ -18205,7 +18231,7 @@
 "Provides options specific to Pidgin for Windows , such as buddy list docking."
 msgstr "提供 Windows 版 Pidgin 的相關選項,例如好友清單的停駐功能。"
 
-#: ../pidgin/plugins/xmppconsole.c:667
+#: ../pidgin/plugins/xmppconsole.c:670
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<font color='#777777'>已登出。</font>"
 
@@ -18215,288 +18241,1088 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/xmppconsole.c:746 ../pidgin/plugins/xmppconsole.c:841
-#: ../pidgin/plugins/xmppconsole.c:860
+#: ../pidgin/plugins/xmppconsole.c:749 ../pidgin/plugins/xmppconsole.c:844
+#: ../pidgin/plugins/xmppconsole.c:863
 msgid "XMPP Console"
 msgstr "XMPP 監控器"
 
-#: ../pidgin/plugins/xmppconsole.c:753
+#: ../pidgin/plugins/xmppconsole.c:756
 msgid "Account: "
 msgstr "帳號:"
 
-#: ../pidgin/plugins/xmppconsole.c:780
+#: ../pidgin/plugins/xmppconsole.c:783
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>未有連線至 XMPP</font>"
 
-#  NOTE Jabber 的「stanza」譯「段落」,下同
-#: ../pidgin/plugins/xmppconsole.c:790
+#  NOTE Jabber 的「stanza」譯「段落」,下同
+#: ../pidgin/plugins/xmppconsole.c:793
 msgid "Insert an <iq/> stanza."
 msgstr "插入 <iq/> 段落。"
 
-#: ../pidgin/plugins/xmppconsole.c:799
+#: ../pidgin/plugins/xmppconsole.c:802
 msgid "Insert a <presence/> stanza."
 msgstr "插入 <presence/> 段落。"
 
-#: ../pidgin/plugins/xmppconsole.c:808
+#: ../pidgin/plugins/xmppconsole.c:811
 msgid "Insert a <message/> stanza."
 msgstr "插入 <message/> 段落。"
 
-#  XXX 暫依日文譯 raw 為「未加工」
+#  XXX 暫依日文譯 raw 為「未加工」
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/xmppconsole.c:863
+#: ../pidgin/plugins/xmppconsole.c:866
 msgid "Send and receive raw XMPP stanzas."
 msgstr "送出、讀取未加工的 XMPP 段落。"
 
 #. *  description
-#: ../pidgin/plugins/xmppconsole.c:865
+#: ../pidgin/plugins/xmppconsole.c:868
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
 
-#, fuzzy
-#~ msgid "Offline buddies"
-#~ msgstr "顯示離線好友"
-
-#, fuzzy
-#~ msgid "Sort"
-#~ msgstr "通訊埠"
-
-#, fuzzy
-#~ msgid "By Status"
-#~ msgstr "根據狀態"
-
-#, fuzzy
-#~ msgid "By Log Size"
-#~ msgstr "根據日誌大小"
-
-#, fuzzy
+#~ msgid "There were errors unloading the plugin."
+#~ msgstr "卸載模組途中遭遇錯誤。"
+
+#~ msgid "Couldn't open file"
+#~ msgstr "無法開啟檔案"
+
+# XXX 譯文有待改進
+#~ msgid "Error initializing session"
+#~ msgstr "對工作階段進行初始化時發生了錯誤"
+
+# XXX 直譯「好友伺服器」好像不太妥
 #~ msgid "Unable to connect to contact server"
-#~ msgstr "無法連線到伺服器。"
-
-#, fuzzy
-#~ msgid "Unable to retrieve MSN Address Book"
-#~ msgstr "選擇 Notes 通訊錄"
-
-#, fuzzy
-#~ msgid "Current media"
-#~ msgstr "目前密碼"
-
-#, fuzzy
-#~ msgid "Windows Live Messenger Protocol Plugin"
-#~ msgstr "Novell GroupWise Messenger 協定模組"
-
-#, fuzzy
-#~ msgid "Windows Live ID authentication Failed"
-#~ msgstr "失敗:認證失敗"
-
-#~ msgid "%s just sent you a Nudge!"
-#~ msgstr "%s 在呼叫你!"
-
-#, fuzzy
-#~ msgid "Unknown error (%d)"
-#~ msgstr "未知錯誤"
-
-#, fuzzy
+#~ msgstr "無法連線到好友資訊伺服器。"
+
 #~ msgid "Unable to connect to OIM server"
-#~ msgstr "無法連線到伺服器。"
-
-#, fuzzy
-#~ msgid "%s (%s) changed status from %s to %s"
-#~ msgstr "%s 從「%s」狀態改變為「%s」"
-
-#, fuzzy
-#~ msgid "%s (%s) is now %s"
-#~ msgstr "%s 目前為%s"
-
-#, fuzzy
-#~ msgid "%s (%s) is no longer %s"
-#~ msgstr "%s 不再%s"
-
-#, fuzzy
-#~ msgid "_Merge"
-#~ msgstr "訊息(_M):"
-
-#, fuzzy
-#~ msgid "_Send File..."
-#~ msgstr "傳送檔案(_S)"
-
-#, fuzzy
-#~ msgid "Add Buddy _Pounce..."
-#~ msgstr "加入好友狀態捕捉..."
-
-#, fuzzy
-#~ msgid "Hide when offline"
-#~ msgstr "在離線時不允許這個指令"
-
-#, fuzzy
-#~ msgid "Show when offline"
-#~ msgstr "在離線時不允許這個指令"
-
-#, fuzzy
-#~ msgid "Add _Buddy..."
-#~ msgstr "新增好友"
-
-#, fuzzy
-#~ msgid "Add C_hat..."
-#~ msgstr "新增聊天室"
-
-#, fuzzy
-#~ msgid "Persistent"
-#~ msgstr "波斯文"
-
-#, fuzzy
-#~ msgid "/Accounts/Manage"
-#~ msgstr "/帳號"
-
-#, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "帳號:"
-
-#, fuzzy
-#~ msgid "S_end To"
-#~ msgstr "傳送到"
+#~ msgstr "無法連線到 OIM 伺服器。"
+
+#~ msgid "Unable to make SSL connection to server."
+#~ msgstr "無法使用 SSL 協定連線到伺服器。"
+
+#~ msgid "<span color=\"red\">%s disconnected: %s</span>"
+#~ msgstr "<span color=\"red\">%s 結束連線:%s</span>"
 
 #~ msgid ""
-#~ "%s was disconnected due to the following error:\n"
-#~ "%s"
+#~ "%s\n"
+#~ "\n"
+#~ "%s will not attempt to reconnect the account until you correct the error "
+#~ "and re-enable the account."
 #~ msgstr ""
-#~ "%s 因下列錯誤結束了連線:\n"
-#~ "%s"
-
-# NOTE 沒辦法,用不到着重號,又沒法改換字型……
-#~ msgid "Commands are not supported yet. Message was NOT sent."
-#~ msgstr "尚未支援指令,訊息因此沒有被送出。"
+#~ "%s\n"
+#~ "在您更正這個錯誤並重新啟動這個帳號前,%s 將不會再試著重新連線。"
+
+#~ msgid "Sort by status"
+#~ msgstr "依照狀態排列"
+
+#~ msgid "Sort alphabetically"
+#~ msgstr "依照字母排列"
+
+#~ msgid "Sort by log size"
+#~ msgstr "依照日誌大小排列"
+
+#~ msgid "Add Buddy _Pounce"
+#~ msgstr "加入好友狀態捕捉(_P)"
+
+#~ msgid "Add a _Buddy"
+#~ msgstr "新增一個好友(_B)"
+
+#~ msgid "Add a C_hat"
+#~ msgstr "新增一個聊天室(_H)"
+
+#~ msgid "_Send To"
+#~ msgstr "傳送到(_S)"
+
+#~ msgid "/Accounts/Add\\/Edit"
+#~ msgstr "/帳號(_A)/新增\\/編輯"
+
+#  XXX
+#~ msgid "_Smiley"
+#~ msgstr "笑一個!(_S)"
+
+#~ msgid "Conversation History"
+#~ msgstr "交談歷史"
+
+#~ msgid "Log Viewer"
+#~ msgstr "日誌檢視器"
 
 #~ msgid "You have just sent a Nudge!"
-#~ msgstr "你剛送出了一個呼叫!"
-
-# NOTE 譯文更動 by Ambrose
-#~ msgid "User information for %s unavailable:"
-#~ msgstr "無法取得使用者 %s 的個人資料:"
+#~ msgstr "您剛送出了一個呼叫!"
 
 #~ msgid "You have been signed off for an unknown reason."
-#~ msgstr "你因為不明原因而登出。"
+#~ msgstr "您因為不明原因而登出。"
+
+#~ msgid "Are you sure to exit this Qun?"
+#~ msgstr "您確定要離開這個群 (Qun) 嗎?"
+
+#~ msgid "Go ahead"
+#~ msgstr "確定"
+
+#~ msgid "Server ACK"
+#~ msgstr "伺服器回應"
+
+#~ msgid "Keep alive error, seems connection lost!"
+#~ msgstr "Keep alive 發生錯誤,連線似乎已突然中斷!"
+
+#~ msgid "Request login token error!"
+#~ msgstr "「登入要求」Token 出現錯誤"
+
+#  NOTE 文中的「%s」是「UDP」或「TCP」,所以譯文應為「位址」而非「地址」
+#~ msgid "%s Address"
+#~ msgstr "%s 位址"
+
+#~ msgid "QQ: Available"
+#~ msgstr "QQ: 上線"
+
+#~ msgid "QQ: Away"
+#~ msgstr "QQ: 離開"
+
+#~ msgid "QQ: Invisible"
+#~ msgstr "QQ: 隱身"
+
+#~ msgid "QQ: Offline"
+#~ msgstr "QQ: 離線"
+
+#~ msgid "Modify My Information"
+#~ msgstr "修改資訊"
+
+#~ msgid "Login in TCP"
+#~ msgstr "以 TCP 登入"
+
+#~ msgid "Login Hidden"
+#~ msgstr "以隱藏狀態登入"
+
+#~ msgid "Socket send error"
+#~ msgstr "寫入 Socket 途中發生錯誤"
+
+# XXX - 20061027
+#~ msgid "Connection refused"
+#~ msgstr "連線被拒"
+
+#~ msgid "Would like to add him?"
+#~ msgstr "您想將他(她)加入到您的好友清單嗎?"
+
+#  XXX 可能可以譯得生動一點
+#~ msgid "%s just sent you a Buzz!"
+#~ msgstr "%s 在呼叫您!"
+
+#  XXX 可能可以譯得生動一點
+#~ msgid "You have just sent a Buzz!"
+#~ msgstr "您剛送出了一個呼叫!"
+
+#~ msgid "/Options/Show Buddy _Icon"
+#~ msgstr "/選項/顯示好友圖示(_I)"
+
+#~ msgid "/Options/Show Buddy Icon"
+#~ msgstr "/選項/顯示好友圖示"
+
+#  XXX 這應該是「nn」碼,即「Nynorsk Norwegian」,所以直譯「挪威文」並不恰當
+#  XXX 但這真是「no」碼,但 no.po 其實已經不存在……無來頭……
+#~ msgid "Norwegian"
+#~ msgstr "挪威文"
+
+#~ msgid "_Bold"
+#~ msgstr "粗體(_B)"
+
+#~ msgid "_Larger"
+#~ msgstr "放大字體(_L)"
+
+#~ msgid "_Smaller"
+#~ msgstr "縮小字體(_S)"
+
+#~ msgid "_Reset font"
+#~ msgstr "清除格式化(_R)"
+
+#~ msgid "Show buddy _icons"
+#~ msgstr "顯示好友圖示(_I)"
+
+# NOTE 沒辦法,用不到着重號,又沒法改換字型……
+#~ msgid "Commands are not supported yet. Message was NOT sent."
+#~ msgstr "尚未支援指令,訊息因此沒有被送出。"
+
+# NOTE 譯文更動 by Ambrose
+#~ msgid "User information for %s unavailable:"
+#~ msgstr "無法取得使用者 %s 的個人資訊:"
 
 #~ msgid ""
 #~ "Could not add the buddy %s for an unknown reason.  The most common reason "
 #~ "for this is that you have the maximum number of allowed buddies in your "
 #~ "buddy list."
 #~ msgstr ""
-#~ "因為不明原因而無法將好友 %s 加入。一般的原因是因為你的好友清單中的好友數目"
-#~ "超過所系統允許的上限。"
+#~ "因為不明原因而無法將好友 %s 加入。一般的原因是因為您的好友清單中的好友數目"
+#~ "超過所系統允許的上限。"
 
 #~ msgid "_Connect"
-#~ msgstr "連線(_C)"
-
-#~ msgid "Are you sure to exit this Qun?"
-#~ msgstr "你確定要離開這個羣 (Qun) 嗎?"
-
-#~ msgid "Go ahead"
-#~ msgstr "確定"
-
-#~ msgid "Server ACK"
-#~ msgstr "伺服器回應"
+#~ msgstr "連線(_C)"
 
 #~ msgid "Send IM fail\n"
-#~ msgstr "送出即時訊息失敗\n"
-
-#~ msgid "Keep alive error, seems connection lost!"
-#~ msgstr "Keep alive 發生錯誤,連線似乎已突然中斷!"
-
-#~ msgid "Request login token error!"
-#~ msgstr "「登入要求」Token 出現錯誤"
-
-#  NOTE 文中的「%s」是「UDP」或「TCP」,所以譯文應為「位址」而非「地址」
-#~ msgid "%s Address"
-#~ msgstr "%s 位址"
-
-#~ msgid "QQ: Available"
-#~ msgstr "QQ: 上線"
-
-#~ msgid "QQ: Away"
-#~ msgstr "QQ: 離開"
-
-#~ msgid "QQ: Invisible"
-#~ msgstr "QQ: 隱身"
-
-#~ msgid "QQ: Offline"
-#~ msgstr "QQ: 離線"
-
-#~ msgid "Modify My Information"
-#~ msgstr "修改資訊"
-
-#~ msgid "Login in TCP"
-#~ msgstr "以 TCP 登入"
-
-#~ msgid "Login Hidden"
-#~ msgstr "以隱藏狀態登入"
-
-#~ msgid "Socket send error"
-#~ msgstr "寫入 Socket 途中發生錯誤"
-
-# XXX - 20061027
-#~ msgid "Connection refused"
-#~ msgstr "連線被拒"
-
-#~ msgid "Would like to add him?"
-#~ msgstr "你想將他(她)加入到你的好友清單嗎?"
-
-#  TODO 譯文有待改進,這是意譯
+#~ msgstr "送出即時訊息失敗\n"
+
+#~ msgid "Unavailable"
+#~ msgstr "離線"
+
+#~ msgid "/Buddies/_About Pidgin"
+#~ msgstr "/好友/關於 Pidgin(_A)"
+
+#~ msgid "Smaller font size"
+#~ msgstr "縮小字體"
+
+#~ msgid "Insert link"
+#~ msgstr "插入連結"
+
+#~ msgid "Insert image"
+#~ msgstr "插入影像"
+
+#~ msgid "Tools"
+#~ msgstr "工具"
+
+#  TODO 譯文有待改進,這是意譯
 #~ msgid "Reject watching by other users"
-#~ msgstr "拒絕伺服器端的好友狀態捕捉"
+#~ msgstr "拒絕伺服器端的好友狀態捕捉"
 
 #~ msgid "Block invites"
-#~ msgstr "拒絕邀請"
+#~ msgstr "拒絕邀請"
 
 #~ msgid "Reject online status attribute requests"
-#~ msgstr "拒絕上線狀態屬性要求"
-
-#  XXX 可能可以譯得生動一點
-#~ msgid "%s just sent you a Buzz!"
-#~ msgstr "%s 在呼叫你!"
-
-#  XXX 可能可以譯得生動一點
-#~ msgid "You have just sent a Buzz!"
-#~ msgstr "你剛送出了一個呼叫!"
-
-#~ msgid "Unavailable"
-#~ msgstr "離線"
+#~ msgstr "拒絕上線狀態屬性要求"
 
 #~ msgid "Alias..."
-#~ msgstr "別名..."
-
-#~ msgid "/Options/Show Buddy _Icon"
-#~ msgstr "/選項/顯示好友圖示(_I)"
-
-#~ msgid "/Options/Show Buddy Icon"
-#~ msgstr "/選項/顯示好友圖示"
-
-#~ msgid "Smaller font size"
-#~ msgstr "縮小字體"
-
-#~ msgid "Insert link"
-#~ msgstr "插入連結"
-
-#~ msgid "Insert image"
-#~ msgstr "插入圖像"
-
-#~ msgid "Show buddy _icons"
-#~ msgstr "顯示好友圖示(_I)"
+#~ msgstr "別名..."
+
+#~ msgid ""
+#~ "You can get version %s from:<br><a href=\"http://pidgin.im/\">http://"
+#~ "pidgin.im</a>."
+#~ msgstr ""
+#~ "您可以由下列網址,取得最新的 %s 版:<br><a href=\"http://pidgin.im/"
+#~ "\">http://pidgin.im</a>"
 
 #~ msgid ""
 #~ "You can send this image as a file transfer or embed it into this message, "
 #~ "or use it as the buddy icon for this user."
 #~ msgstr ""
-#~ "你可以透過檔案傳輸、插入訊息,或者把它當成是你的好友圖示等方式,來傳送圖像"
-#~ "檔給這個使用者。"
-
-#~ msgid "Tools"
-#~ msgstr "工具"
+#~ "您可以透過檔案傳輸、插入訊息,或者把它當成是你的好友圖示等方式,來傳送影像"
+#~ "檔給這個使用者。"
+
+#~ msgid ""
+#~ "%s was disconnected due to the following error:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s 因下列錯誤結束了連線:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
+#~ msgstr ""
+#~ "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #pidgin-win32 頻道"
+#~ "<BR><BR>"
+
+#~ msgid "GtkTreeView Expander Size"
+#~ msgstr "GtkTreeView 展開器大小"
+
+#~ msgid "GtkTreeView Indent Expanders"
+#~ msgstr "GtkTreeView展開器"
+
+# FIXME 譯文有待改進 - 20061028
+#~ msgid "Toggle offline buddies"
+#~ msgstr "顯示/不顯示離線好友"
+
+#~ msgid "Timestamps"
+#~ msgstr "時間戳記"
+
+#~ msgid "Jabber Account"
+#~ msgstr "Jabber 帳號"
+
+#~ msgid "Cannot join %s:"
+#~ msgstr "無法加入 %s:"
+
+#~ msgid "Search for Jabber users"
+#~ msgstr "搜尋Jabber使用者"
+
+#~ msgid "Invalid Jabber ID"
+#~ msgstr "Jabber 帳號無效"
+
+#~ msgid "Change Jabber Password"
+#~ msgstr "修改 Jabber 密碼"
+
+#~ msgid "Jabber Protocol Plugin"
+#~ msgstr "Jabber 協定模組"
+
+#~ msgid "Jabber developer"
+#~ msgstr "Jabber 開發者"
+
+#~ msgid "..."
+#~ msgstr "..."
+
+#  XXX 這是指模組既沒有設定任何選項,也沒有指明自己是沒有選項的
+#~ msgid "Still need to do something about this."
+#~ msgstr "此模組尚未完成。"
+
+#~ msgid "Autoreply"
+#~ msgstr "自動回覆"
+
+#~ msgid "Autoreply for all the protocols"
+#~ msgstr "適用於所有通訊協定的自動回覆"
+
+#~ msgid ""
+#~ "This plugin lets you set autoreply message for any protocol. You can set "
+#~ "the global autoreply message from the Plugin-options dialog. To set some "
+#~ "specific autoreply message for a particular buddy, right click on the "
+#~ "buddy in the buddy-list window. To set autoreply messages for some "
+#~ "account, go to the `Advanced' tab of the Account-edit dialog."
+#~ msgstr ""
+#~ "這個模組為全部通訊協定提供自動回覆的功能。設定全域適用的自動回覆,只需在這"
+#~ "模組的選項視窗設定即可;為個別好友設定自動回覆,請在好友清單中以滑鼠右鍵點"
+#~ "擊該個好友;為您的個別帳戶設定自動回覆,請在這模組的選項視窗按「進階」按"
+#~ "紐。"
+
+#~ msgid "Set autoreply message for %s"
+#~ msgstr "設定自動回覆給 %s 的訊息"
+
+#~ msgid "Set Autoreply Message"
+#~ msgstr "設定自動回覆訊息"
+
+#~ msgid ""
+#~ "The following message will be sent to the buddy when the buddy sends you "
+#~ "a message and autoreply is enabled."
+#~ msgstr ""
+#~ "當自動回覆功能啟動後,每當好友給您送出訊息時,下列訊息將被自動送出:"
+
+#~ msgid "Set _Autoreply Message"
+#~ msgstr "設定自動回覆訊息(_A)"
+
+#~ msgid "Autoreply message"
+#~ msgstr "自動回覆訊息"
+
+#~ msgid "Send autoreply messages when"
+#~ msgstr "何時發出自動回覆"
+
+#~ msgid "When my account is _away"
+#~ msgstr "當我的帳號是在「離開」狀態時(_A)"
+
+#~ msgid "When my account is _idle"
+#~ msgstr "當我的帳號是在「閒置」狀態時(_I)"
+
+#~ msgid "_Default reply"
+#~ msgstr "預設回覆訊息(_D)"
+
+#~ msgid "Status message"
+#~ msgstr "狀態訊息"
+
+#~ msgid "Autoreply with status message"
+#~ msgstr "以狀態訊息作為自動回覆"
+
+#~ msgid "Always when there is a status message"
+#~ msgstr "每當設定了狀態訊息時"
+
+#~ msgid "Only when there's no autoreply message"
+#~ msgstr "只在沒有設定自動回覆訊息時"
+
+#  NOTE: (23:38:07) wing: in the autoreply plugin, does "delay between autoreplies" mean really a delay, or would it rather be an interval during which no autoreplies will be sent to the same buddy?
+#  NOTE: (23:41:12) elb: wing: it is the latter
+#~ msgid "Delay between autoreplies"
+#~ msgstr "自動回覆之間的相隔時間"
+
+#~ msgid "_Minimum delay (mins)"
+#~ msgstr "相隔時間下限(分)(_M)"
+
+#~ msgid "Times to send autoreplies"
+#~ msgstr "送出自動回覆訊息的次數"
+
+#~ msgid "Ma_ximum count"
+#~ msgstr "次數上限 (_X)"
+
+#~ msgid ""
+#~ "I am currently not available. Please leave your message, and I will get "
+#~ "back to you as soon as possible."
+#~ msgstr ""
+#~ "我現在不在位子上。請您留下您的訊息,當我回來的時候,我將儘快給您回覆。"
+
+#~ msgid "Server couldn't authenticate you without a password"
+#~ msgstr "沒有提供密碼,伺服器無法為你進行認證"
+
+#~ msgid "Rate limiting error."
+#~ msgstr "速率限制錯誤。"
+
+#~ msgid "/Tools/Buddy Pounces"
+#~ msgstr "/工具/好友狀態捕捉"
+
+#~ msgid "Slovack"
+#~ msgstr "斯洛伐克文"
+
+#~ msgid "Gaim Internet Messenger"
+#~ msgstr "Gaim 網路即時通"
+
+#~ msgid ""
+#~ "\n"
+#~ "Idle: %s"
+#~ msgstr ""
+#~ "\n"
+#~ "閒置:%s"
+
+#~ msgid "Nickname: %s\n"
+#~ msgstr "暱稱:%s\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Nickname:</b> %s"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>暱稱:</b>%s"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Logged In:</b> %s"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>登入時間:</b>%s"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Idle:</b> %s"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>閒置:</b>%s"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Last Seen:</b> %s ago"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>最後見到:</b>%s 前"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Status:</b> Offline"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>狀態:</b>離線"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Description:</b> Spooky"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>介紹:</b>幽靈似的"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Status:</b> Awesome"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>狀態:</b>頂呱呱"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Status:</b> Rockin'"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>狀態:</b>頂呱呱"
+
+#~ msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
+#~ msgstr ""
+#~ "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #wingaim 頻道<BR><BR>"
+
+#~ msgid "Gaim %s. Try `%s -h' for more information.\n"
+#~ msgstr "Gaim %s。執行「%s -h」以獲得更進一步的資訊。\n"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">您收到了郵件!</span>\n"
+#~ "\n"
+#~ "%s"
+
+#~ msgid "Delay"
+#~ msgstr "延遲"
+
+#~ msgid "minutes."
+#~ msgstr "分鐘。"
+
+#~ msgid "WinGaim Options"
+#~ msgstr "WinGaim 選項"
+
+#~ msgid ""
+#~ "%d buddy from group %s was not removed because it belongs to an account "
+#~ "which is disabled or offline.  This buddy and the group were not "
+#~ "removed.\n"
+#~ msgid_plural ""
+#~ "%d buddies from group %s were not removed because they belong to accounts "
+#~ "which are currently disabled or offline.  These buddies and the group "
+#~ "were not removed.\n"
+#~ msgstr[0] ""
+#~ "%d 個在 %s 群組的好友並沒有被移除,因為他(她)所對應的帳號被停用或已離"
+#~ "線。這個好友及群組沒有被移除。\n"
+#~ msgstr[1] ""
+#~ "%d 個在 %s 群組的好友並沒有被移除,因為他們所對應的帳號被停用或已離線。這"
+#~ "些好友及這個群組沒有被移除。\n"
+
+#~ msgid "Group not removed"
+#~ msgstr "群組未被移除"
+
+#~ msgid "Old Gaim"
+#~ msgstr "舊版 Gaim"
+
+#~ msgid "Gaim encountered errors loading the plugin."
+#~ msgstr "Gaim 讀入模組時發生錯誤。"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Status:</b> %s"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>狀態:</b>%s"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Message:</b> %s"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>訊息:</b>%s"
+
+#~ msgid "Gaim User"
+#~ msgstr "Gaim 使用者"
+
+#~ msgid "<b>%s:</b> %s"
+#~ msgstr "<b>%s:</b>%s"
+
+#~ msgid "<b>%s:</b> %s<br>"
+#~ msgstr "<b>%s:</b>%s<br>"
+
+#~ msgid "<b>Idle for:</b> %s<br>"
+#~ msgstr "<b>閒置了:</b>%s<br>"
+
+# NOTE「Client」是指該使用者使用那一個「用戶端」訊息程式(例:gaim)
+#~ msgid "Client:"
+#~ msgstr "用戶端:"
+
+#~ msgid "The user %s wants to add %s to his or her buddy list."
+#~ msgstr "使用者 %s 想要將 %s 加入他(她)的好友清單。"
+
+#~ msgid "_Authorize"
+#~ msgstr "給予認證(_A)"
+
+#~ msgid "_Deny"
+#~ msgstr "拒絕(_D)"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>%s:</b> %s"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>%s:</b>%s"
+
+#~ msgid "<b>Alias:</b> %s<br>"
+#~ msgstr "<b>別名:</b>%s<br>"
+
+#~ msgid "<b>%s:</b> "
+#~ msgstr "<b>%s:</b>"
+
+#~ msgid "%s<b>General</b><br>%s"
+#~ msgstr "%s<b>簡介</b><br>%s"
+
+# XXX - 20061028
+#~ msgid "%s<b>Social</b><br>%s"
+#~ msgstr "%s<b>社交方面</b><br>%s"
+
+#~ msgid "<br><b>Personal</b><br>%s"
+#~ msgstr "<br><b>個人方面</b><br>%s"
+
+#~ msgid "<br><b>Business</b><br>%s"
+#~ msgstr "<br><b>工作方面</b><br>%s"
+
+#~ msgid "<hr><b>Contact Info</b>%s%s"
+#~ msgstr "<hr><b>聯絡資訊</b>%s%s"
+
+#~ msgid "<hr><b>%s:</b> "
+#~ msgstr "<hr><b>%s:</b>"
+
+#~ msgid "The user %s (%s) wants to add %s to his or her buddy list."
+#~ msgstr "使用者 %s(%s)想要將 %s 加入他(她)的好友清單。"
+
+#~ msgid ""
+#~ "The user %s requires authorization before being added to a buddy list.  "
+#~ "Do you want to send an authorization request?"
+#~ msgstr ""
+#~ "使用者 %s 要求在加入好友清單前先取得他的認證。您要送出您的認證要求嗎?"
+
+#~ msgid "Request Authorization"
+#~ msgstr "要求認證"
+
+#~ msgid "_Request Authorization"
+#~ msgstr "要求認證(_R)"
+
+#~ msgid ""
+#~ "The user %u wants to add %s to their buddy list for the following "
+#~ "reason:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "使用者 %u 因為下列原因,想要將 %s 加入他(她)的好友清單中:\n"
+#~ "%s"
+
+#~ msgid "Authorization Request"
+#~ msgstr "認證要求"
+
+#~ msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
+#~ msgstr "<B>帳號:</B> %s<BR><B>狀態:</B> %s<HR>%s"
+
+#~ msgid "SNAC threw error: %s\n"
+#~ msgstr "SNAC 丟出錯誤:%s\n"
+
+#~ msgid ""
+#~ "Your screen name is currently formatted as follows:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "您的帳號目前被格式化如下:\n"
+#~ "%s"
 
 #~ msgid ""
-#~ "You can get version %s from:<br><a href=\"http://pidgin.im/\">http://"
-#~ "pidgin.im</a>."
+#~ "The user %s wants to add %s to their buddy list for the following "
+#~ "reason:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "使用者 %s 因為下列原因,想要將 %s 加入他(她)的好友清單中:\n"
+#~ "%s"
+
+#~ msgid "New screen name formatting:"
+#~ msgstr "新的帳號格式:"
+
+#~ msgid "Format Screen Name..."
+#~ msgstr "格式化帳號..."
+
+#  XXX 要覆查
+#~ msgid "Faces"
+#~ msgstr "好友圖示"
+
+#  XXX 要覆查
+#~ msgid "Change Your QQ Face"
+#~ msgstr "更改您的 QQ 好友圖示"
+
+#  XXX 要覆查
+#~ msgid "Change Face"
+#~ msgstr "更改好友圖示"
+
+#~ msgid "Update"
+#~ msgstr "更新"
+
+#~ msgid "<i>Information below may not be accurate</i><br>\n"
+#~ msgstr "【下列資訊可能不準確】<br>\n"
+
+#~ msgid "Please wait for new version"
+#~ msgstr "請等待新版本推出"
+
+# TODO 譯文有待改進 - 20061028
+#~ msgid "User info is not updated"
+#~ msgstr "無法更新使用者資訊"
+
+#~ msgid "Send packet"
+#~ msgstr "傳送封包中"
+
+#~ msgid "Packets lost, send again?"
+#~ msgstr "封包已遺失,重新送出?"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>Supports:</b> %s"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>支援:</b>%s"
+
+#~ msgid ""
+#~ "\n"
+#~ "<b>External User</b>"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>外部使用者</b>"
+
+#~ msgid "<b>External User</b><br>"
+#~ msgstr "<b>外部使用者</b><br>"
+
+#~ msgid "<b>User ID:</b> %s<br>"
+#~ msgstr "<b>使用者帳號:</b>%s<br>"
+
+#~ msgid "<b>Full Name:</b> %s<br>"
+#~ msgstr "<b>全名:</b>%s<br>"
+
+#~ msgid "<b>Supports:</b> %s<br>"
+#~ msgstr "<b>支援:</b>%s<br>"
+
+#~ msgid "<b>Status:</b> %s"
+#~ msgstr "<b>狀態:</b>%s"
+
+#~ msgid "TOC has sent a PAUSE command."
+#~ msgstr "TOC 送出了一個暫停 (PAUSE) 指令。"
+
+#~ msgid ""
+#~ "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."
+#~ msgstr ""
+#~ "當這個發生時,TOC 會忽略所有送來的訊息,同時可能在您送出訊息時,將您踢出系"
+#~ "統。Gaim 將避免發生這樣的事。這只是一個暫時性的狀態,請您見諒。"
+
+#~ msgid "Gaim - Save As..."
+#~ msgstr "Gaim - 儲存為..."
+
+#~ msgid "The user %s wants to add %s to his or her buddy list%s%s."
+#~ msgstr "使用者 %s 想要將 %s 加入他(她)的好友清單%s%s。"
+
+#  XXX
+#~ msgid "Message (optional) :"
+#~ msgstr "訊息(可以不填):"
+
+#~ msgid ""
+#~ "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."
+#~ msgstr ""
+#~ "無法以正常方法進行認證,這表示您輸入了錯誤的密碼,或者 Yahoo! 更改了認證方"
+#~ "法。Gaim 隨即嘗試透過 Web Messenger 方法認證,這種認證方法只支援部分功能。"
+
+#~ msgid "<b>IP Address:</b> %s<br>"
+#~ msgstr "<b>IP 位址:</b>%s<br>"
+
+#~ msgid "<b>User:</b> %s<br>"
+#~ msgstr "<b>使用者:</b>%s<br>"
+
+#~ msgid "Tag"
+#~ msgstr "標記"
+
+#~ msgid "The specified buddy was not found in the Evolution Contacts."
+#~ msgstr "指定的好友不在 Evolution 聯絡人清單中。"
+
+#~ msgid "Invalid Username"
+#~ msgstr "使用者名稱無效"
+
+#~ msgid "Invalid password"
+#~ msgstr "密碼無效"
+
+#~ msgid "Invalid username or password"
+#~ msgstr "使用者名稱或密碼無效"
+
+#~ msgid ""
+#~ "Always use AIM/ICQ proxy server for file transfers\n"
+#~ "(slower, but does not reveal your IP address)"
+#~ msgstr ""
+#~ "務必使用 AIM/ICQ 的代理伺服器來進行檔案傳輸\n"
+#~ "(較慢,但不會暴露您的 IP 位址)"
+
+#~ msgid "Invalid username."
+#~ msgstr "使用者名稱無效。"
+
+#~ msgid "Wrong password!"
+#~ msgstr "密碼錯誤!"
+
+#~ msgid "Wrong Password"
+#~ msgstr "錯誤的密碼"
+
+#~ msgid "Send unknown \"_slash\" commands as messages"
+#~ msgstr "不明的「斜線」指令,一律當成訊息送出(_S)"
+
+#~ msgid "Tab Options"
+#~ msgstr "分頁選項"
+
+#~ msgid "_Sounds while away"
+#~ msgstr "離開時仍發出音效(_S)"
+
+#~ msgid "Away / Idle"
+#~ msgstr "離開 / 閒置"
+
+#~ msgid "gaim_proxy_connect() failed"
+#~ msgstr "gaim_proxy_connect() 失敗"
+
+#~ msgid "mysql"
+#~ msgstr "mysql"
+
+#~ msgid "_Configure"
+#~ msgstr "設定(_C)"
+
+#~ msgid "Host:"
+#~ msgstr "主機位址(_H):"
+
+#~ msgid "Port:"
+#~ msgstr "通訊埠:"
+
+#~ msgid "Crazychat"
+#~ msgstr "Crazychat"
+
+#~ msgid "Network Configuration"
+#~ msgstr "網路設定"
+
+#~ msgid "TCP port"
+#~ msgstr "TCP通訊埠"
+
+#~ msgid "UDP port"
+#~ msgstr "UDP通訊埠"
+
+#~ msgid "Blink tray icon for unread..."
+#~ msgstr "有未讀取訊息時,閃爍工作匣圖示..."
+
+#~ msgid "_Instant Messages:"
+#~ msgstr "即時訊息(_I):"
+
+#~ msgid "C_hat Messages:"
+#~ msgstr "聊天訊息(_H):"
+
+#~ msgid "Displays an icon for Gaim in the system tray."
+#~ msgstr "在系統工作匣中顯示 Gaim 的圖示。"
+
+# NOTE queuing semantics clarified by marv on #gaim
+#~ msgid ""
+#~ "Displays a system tray icon (in GNOME, KDE, or Windows for example) to "
+#~ "show the current status of Gaim, allow fast access to commonly used "
+#~ "functions, and to toggle display of the buddy list. Also provides options "
+#~ "to blink for unread messages."
+#~ msgstr ""
+#~ "將 Gaim 目前的狀態,顯示於系統工作匣圖示上(例如於 GNOME、KDE 或微軟視窗"
+#~ "等),同時提供對常用功能的快速操作,以及整合好友清單的顯示。它也提供在收到"
+#~ "未讀取訊息時,閃爍工作匣圖示的功能(可選)。"
+
+#~ msgid ""
+#~ "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
+#~ "account properties"
 #~ msgstr ""
-#~ "你可以由下列網址,取得最新的 %s 版:<br><a href=\"http://pidgin.im/"
-#~ "\">http://pidgin.im</a>"
+#~ "登入這個伺服器需要使用 TLS/SSL。請在帳號清單的「修改帳號」視窗點選「TLS 可"
+#~ "用則用」選項。"
+
+# XXX 暫譯
+#~ msgid "Use TLS if available"
+#~ msgstr "TLS 可用則用"
+
+#~ msgid "Lost connection with server for an unknown reason."
+#~ msgstr "因為不明原因導致與伺服器連線中斷。"
+
+#~ msgid "A"
+#~ msgstr "A型"
+
+#~ msgid "B"
+#~ msgstr "B型"
+
+#~ msgid "AB"
+#~ msgstr "AB型"
+
+#~ msgid "QQ Server"
+#~ msgstr "QQ 伺服器"
+
+#~ msgid "QQ Port"
+#~ msgstr "QQ 通訊埠"
+
+#~ msgid "Your request to send file[%s] has been rejected by buddy[%d]"
+#~ msgstr "好友「%2$d」拒絕了您傳送檔案「%1$s」的要求"
+
+#~ msgid "Unable to read"
+#~ msgstr "無法讀取"
+
+#~ msgid "g003: Error opening connection.\n"
+#~ msgstr "g003: 連線開啟錯誤。\n"
+
+#~ msgid "Buddy icon:"
+#~ msgstr "好友圖示:"
+
+#~ msgid "IM the user"
+#~ msgstr "送出即時訊息給使用者"
+
+#~ msgid "Ignore the user"
+#~ msgstr "忽略使用者"
+
+#~ msgid "Get the user's information"
+#~ msgstr "取得使用者資訊"
+
+#~ msgid "Unable to read header from server"
+#~ msgstr "無法由伺服器讀取標頭資訊"
+
+#~ msgid ""
+#~ "Unable to read message from server: %s.  Command is %hd, length is %hd."
+#~ msgstr "無法由伺服器讀取資訊:%s。指令為 %hd,長度為 %hd。"
+
+#~ msgid "users: %s, files: %s, size: %sGB"
+#~ msgstr "使用者:%s,檔案:%s,大小:%sGB"
+
+#~ msgid "Unable to add \"%s\" to your Napster hotlist"
+#~ msgstr "無法將「%s」加入您的 Napster 熱門清單中"
+
+#~ msgid "%s requested a PING"
+#~ msgstr "%s 要求一個 PING"
+
+#~ msgid "NAPSTER Protocol Plugin"
+#~ msgstr "NAPSTER 協定模組"
+
+#~ msgid ""
+#~ "Unable to play sound because the 'Command' sound method has been chosen, "
+#~ "but no command has been set."
+#~ msgstr ""
+#~ "無法播放音效,因為選取了「指令」為播放模式,可是並沒有設定任何指令。"
+
+#~ msgid ""
+#~ "Unable to play sound because the configured sound command could not be "
+#~ "launched: %s"
+#~ msgstr "無法播放音效,因為無法執行所設定的音效指令:%s"
+
+#~ msgid "Unable to initiate a new search"
+#~ msgstr "無法啟始一個新的搜尋"
+
+#~ msgid "You have a pending search. Please wait for it to finish."
+#~ msgstr "您有一個處理中的搜尋。請等候它完成。"
+
+#~ msgid "Direct IM with %s closed"
+#~ msgstr "和 %s 的即時訊息關閉"
+
+#~ msgid "Direct IM with %s failed"
+#~ msgstr "和 %s 的即時訊息失敗"
+
+#~ msgid "Unable to open Direct IM"
+#~ msgstr "無法開啟直接的即時訊息"
+
+#~ msgid "You have lost your connection to chat room %s."
+#~ msgstr "您已經由聊天室 %s 停止連線。"
+
+#~ msgid "Chat is currently unavailable"
+#~ msgstr "目前無法使用聊天室"
+
+#~ msgid "Auth host"
+#~ msgstr "認證伺服器"
+
+#~ msgid "Auth port"
+#~ msgstr "認證通訊埠"
+
+#~ msgid "TOC host"
+#~ msgstr "TOC 伺服器"
+
+#~ msgid "TOC port"
+#~ msgstr "TOC 通訊埠"
+
+#~ msgid "Pager host"
+#~ msgstr "傳呼系統伺服器"
+
+#~ msgid "YCHT host"
+#~ msgstr "YCHT 主機"
+
+#~ msgid "YCHT port"
+#~ msgstr "YCHT 通訊埠"
+
+#~ msgid "%s logged out."
+#~ msgstr "%s 登出。"
+
+#~ msgid "Start _Voice Chat"
+#~ msgstr "開啟語音聊天"
+
+#~ msgid "Screen Name:"
+#~ msgstr "帳號:"
+
+#~ msgid "Background color name"
+#~ msgstr "背景顏色名稱"
+
+#~ msgid "Whether this tag affects the background color"
+#~ msgstr "不管這個標籤是否影響背景顏色"
+
+#~ msgid "ComboBox model"
+#~ msgstr "ComboBox樣式"
+
+#~ msgid "The model for the combo box"
+#~ msgstr "Combo Box的樣式"
+
+#~ msgid "Wrap width"
+#~ msgstr "換行寬度"
+
+#~ msgid "Wrap width for layouting the items in a grid"
+#~ msgstr "控制項在 Grid 中顯示的換行寬度"
+
+#~ msgid "Row span column"
+#~ msgstr "橫向跨欄"
+
+#~ msgid "Column span column"
+#~ msgstr "縱向跨欄"
+
+#~ msgid "me is using Gaim v%s."
+#~ msgstr "我在用 Gaim v%s。"
+
+#~ msgid "Call ended."
+#~ msgstr "結束呼叫。"
+
+#~ msgid "End Call"
+#~ msgstr "結束呼叫"
+
+#~ msgid "Receiving call from %s"
+#~ msgstr "收到來息 %s 的呼叫"
+
+#~ msgid "Reject Call"
+#~ msgstr "拒絕呼叫"
+
+#~ msgid "Accept call"
+#~ msgstr "接受呼叫"
+
+#~ msgid "Connected to %s"
+#~ msgstr "已連結到 %s"
+
+#~ msgid "_Mute"
+#~ msgstr "靜音(_M)"
+
+#~ msgid "Error launching <b>%s</b>: %s"
+#~ msgstr "執行「%s」時發生了錯誤:%s"
+
+#~ msgid "e-Mail"
+#~ msgstr "電子郵件"
+
+#~ msgid "Realname"
+#~ msgstr "姓名"
+
+#~ msgid "EMail"
+#~ msgstr "電子郵件"
+
+#~ msgid "Private Key File"
+#~ msgstr "私鑰檔案"
+
+#~ msgid "Re-type Passphrase"
+#~ msgstr "再次輸入密碼"
+
+#~ msgid "%s came back"
+#~ msgstr "%s 回來了"
+
+#~ msgid "%s went away"
+#~ msgstr "%s 已經離開"
+
+#~ msgid "(+%d more)"
+#~ msgstr "(以及另外 %d 個)"
+
+#~ msgid " left the room (%s)."
+#~ msgstr " 離開聊天室 (%s)。"
+
+#~ msgid "Offline "
+#~ msgstr "離線"
+
+#~ msgid "<span weight=\"bold\">From:</span> %s\n"
+#~ msgstr "<span weight=\"bold\">來自:</span> %s\n"
+
+#~ msgid "<span weight=\"bold\">Subject:</span> %s\n"
+#~ msgstr "<span weight=\"bold\">主題:</span> %s\n"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
+#~ "\n"
+#~ "%s%s%s%s"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">您收到了郵件!</span>\n"
+#~ "\n"
+#~ "%s%s%s%s"
+
+#~ msgid "Pounce Action"
+#~ msgstr "捕捉動作"
+
+#~ msgid "_Warn"
+#~ msgstr "警告(_W)"
+
+#~ msgid "Jabber ID"
+#~ msgstr "Jabber 帳號"
+
+#  NOTE Jabber 術語,見上
+#~ msgid "(pending)"
+#~ msgstr "(等待認證)"
+
+#~ msgid "Hide IP address"
+#~ msgstr "隱藏 IP 位址"
+
+# NOTE 參閱 http://www.geocities.com/Athens/Delphi/6470/icq99.html
+#~ msgid "Web aware"
+#~ msgstr "允許其他使用者在網路上查看您目前的狀態"